blob: aa2238acee01d79b2186de5c0f7d21e076821039 [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
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010017import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000018import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000032import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000033import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000034import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000035import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000036
37try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080038 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000039except ImportError:
40 pass
41
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000042from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000043from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000044from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000045import auth
skobes6468b902016-10-24 08:45:10 -070046import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000047import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000048import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000049import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000050import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000051import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000052import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000053import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000054import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000055import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000056import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000057import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000059import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000060import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000061import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000062import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import watchlists
64
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
tandrii9d2c7a32016-06-22 03:42:45 -070067COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070068DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080069POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000070DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000071REFS_THAT_ALIAS_TO_OTHER_REFS = {
72 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
73 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
74}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000075
thestig@chromium.org44202a22014-03-11 19:22:18 +000076# Valid extensions for files we want to lint.
77DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
78DEFAULT_LINT_IGNORE_REGEX = r"$^"
79
borenet6c0efe62016-10-19 08:13:29 -070080# Buildbucket master name prefix.
81MASTER_PREFIX = 'master.'
82
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000083# Shortcut since it quickly becomes redundant.
84Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000085
maruel@chromium.orgddd59412011-11-30 14:20:38 +000086# Initialized in main()
87settings = None
88
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010089# Used by tests/git_cl_test.py to add extra logging.
90# Inside the weirdly failing test, add this:
91# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
92# And scroll up to see the strack trace printed.
93_IS_BEING_TESTED = False
94
maruel@chromium.orgddd59412011-11-30 14:20:38 +000095
Christopher Lamf732cd52017-01-24 12:40:11 +110096def DieWithError(message, change_desc=None):
97 if change_desc:
98 SaveDescriptionBackup(change_desc)
99
vapiera7fbd5a2016-06-16 09:17:49 -0700100 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000101 sys.exit(1)
102
103
Christopher Lamf732cd52017-01-24 12:40:11 +1100104def SaveDescriptionBackup(change_desc):
105 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
106 print('\nError after CL description prompt -- saving description to %s\n' %
107 backup_path)
108 backup_file = open(backup_path, 'w')
109 backup_file.write(change_desc.description)
110 backup_file.close()
111
112
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000113def GetNoGitPagerEnv():
114 env = os.environ.copy()
115 # 'cat' is a magical git string that disables pagers on all platforms.
116 env['GIT_PAGER'] = 'cat'
117 return env
118
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000119
bsep@chromium.org627d9002016-04-29 00:00:52 +0000120def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000121 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000122 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000123 except subprocess2.CalledProcessError as e:
124 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000125 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000126 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000127 'Command "%s" failed.\n%s' % (
128 ' '.join(args), error_message or e.stdout or ''))
129 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000130
131
132def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000133 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000134 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000135
136
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000137def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000138 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700139 if suppress_stderr:
140 stderr = subprocess2.VOID
141 else:
142 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000143 try:
tandrii5d48c322016-08-18 16:19:37 -0700144 (out, _), code = subprocess2.communicate(['git'] + args,
145 env=GetNoGitPagerEnv(),
146 stdout=subprocess2.PIPE,
147 stderr=stderr)
148 return code, out
149 except subprocess2.CalledProcessError as e:
150 logging.debug('Failed running %s', args)
151 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000152
153
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000154def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000155 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000156 return RunGitWithCode(args, suppress_stderr=True)[1]
157
158
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000159def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000160 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000161 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000162 return (version.startswith(prefix) and
163 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000164
165
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000166def BranchExists(branch):
167 """Return True if specified branch exists."""
168 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
169 suppress_stderr=True)
170 return not code
171
172
tandrii2a16b952016-10-19 07:09:44 -0700173def time_sleep(seconds):
174 # Use this so that it can be mocked in tests without interfering with python
175 # system machinery.
176 import time # Local import to discourage others from importing time globally.
177 return time.sleep(seconds)
178
179
maruel@chromium.org90541732011-04-01 17:54:18 +0000180def ask_for_data(prompt):
181 try:
182 return raw_input(prompt)
183 except KeyboardInterrupt:
184 # Hide the exception.
185 sys.exit(1)
186
187
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100188def confirm_or_exit(prefix='', action='confirm'):
189 """Asks user to press enter to continue or press Ctrl+C to abort."""
190 if not prefix or prefix.endswith('\n'):
191 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100192 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100193 mid = ' Press'
194 elif prefix.endswith(' '):
195 mid = 'press'
196 else:
197 mid = ' press'
198 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
199
200
201def ask_for_explicit_yes(prompt):
202 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
203 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
204 while True:
205 if 'yes'.startswith(result):
206 return True
207 if 'no'.startswith(result):
208 return False
209 result = ask_for_data('Please, type yes or no: ').lower()
210
211
tandrii5d48c322016-08-18 16:19:37 -0700212def _git_branch_config_key(branch, key):
213 """Helper method to return Git config key for a branch."""
214 assert branch, 'branch name is required to set git config for it'
215 return 'branch.%s.%s' % (branch, key)
216
217
218def _git_get_branch_config_value(key, default=None, value_type=str,
219 branch=False):
220 """Returns git config value of given or current branch if any.
221
222 Returns default in all other cases.
223 """
224 assert value_type in (int, str, bool)
225 if branch is False: # Distinguishing default arg value from None.
226 branch = GetCurrentBranch()
227
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000228 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700229 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000230
tandrii5d48c322016-08-18 16:19:37 -0700231 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700232 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700233 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700234 # git config also has --int, but apparently git config suffers from integer
235 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700236 args.append(_git_branch_config_key(branch, key))
237 code, out = RunGitWithCode(args)
238 if code == 0:
239 value = out.strip()
240 if value_type == int:
241 return int(value)
242 if value_type == bool:
243 return bool(value.lower() == 'true')
244 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000245 return default
246
247
tandrii5d48c322016-08-18 16:19:37 -0700248def _git_set_branch_config_value(key, value, branch=None, **kwargs):
249 """Sets the value or unsets if it's None of a git branch config.
250
251 Valid, though not necessarily existing, branch must be provided,
252 otherwise currently checked out branch is used.
253 """
254 if not branch:
255 branch = GetCurrentBranch()
256 assert branch, 'a branch name OR currently checked out branch is required'
257 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700258 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700259 if value is None:
260 args.append('--unset')
261 elif isinstance(value, bool):
262 args.append('--bool')
263 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700264 else:
tandrii33a46ff2016-08-23 05:53:40 -0700265 # git config also has --int, but apparently git config suffers from integer
266 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700267 value = str(value)
268 args.append(_git_branch_config_key(branch, key))
269 if value is not None:
270 args.append(value)
271 RunGit(args, **kwargs)
272
273
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100274def _get_committer_timestamp(commit):
275 """Returns unix timestamp as integer of a committer in a commit.
276
277 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
278 """
279 # Git also stores timezone offset, but it only affects visual display,
280 # actual point in time is defined by this timestamp only.
281 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
282
283
284def _git_amend_head(message, committer_timestamp):
285 """Amends commit with new message and desired committer_timestamp.
286
287 Sets committer timezone to UTC.
288 """
289 env = os.environ.copy()
290 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
291 return RunGit(['commit', '--amend', '-m', message], env=env)
292
293
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000294def add_git_similarity(parser):
295 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700296 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000297 help='Sets the percentage that a pair of files need to match in order to'
298 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000299 parser.add_option(
300 '--find-copies', action='store_true',
301 help='Allows git to look for copies.')
302 parser.add_option(
303 '--no-find-copies', action='store_false', dest='find_copies',
304 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000305
306 old_parser_args = parser.parse_args
307 def Parse(args):
308 options, args = old_parser_args(args)
309
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000310 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700311 options.similarity = _git_get_branch_config_value(
312 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000313 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000314 print('Note: Saving similarity of %d%% in git config.'
315 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700316 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000317
iannucci@chromium.org79540052012-10-19 23:15:26 +0000318 options.similarity = max(0, min(options.similarity, 100))
319
320 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700321 options.find_copies = _git_get_branch_config_value(
322 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000323 else:
tandrii5d48c322016-08-18 16:19:37 -0700324 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000325
326 print('Using %d%% similarity for rename/copy detection. '
327 'Override with --similarity.' % options.similarity)
328
329 return options, args
330 parser.parse_args = Parse
331
332
machenbach@chromium.org45453142015-09-15 08:45:22 +0000333def _get_properties_from_options(options):
334 properties = dict(x.split('=', 1) for x in options.properties)
335 for key, val in properties.iteritems():
336 try:
337 properties[key] = json.loads(val)
338 except ValueError:
339 pass # If a value couldn't be evaluated, treat it as a string.
340 return properties
341
342
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000343def _prefix_master(master):
344 """Convert user-specified master name to full master name.
345
346 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
347 name, while the developers always use shortened master name
348 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
349 function does the conversion for buildbucket migration.
350 """
borenet6c0efe62016-10-19 08:13:29 -0700351 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000352 return master
borenet6c0efe62016-10-19 08:13:29 -0700353 return '%s%s' % (MASTER_PREFIX, master)
354
355
356def _unprefix_master(bucket):
357 """Convert bucket name to shortened master name.
358
359 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
360 name, while the developers always use shortened master name
361 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
362 function does the conversion for buildbucket migration.
363 """
364 if bucket.startswith(MASTER_PREFIX):
365 return bucket[len(MASTER_PREFIX):]
366 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000367
368
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000369def _buildbucket_retry(operation_name, http, *args, **kwargs):
370 """Retries requests to buildbucket service and returns parsed json content."""
371 try_count = 0
372 while True:
373 response, content = http.request(*args, **kwargs)
374 try:
375 content_json = json.loads(content)
376 except ValueError:
377 content_json = None
378
379 # Buildbucket could return an error even if status==200.
380 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000381 error = content_json.get('error')
382 if error.get('code') == 403:
383 raise BuildbucketResponseException(
384 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000385 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000386 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000387 raise BuildbucketResponseException(msg)
388
389 if response.status == 200:
390 if not content_json:
391 raise BuildbucketResponseException(
392 'Buildbucket returns invalid json content: %s.\n'
393 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
394 content)
395 return content_json
396 if response.status < 500 or try_count >= 2:
397 raise httplib2.HttpLib2Error(content)
398
399 # status >= 500 means transient failures.
400 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700401 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000402 try_count += 1
403 assert False, 'unreachable'
404
405
qyearsley1fdfcb62016-10-24 13:22:03 -0700406def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700407 """Returns a dict mapping bucket names to builders and tests,
408 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 """
qyearsleydd49f942016-10-28 11:57:22 -0700410 # If no bots are listed, we try to get a set of builders and tests based
411 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700412 if not options.bot:
413 change = changelist.GetChange(
414 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700415 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700416 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700417 change=change,
418 changed_files=change.LocalPaths(),
419 repository_root=settings.GetRoot(),
420 default_presubmit=None,
421 project=None,
422 verbose=options.verbose,
423 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700424 if masters is None:
425 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100426 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700427
qyearsley1fdfcb62016-10-24 13:22:03 -0700428 if options.bucket:
429 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700430 if options.master:
431 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700432
qyearsleydd49f942016-10-28 11:57:22 -0700433 # If bots are listed but no master or bucket, then we need to find out
434 # the corresponding master for each bot.
435 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
436 if error_message:
437 option_parser.error(
438 'Tryserver master cannot be found because: %s\n'
439 'Please manually specify the tryserver master, e.g. '
440 '"-m tryserver.chromium.linux".' % error_message)
441 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700442
443
qyearsley123a4682016-10-26 09:12:17 -0700444def _get_bucket_map_for_builders(builders):
445 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700446 map_url = 'https://builders-map.appspot.com/'
447 try:
qyearsley123a4682016-10-26 09:12:17 -0700448 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700449 except urllib2.URLError as e:
450 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
451 (map_url, e))
452 except ValueError as e:
453 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700454 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700455 return None, 'Failed to build master map.'
456
qyearsley123a4682016-10-26 09:12:17 -0700457 bucket_map = {}
458 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700459 masters = builders_map.get(builder, [])
460 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700461 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700462 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700463 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700464 (builder, masters))
465 bucket = _prefix_master(masters[0])
466 bucket_map.setdefault(bucket, {})[builder] = []
467
468 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700469
470
borenet6c0efe62016-10-19 08:13:29 -0700471def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700472 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700473 """Sends a request to Buildbucket to trigger try jobs for a changelist.
474
475 Args:
476 auth_config: AuthConfig for Rietveld.
477 changelist: Changelist that the try jobs are associated with.
478 buckets: A nested dict mapping bucket names to builders to tests.
479 options: Command-line options.
480 """
tandriide281ae2016-10-12 06:02:30 -0700481 assert changelist.GetIssue(), 'CL must be uploaded first'
482 codereview_url = changelist.GetCodereviewServer()
483 assert codereview_url, 'CL must be uploaded first'
484 patchset = patchset or changelist.GetMostRecentPatchset()
485 assert patchset, 'CL must be uploaded first'
486
487 codereview_host = urlparse.urlparse(codereview_url).hostname
488 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000489 http = authenticator.authorize(httplib2.Http())
490 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700491
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000492 buildbucket_put_url = (
493 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000494 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700495 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
496 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
497 hostname=codereview_host,
498 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000499 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700500
501 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
502 shared_parameters_properties['category'] = category
503 if options.clobber:
504 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700505 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700506 if extra_properties:
507 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000508
509 batch_req_body = {'builds': []}
510 print_text = []
511 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700512 for bucket, builders_and_tests in sorted(buckets.iteritems()):
513 print_text.append('Bucket: %s' % bucket)
514 master = None
515 if bucket.startswith(MASTER_PREFIX):
516 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000517 for builder, tests in sorted(builders_and_tests.iteritems()):
518 print_text.append(' %s: %s' % (builder, tests))
519 parameters = {
520 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000521 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100522 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000523 'revision': options.revision,
524 }],
tandrii8c5a3532016-11-04 07:52:02 -0700525 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000526 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000527 if 'presubmit' in builder.lower():
528 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000529 if tests:
530 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700531
532 tags = [
533 'builder:%s' % builder,
534 'buildset:%s' % buildset,
535 'user_agent:git_cl_try',
536 ]
537 if master:
538 parameters['properties']['master'] = master
539 tags.append('master:%s' % master)
540
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000541 batch_req_body['builds'].append(
542 {
543 'bucket': bucket,
544 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700546 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000547 }
548 )
549
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700551 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 http,
553 buildbucket_put_url,
554 'PUT',
555 body=json.dumps(batch_req_body),
556 headers={'Content-Type': 'application/json'}
557 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000558 print_text.append('To see results here, run: git cl try-results')
559 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700560 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000561
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000562
tandrii221ab252016-10-06 08:12:04 -0700563def fetch_try_jobs(auth_config, changelist, buildbucket_host,
564 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700565 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566
qyearsley53f48a12016-09-01 10:45:13 -0700567 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 """
tandrii221ab252016-10-06 08:12:04 -0700569 assert buildbucket_host
570 assert changelist.GetIssue(), 'CL must be uploaded first'
571 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
572 patchset = patchset or changelist.GetMostRecentPatchset()
573 assert patchset, 'CL must be uploaded first'
574
575 codereview_url = changelist.GetCodereviewServer()
576 codereview_host = urlparse.urlparse(codereview_url).hostname
577 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000578 if authenticator.has_cached_credentials():
579 http = authenticator.authorize(httplib2.Http())
580 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700581 print('Warning: Some results might be missing because %s' %
582 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700583 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 http = httplib2.Http()
585
586 http.force_exception_to_status_code = True
587
tandrii221ab252016-10-06 08:12:04 -0700588 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
589 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
590 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700592 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 params = {'tag': 'buildset:%s' % buildset}
594
595 builds = {}
596 while True:
597 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700598 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000599 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700600 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601 for build in content.get('builds', []):
602 builds[build['id']] = build
603 if 'next_cursor' in content:
604 params['start_cursor'] = content['next_cursor']
605 else:
606 break
607 return builds
608
609
qyearsleyeab3c042016-08-24 09:18:28 -0700610def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000611 """Prints nicely result of fetch_try_jobs."""
612 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700613 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614 return
615
616 # Make a copy, because we'll be modifying builds dictionary.
617 builds = builds.copy()
618 builder_names_cache = {}
619
620 def get_builder(b):
621 try:
622 return builder_names_cache[b['id']]
623 except KeyError:
624 try:
625 parameters = json.loads(b['parameters_json'])
626 name = parameters['builder_name']
627 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700628 print('WARNING: failed to get builder name for build %s: %s' % (
629 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000630 name = None
631 builder_names_cache[b['id']] = name
632 return name
633
634 def get_bucket(b):
635 bucket = b['bucket']
636 if bucket.startswith('master.'):
637 return bucket[len('master.'):]
638 return bucket
639
640 if options.print_master:
641 name_fmt = '%%-%ds %%-%ds' % (
642 max(len(str(get_bucket(b))) for b in builds.itervalues()),
643 max(len(str(get_builder(b))) for b in builds.itervalues()))
644 def get_name(b):
645 return name_fmt % (get_bucket(b), get_builder(b))
646 else:
647 name_fmt = '%%-%ds' % (
648 max(len(str(get_builder(b))) for b in builds.itervalues()))
649 def get_name(b):
650 return name_fmt % get_builder(b)
651
652 def sort_key(b):
653 return b['status'], b.get('result'), get_name(b), b.get('url')
654
655 def pop(title, f, color=None, **kwargs):
656 """Pop matching builds from `builds` dict and print them."""
657
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000658 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000659 colorize = str
660 else:
661 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
662
663 result = []
664 for b in builds.values():
665 if all(b.get(k) == v for k, v in kwargs.iteritems()):
666 builds.pop(b['id'])
667 result.append(b)
668 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700669 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000670 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700671 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672
673 total = len(builds)
674 pop(status='COMPLETED', result='SUCCESS',
675 title='Successes:', color=Fore.GREEN,
676 f=lambda b: (get_name(b), b.get('url')))
677 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
678 title='Infra Failures:', color=Fore.MAGENTA,
679 f=lambda b: (get_name(b), b.get('url')))
680 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
681 title='Failures:', color=Fore.RED,
682 f=lambda b: (get_name(b), b.get('url')))
683 pop(status='COMPLETED', result='CANCELED',
684 title='Canceled:', color=Fore.MAGENTA,
685 f=lambda b: (get_name(b),))
686 pop(status='COMPLETED', result='FAILURE',
687 failure_reason='INVALID_BUILD_DEFINITION',
688 title='Wrong master/builder name:', color=Fore.MAGENTA,
689 f=lambda b: (get_name(b),))
690 pop(status='COMPLETED', result='FAILURE',
691 title='Other failures:',
692 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
693 pop(status='COMPLETED',
694 title='Other finished:',
695 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
696 pop(status='STARTED',
697 title='Started:', color=Fore.YELLOW,
698 f=lambda b: (get_name(b), b.get('url')))
699 pop(status='SCHEDULED',
700 title='Scheduled:',
701 f=lambda b: (get_name(b), 'id=%s' % b['id']))
702 # The last section is just in case buildbucket API changes OR there is a bug.
703 pop(title='Other:',
704 f=lambda b: (get_name(b), 'id=%s' % b['id']))
705 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700706 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000707
708
qyearsley53f48a12016-09-01 10:45:13 -0700709def write_try_results_json(output_file, builds):
710 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
711
712 The input |builds| dict is assumed to be generated by Buildbucket.
713 Buildbucket documentation: http://goo.gl/G0s101
714 """
715
716 def convert_build_dict(build):
717 return {
718 'buildbucket_id': build.get('id'),
719 'status': build.get('status'),
720 'result': build.get('result'),
721 'bucket': build.get('bucket'),
722 'builder_name': json.loads(
723 build.get('parameters_json', '{}')).get('builder_name'),
724 'failure_reason': build.get('failure_reason'),
725 'url': build.get('url'),
726 }
727
728 converted = []
729 for _, build in sorted(builds.items()):
730 converted.append(convert_build_dict(build))
731 write_json(output_file, converted)
732
733
iannucci@chromium.org79540052012-10-19 23:15:26 +0000734def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000735 """Prints statistics about the change to the user."""
736 # --no-ext-diff is broken in some versions of Git, so try to work around
737 # this by overriding the environment (but there is still a problem if the
738 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000739 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000740 if 'GIT_EXTERNAL_DIFF' in env:
741 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000742
743 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800744 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000745 else:
746 similarity_options = ['-M%s' % similarity]
747
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000748 try:
749 stdout = sys.stdout.fileno()
750 except AttributeError:
751 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000752 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000753 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000754 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000755 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756
757
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000758class BuildbucketResponseException(Exception):
759 pass
760
761
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762class Settings(object):
763 def __init__(self):
764 self.default_server = None
765 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000766 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767 self.tree_status_url = None
768 self.viewvc_url = None
769 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000770 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000771 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000772 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000773 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000774 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000775 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000776
777 def LazyUpdateIfNeeded(self):
778 """Updates the settings from a codereview.settings file, if available."""
779 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000780 # The only value that actually changes the behavior is
781 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000782 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000783 error_ok=True
784 ).strip().lower()
785
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000787 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 LoadCodereviewSettingsFromFile(cr_settings_file)
789 self.updated = True
790
791 def GetDefaultServerUrl(self, error_ok=False):
792 if not self.default_server:
793 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000794 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000795 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 if error_ok:
797 return self.default_server
798 if not self.default_server:
799 error_message = ('Could not find settings file. You must configure '
800 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000801 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000802 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 return self.default_server
804
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000805 @staticmethod
806 def GetRelativeRoot():
807 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000810 if self.root is None:
811 self.root = os.path.abspath(self.GetRelativeRoot())
812 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000814 def GetGitMirror(self, remote='origin'):
815 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000816 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000817 if not os.path.isdir(local_url):
818 return None
819 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
820 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100821 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100822 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000823 if mirror.exists():
824 return mirror
825 return None
826
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827 def GetTreeStatusUrl(self, error_ok=False):
828 if not self.tree_status_url:
829 error_message = ('You must configure your tree status URL by running '
830 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000831 self.tree_status_url = self._GetRietveldConfig(
832 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 return self.tree_status_url
834
835 def GetViewVCUrl(self):
836 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000837 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000838 return self.viewvc_url
839
Mark Mentovai57c47212017-03-09 11:14:09 -0500840 def GetBugLineFormat(self):
841 # rietveld.bug-line-format should have a %s where the list of bugs should
842 # go. This is a bit of a quirk, because normal people will always want the
843 # bug list to go right after a prefix like BUG= or Bug:. The %s format
844 # approach is used strictly because there isn't a great way to carry the
845 # desired space after Bug: all the way from codereview.settings to here
846 # without treating : specially or inventing a quoting scheme.
847 bug_line_format = self._GetRietveldConfig('bug-line-format', error_ok=True)
848 if not bug_line_format:
849 # TODO(tandrii): change this to 'Bug: %s' to be a proper Gerrit footer.
850 bug_line_format = 'BUG=%s'
851 return bug_line_format
852
rmistry@google.com90752582014-01-14 21:04:50 +0000853 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000854 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000855
rmistry@google.com78948ed2015-07-08 23:09:57 +0000856 def GetIsSkipDependencyUpload(self, branch_name):
857 """Returns true if specified branch should skip dep uploads."""
858 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
859 error_ok=True)
860
rmistry@google.com5626a922015-02-26 14:03:30 +0000861 def GetRunPostUploadHook(self):
862 run_post_upload_hook = self._GetRietveldConfig(
863 'run-post-upload-hook', error_ok=True)
864 return run_post_upload_hook == "True"
865
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000866 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000867 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000868
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000869 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000870 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000871
ukai@chromium.orge8077812012-02-03 03:41:46 +0000872 def GetIsGerrit(self):
873 """Return true if this repo is assosiated with gerrit code review system."""
874 if self.is_gerrit is None:
875 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
876 return self.is_gerrit
877
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000878 def GetSquashGerritUploads(self):
879 """Return true if uploads to Gerrit should be squashed by default."""
880 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700881 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
882 if self.squash_gerrit_uploads is None:
883 # Default is squash now (http://crbug.com/611892#c23).
884 self.squash_gerrit_uploads = not (
885 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
886 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000887 return self.squash_gerrit_uploads
888
tandriia60502f2016-06-20 02:01:53 -0700889 def GetSquashGerritUploadsOverride(self):
890 """Return True or False if codereview.settings should be overridden.
891
892 Returns None if no override has been defined.
893 """
894 # See also http://crbug.com/611892#c23
895 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
896 error_ok=True).strip()
897 if result == 'true':
898 return True
899 if result == 'false':
900 return False
901 return None
902
tandrii@chromium.org28253532016-04-14 13:46:56 +0000903 def GetGerritSkipEnsureAuthenticated(self):
904 """Return True if EnsureAuthenticated should not be done for Gerrit
905 uploads."""
906 if self.gerrit_skip_ensure_authenticated is None:
907 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000908 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000909 error_ok=True).strip() == 'true')
910 return self.gerrit_skip_ensure_authenticated
911
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000912 def GetGitEditor(self):
913 """Return the editor specified in the git config, or None if none is."""
914 if self.git_editor is None:
915 self.git_editor = self._GetConfig('core.editor', error_ok=True)
916 return self.git_editor or None
917
thestig@chromium.org44202a22014-03-11 19:22:18 +0000918 def GetLintRegex(self):
919 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
920 DEFAULT_LINT_REGEX)
921
922 def GetLintIgnoreRegex(self):
923 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
924 DEFAULT_LINT_IGNORE_REGEX)
925
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000926 def GetProject(self):
927 if not self.project:
928 self.project = self._GetRietveldConfig('project', error_ok=True)
929 return self.project
930
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000931 def _GetRietveldConfig(self, param, **kwargs):
932 return self._GetConfig('rietveld.' + param, **kwargs)
933
rmistry@google.com78948ed2015-07-08 23:09:57 +0000934 def _GetBranchConfig(self, branch_name, param, **kwargs):
935 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
936
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000937 def _GetConfig(self, param, **kwargs):
938 self.LazyUpdateIfNeeded()
939 return RunGit(['config', param], **kwargs).strip()
940
941
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100942@contextlib.contextmanager
943def _get_gerrit_project_config_file(remote_url):
944 """Context manager to fetch and store Gerrit's project.config from
945 refs/meta/config branch and store it in temp file.
946
947 Provides a temporary filename or None if there was error.
948 """
949 error, _ = RunGitWithCode([
950 'fetch', remote_url,
951 '+refs/meta/config:refs/git_cl/meta/config'])
952 if error:
953 # Ref doesn't exist or isn't accessible to current user.
954 print('WARNING: failed to fetch project config for %s: %s' %
955 (remote_url, error))
956 yield None
957 return
958
959 error, project_config_data = RunGitWithCode(
960 ['show', 'refs/git_cl/meta/config:project.config'])
961 if error:
962 print('WARNING: project.config file not found')
963 yield None
964 return
965
966 with gclient_utils.temporary_directory() as tempdir:
967 project_config_file = os.path.join(tempdir, 'project.config')
968 gclient_utils.FileWrite(project_config_file, project_config_data)
969 yield project_config_file
970
971
972def _is_git_numberer_enabled(remote_url, remote_ref):
973 """Returns True if Git Numberer is enabled on this ref."""
974 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100975 KNOWN_PROJECTS_WHITELIST = [
976 'chromium/src',
977 'external/webrtc',
978 'v8/v8',
979 ]
980
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100981 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
982 url_parts = urlparse.urlparse(remote_url)
983 project_name = url_parts.path.lstrip('/').rstrip('git./')
984 for known in KNOWN_PROJECTS_WHITELIST:
985 if project_name.endswith(known):
986 break
987 else:
988 # Early exit to avoid extra fetches for repos that aren't using Git
989 # Numberer.
990 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100991
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100992 with _get_gerrit_project_config_file(remote_url) as project_config_file:
993 if project_config_file is None:
994 # Failed to fetch project.config, which shouldn't happen on open source
995 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100996 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100997 def get_opts(x):
998 code, out = RunGitWithCode(
999 ['config', '-f', project_config_file, '--get-all',
1000 'plugin.git-numberer.validate-%s-refglob' % x])
1001 if code == 0:
1002 return out.strip().splitlines()
1003 return []
1004 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001005
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001006 logging.info('validator config enabled %s disabled %s refglobs for '
1007 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001008
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001009 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001010 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001011 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001012 return True
1013 return False
1014
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001015 if match_refglobs(disabled):
1016 return False
1017 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001018
1019
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020def ShortBranchName(branch):
1021 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 return branch.replace('refs/heads/', '', 1)
1023
1024
1025def GetCurrentBranchRef():
1026 """Returns branch ref (e.g., refs/heads/master) or None."""
1027 return RunGit(['symbolic-ref', 'HEAD'],
1028 stderr=subprocess2.VOID, error_ok=True).strip() or None
1029
1030
1031def GetCurrentBranch():
1032 """Returns current branch or None.
1033
1034 For refs/heads/* branches, returns just last part. For others, full ref.
1035 """
1036 branchref = GetCurrentBranchRef()
1037 if branchref:
1038 return ShortBranchName(branchref)
1039 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040
1041
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001042class _CQState(object):
1043 """Enum for states of CL with respect to Commit Queue."""
1044 NONE = 'none'
1045 DRY_RUN = 'dry_run'
1046 COMMIT = 'commit'
1047
1048 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1049
1050
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051class _ParsedIssueNumberArgument(object):
1052 def __init__(self, issue=None, patchset=None, hostname=None):
1053 self.issue = issue
1054 self.patchset = patchset
1055 self.hostname = hostname
1056
1057 @property
1058 def valid(self):
1059 return self.issue is not None
1060
1061
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001062def ParseIssueNumberArgument(arg):
1063 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1064 fail_result = _ParsedIssueNumberArgument()
1065
1066 if arg.isdigit():
1067 return _ParsedIssueNumberArgument(issue=int(arg))
1068 if not arg.startswith('http'):
1069 return fail_result
1070 url = gclient_utils.UpgradeToHttps(arg)
1071 try:
1072 parsed_url = urlparse.urlparse(url)
1073 except ValueError:
1074 return fail_result
1075 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
1076 tmp = cls.ParseIssueURL(parsed_url)
1077 if tmp is not None:
1078 return tmp
1079 return fail_result
1080
1081
Aaron Gablea45ee112016-11-22 15:14:38 -08001082class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001083 def __init__(self, issue, url):
1084 self.issue = issue
1085 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001086 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001087
1088 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001089 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001090 self.issue, self.url)
1091
1092
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001094 """Changelist works with one changelist in local branch.
1095
1096 Supports two codereview backends: Rietveld or Gerrit, selected at object
1097 creation.
1098
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001099 Notes:
1100 * Not safe for concurrent multi-{thread,process} use.
1101 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001102 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001103 """
1104
1105 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1106 """Create a new ChangeList instance.
1107
1108 If issue is given, the codereview must be given too.
1109
1110 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1111 Otherwise, it's decided based on current configuration of the local branch,
1112 with default being 'rietveld' for backwards compatibility.
1113 See _load_codereview_impl for more details.
1114
1115 **kwargs will be passed directly to codereview implementation.
1116 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001118 global settings
1119 if not settings:
1120 # Happens when git_cl.py is used as a utility library.
1121 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001122
1123 if issue:
1124 assert codereview, 'codereview must be known, if issue is known'
1125
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 self.branchref = branchref
1127 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001128 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 self.branch = ShortBranchName(self.branchref)
1130 else:
1131 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001133 self.lookedup_issue = False
1134 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 self.has_description = False
1136 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001137 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001139 self.cc = None
1140 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001141 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001142
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001143 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001144 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001145 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001146 assert self._codereview_impl
1147 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001148
1149 def _load_codereview_impl(self, codereview=None, **kwargs):
1150 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001151 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1152 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1153 self._codereview = codereview
1154 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001155 return
1156
1157 # Automatic selection based on issue number set for a current branch.
1158 # Rietveld takes precedence over Gerrit.
1159 assert not self.issue
1160 # Whether we find issue or not, we are doing the lookup.
1161 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001162 if self.GetBranch():
1163 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1164 issue = _git_get_branch_config_value(
1165 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1166 if issue:
1167 self._codereview = codereview
1168 self._codereview_impl = cls(self, **kwargs)
1169 self.issue = int(issue)
1170 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001171
1172 # No issue is set for this branch, so decide based on repo-wide settings.
1173 return self._load_codereview_impl(
1174 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1175 **kwargs)
1176
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001177 def IsGerrit(self):
1178 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001179
1180 def GetCCList(self):
1181 """Return the users cc'd on this CL.
1182
agable92bec4f2016-08-24 09:27:27 -07001183 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001184 """
1185 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001186 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001187 more_cc = ','.join(self.watchers)
1188 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1189 return self.cc
1190
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001191 def GetCCListWithoutDefault(self):
1192 """Return the users cc'd on this CL excluding default ones."""
1193 if self.cc is None:
1194 self.cc = ','.join(self.watchers)
1195 return self.cc
1196
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197 def SetWatchers(self, watchers):
1198 """Set the list of email addresses that should be cc'd based on the changed
1199 files in this CL.
1200 """
1201 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202
1203 def GetBranch(self):
1204 """Returns the short branch name, e.g. 'master'."""
1205 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001206 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001207 if not branchref:
1208 return None
1209 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 self.branch = ShortBranchName(self.branchref)
1211 return self.branch
1212
1213 def GetBranchRef(self):
1214 """Returns the full branch name, e.g. 'refs/heads/master'."""
1215 self.GetBranch() # Poke the lazy loader.
1216 return self.branchref
1217
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001218 def ClearBranch(self):
1219 """Clears cached branch data of this object."""
1220 self.branch = self.branchref = None
1221
tandrii5d48c322016-08-18 16:19:37 -07001222 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1223 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1224 kwargs['branch'] = self.GetBranch()
1225 return _git_get_branch_config_value(key, default, **kwargs)
1226
1227 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1228 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1229 assert self.GetBranch(), (
1230 'this CL must have an associated branch to %sset %s%s' %
1231 ('un' if value is None else '',
1232 key,
1233 '' if value is None else ' to %r' % value))
1234 kwargs['branch'] = self.GetBranch()
1235 return _git_set_branch_config_value(key, value, **kwargs)
1236
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001237 @staticmethod
1238 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001239 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001240 e.g. 'origin', 'refs/heads/master'
1241 """
1242 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001243 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1244
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001246 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001248 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1249 error_ok=True).strip()
1250 if upstream_branch:
1251 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001253 # Else, try to guess the origin remote.
1254 remote_branches = RunGit(['branch', '-r']).split()
1255 if 'origin/master' in remote_branches:
1256 # Fall back on origin/master if it exits.
1257 remote = 'origin'
1258 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001260 DieWithError(
1261 'Unable to determine default branch to diff against.\n'
1262 'Either pass complete "git diff"-style arguments, like\n'
1263 ' git cl upload origin/master\n'
1264 'or verify this branch is set up to track another \n'
1265 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266
1267 return remote, upstream_branch
1268
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001269 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001270 upstream_branch = self.GetUpstreamBranch()
1271 if not BranchExists(upstream_branch):
1272 DieWithError('The upstream for the current branch (%s) does not exist '
1273 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001274 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001275 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001276
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277 def GetUpstreamBranch(self):
1278 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001279 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001281 upstream_branch = upstream_branch.replace('refs/heads/',
1282 'refs/remotes/%s/' % remote)
1283 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1284 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 self.upstream_branch = upstream_branch
1286 return self.upstream_branch
1287
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001288 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001289 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001290 remote, branch = None, self.GetBranch()
1291 seen_branches = set()
1292 while branch not in seen_branches:
1293 seen_branches.add(branch)
1294 remote, branch = self.FetchUpstreamTuple(branch)
1295 branch = ShortBranchName(branch)
1296 if remote != '.' or branch.startswith('refs/remotes'):
1297 break
1298 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001299 remotes = RunGit(['remote'], error_ok=True).split()
1300 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001301 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001302 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001303 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001304 logging.warn('Could not determine which remote this change is '
1305 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001306 else:
1307 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001308 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 branch = 'HEAD'
1310 if branch.startswith('refs/remotes'):
1311 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001312 elif branch.startswith('refs/branch-heads/'):
1313 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001314 else:
1315 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001316 return self._remote
1317
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001318 def GitSanityChecks(self, upstream_git_obj):
1319 """Checks git repo status and ensures diff is from local commits."""
1320
sbc@chromium.org79706062015-01-14 21:18:12 +00001321 if upstream_git_obj is None:
1322 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001323 print('ERROR: unable to determine current branch (detached HEAD?)',
1324 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001325 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001326 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001327 return False
1328
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001329 # Verify the commit we're diffing against is in our current branch.
1330 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1331 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1332 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001333 print('ERROR: %s is not in the current branch. You may need to rebase '
1334 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001335 return False
1336
1337 # List the commits inside the diff, and verify they are all local.
1338 commits_in_diff = RunGit(
1339 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1340 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1341 remote_branch = remote_branch.strip()
1342 if code != 0:
1343 _, remote_branch = self.GetRemoteBranch()
1344
1345 commits_in_remote = RunGit(
1346 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1347
1348 common_commits = set(commits_in_diff) & set(commits_in_remote)
1349 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001350 print('ERROR: Your diff contains %d commits already in %s.\n'
1351 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1352 'the diff. If you are using a custom git flow, you can override'
1353 ' the reference used for this check with "git config '
1354 'gitcl.remotebranch <git-ref>".' % (
1355 len(common_commits), remote_branch, upstream_git_obj),
1356 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001357 return False
1358 return True
1359
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001360 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001361 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001362
1363 Returns None if it is not set.
1364 """
tandrii5d48c322016-08-18 16:19:37 -07001365 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001366
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367 def GetRemoteUrl(self):
1368 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1369
1370 Returns None if there is no remote.
1371 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001372 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001373 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1374
1375 # If URL is pointing to a local directory, it is probably a git cache.
1376 if os.path.isdir(url):
1377 url = RunGit(['config', 'remote.%s.url' % remote],
1378 error_ok=True,
1379 cwd=url).strip()
1380 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001381
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001382 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001383 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001384 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001385 self.issue = self._GitGetBranchConfigValue(
1386 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001387 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 return self.issue
1389
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001390 def GetIssueURL(self):
1391 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001392 issue = self.GetIssue()
1393 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001394 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001395 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001397 def GetDescription(self, pretty=False, force=False):
1398 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001400 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001401 self.has_description = True
1402 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001403 # Set width to 72 columns + 2 space indent.
1404 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001405 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001406 lines = self.description.splitlines()
1407 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 return self.description
1409
1410 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001411 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001413 self.patchset = self._GitGetBranchConfigValue(
1414 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001415 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 return self.patchset
1417
1418 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001419 """Set this branch's patchset. If patchset=0, clears the patchset."""
1420 assert self.GetBranch()
1421 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001422 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001423 else:
1424 self.patchset = int(patchset)
1425 self._GitSetBranchConfigValue(
1426 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001428 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001429 """Set this branch's issue. If issue isn't given, clears the issue."""
1430 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001432 issue = int(issue)
1433 self._GitSetBranchConfigValue(
1434 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001435 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001436 codereview_server = self._codereview_impl.GetCodereviewServer()
1437 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001438 self._GitSetBranchConfigValue(
1439 self._codereview_impl.CodereviewServerConfigKey(),
1440 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001441 else:
tandrii5d48c322016-08-18 16:19:37 -07001442 # Reset all of these just to be clean.
1443 reset_suffixes = [
1444 'last-upload-hash',
1445 self._codereview_impl.IssueConfigKey(),
1446 self._codereview_impl.PatchsetConfigKey(),
1447 self._codereview_impl.CodereviewServerConfigKey(),
1448 ] + self._PostUnsetIssueProperties()
1449 for prop in reset_suffixes:
1450 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001451 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001452 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001453
dnjba1b0f32016-09-02 12:37:42 -07001454 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001455 if not self.GitSanityChecks(upstream_branch):
1456 DieWithError('\nGit sanity check failure')
1457
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001458 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001459 if not root:
1460 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001461 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001462
1463 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001464 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001465 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001466 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001467 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001468 except subprocess2.CalledProcessError:
1469 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001470 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001471 'This branch probably doesn\'t exist anymore. To reset the\n'
1472 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001473 ' git branch --set-upstream-to origin/master %s\n'
1474 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001475 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001476
maruel@chromium.org52424302012-08-29 15:14:30 +00001477 issue = self.GetIssue()
1478 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001479 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001480 description = self.GetDescription()
1481 else:
1482 # If the change was never uploaded, use the log messages of all commits
1483 # up to the branch point, as git cl upload will prefill the description
1484 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001485 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1486 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001487
1488 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001489 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001490 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491 name,
1492 description,
1493 absroot,
1494 files,
1495 issue,
1496 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001497 author,
1498 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001499
dsansomee2d6fd92016-09-08 00:10:47 -07001500 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001501 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001502 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001503 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001504
1505 def RunHook(self, committing, may_prompt, verbose, change):
1506 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1507 try:
1508 return presubmit_support.DoPresubmitChecks(change, committing,
1509 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1510 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001511 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1512 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001513 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001514 DieWithError(
1515 ('%s\nMaybe your depot_tools is out of date?\n'
1516 'If all fails, contact maruel@') % e)
1517
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001518 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1519 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001520 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1521 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001522 else:
1523 # Assume url.
1524 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1525 urlparse.urlparse(issue_arg))
1526 if not parsed_issue_arg or not parsed_issue_arg.valid:
1527 DieWithError('Failed to parse issue argument "%s". '
1528 'Must be an issue number or a valid URL.' % issue_arg)
1529 return self._codereview_impl.CMDPatchWithParsedIssue(
1530 parsed_issue_arg, reject, nocommit, directory)
1531
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 def CMDUpload(self, options, git_diff_args, orig_args):
1533 """Uploads a change to codereview."""
1534 if git_diff_args:
1535 # TODO(ukai): is it ok for gerrit case?
1536 base_branch = git_diff_args[0]
1537 else:
1538 if self.GetBranch() is None:
1539 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1540
1541 # Default to diffing against common ancestor of upstream branch
1542 base_branch = self.GetCommonAncestorWithUpstream()
1543 git_diff_args = [base_branch, 'HEAD']
1544
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001545 # Fast best-effort checks to abort before running potentially
1546 # expensive hooks if uploading is likely to fail anyway. Passing these
1547 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001548 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001549 self._codereview_impl.EnsureCanUploadPatchset()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001550
1551 # Apply watchlists on upload.
1552 change = self.GetChange(base_branch, None)
1553 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1554 files = [f.LocalPath() for f in change.AffectedFiles()]
1555 if not options.bypass_watchlists:
1556 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1557
1558 if not options.bypass_hooks:
1559 if options.reviewers or options.tbr_owners:
1560 # Set the reviewer list now so that presubmit checks can access it.
1561 change_description = ChangeDescription(change.FullDescriptionText())
1562 change_description.update_reviewers(options.reviewers,
1563 options.tbr_owners,
1564 change)
1565 change.SetDescriptionText(change_description.description)
1566 hook_results = self.RunHook(committing=False,
1567 may_prompt=not options.force,
1568 verbose=options.verbose,
1569 change=change)
1570 if not hook_results.should_continue():
1571 return 1
1572 if not options.reviewers and hook_results.reviewers:
1573 options.reviewers = hook_results.reviewers.split(',')
1574
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001575 # TODO(tandrii): Checking local patchset against remote patchset is only
1576 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1577 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001578 latest_patchset = self.GetMostRecentPatchset()
1579 local_patchset = self.GetPatchset()
1580 if (latest_patchset and local_patchset and
1581 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001582 print('The last upload made from this repository was patchset #%d but '
1583 'the most recent patchset on the server is #%d.'
1584 % (local_patchset, latest_patchset))
1585 print('Uploading will still work, but if you\'ve uploaded to this '
1586 'issue from another machine or branch the patch you\'re '
1587 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001588 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589
1590 print_stats(options.similarity, options.find_copies, git_diff_args)
1591 ret = self.CMDUploadChange(options, git_diff_args, change)
1592 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001593 if options.use_commit_queue:
1594 self.SetCQState(_CQState.COMMIT)
1595 elif options.cq_dry_run:
1596 self.SetCQState(_CQState.DRY_RUN)
1597
tandrii5d48c322016-08-18 16:19:37 -07001598 _git_set_branch_config_value('last-upload-hash',
1599 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001600 # Run post upload hooks, if specified.
1601 if settings.GetRunPostUploadHook():
1602 presubmit_support.DoPostUploadExecuter(
1603 change,
1604 self,
1605 settings.GetRoot(),
1606 options.verbose,
1607 sys.stdout)
1608
1609 # Upload all dependencies if specified.
1610 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001611 print()
1612 print('--dependencies has been specified.')
1613 print('All dependent local branches will be re-uploaded.')
1614 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001615 # Remove the dependencies flag from args so that we do not end up in a
1616 # loop.
1617 orig_args.remove('--dependencies')
1618 ret = upload_branch_deps(self, orig_args)
1619 return ret
1620
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001621 def SetCQState(self, new_state):
1622 """Update the CQ state for latest patchset.
1623
1624 Issue must have been already uploaded and known.
1625 """
1626 assert new_state in _CQState.ALL_STATES
1627 assert self.GetIssue()
1628 return self._codereview_impl.SetCQState(new_state)
1629
qyearsley1fdfcb62016-10-24 13:22:03 -07001630 def TriggerDryRun(self):
1631 """Triggers a dry run and prints a warning on failure."""
1632 # TODO(qyearsley): Either re-use this method in CMDset_commit
1633 # and CMDupload, or change CMDtry to trigger dry runs with
1634 # just SetCQState, and catch keyboard interrupt and other
1635 # errors in that method.
1636 try:
1637 self.SetCQState(_CQState.DRY_RUN)
1638 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1639 return 0
1640 except KeyboardInterrupt:
1641 raise
1642 except:
1643 print('WARNING: failed to trigger CQ Dry Run.\n'
1644 'Either:\n'
1645 ' * your project has no CQ\n'
1646 ' * you don\'t have permission to trigger Dry Run\n'
1647 ' * bug in this code (see stack trace below).\n'
1648 'Consider specifying which bots to trigger manually '
1649 'or asking your project owners for permissions '
1650 'or contacting Chrome Infrastructure team at '
1651 'https://www.chromium.org/infra\n\n')
1652 # Still raise exception so that stack trace is printed.
1653 raise
1654
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001655 # Forward methods to codereview specific implementation.
1656
1657 def CloseIssue(self):
1658 return self._codereview_impl.CloseIssue()
1659
1660 def GetStatus(self):
1661 return self._codereview_impl.GetStatus()
1662
1663 def GetCodereviewServer(self):
1664 return self._codereview_impl.GetCodereviewServer()
1665
tandriide281ae2016-10-12 06:02:30 -07001666 def GetIssueOwner(self):
1667 """Get owner from codereview, which may differ from this checkout."""
1668 return self._codereview_impl.GetIssueOwner()
1669
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001670 def GetApprovingReviewers(self):
1671 return self._codereview_impl.GetApprovingReviewers()
1672
1673 def GetMostRecentPatchset(self):
1674 return self._codereview_impl.GetMostRecentPatchset()
1675
tandriide281ae2016-10-12 06:02:30 -07001676 def CannotTriggerTryJobReason(self):
1677 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1678 return self._codereview_impl.CannotTriggerTryJobReason()
1679
tandrii8c5a3532016-11-04 07:52:02 -07001680 def GetTryjobProperties(self, patchset=None):
1681 """Returns dictionary of properties to launch tryjob."""
1682 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1683
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001684 def __getattr__(self, attr):
1685 # This is because lots of untested code accesses Rietveld-specific stuff
1686 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001687 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001688 # Note that child method defines __getattr__ as well, and forwards it here,
1689 # because _RietveldChangelistImpl is not cleaned up yet, and given
1690 # deprecation of Rietveld, it should probably be just removed.
1691 # Until that time, avoid infinite recursion by bypassing __getattr__
1692 # of implementation class.
1693 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001694
1695
1696class _ChangelistCodereviewBase(object):
1697 """Abstract base class encapsulating codereview specifics of a changelist."""
1698 def __init__(self, changelist):
1699 self._changelist = changelist # instance of Changelist
1700
1701 def __getattr__(self, attr):
1702 # Forward methods to changelist.
1703 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1704 # _RietveldChangelistImpl to avoid this hack?
1705 return getattr(self._changelist, attr)
1706
1707 def GetStatus(self):
1708 """Apply a rough heuristic to give a simple summary of an issue's review
1709 or CQ status, assuming adherence to a common workflow.
1710
1711 Returns None if no issue for this branch, or specific string keywords.
1712 """
1713 raise NotImplementedError()
1714
1715 def GetCodereviewServer(self):
1716 """Returns server URL without end slash, like "https://codereview.com"."""
1717 raise NotImplementedError()
1718
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001719 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 """Fetches and returns description from the codereview server."""
1721 raise NotImplementedError()
1722
tandrii5d48c322016-08-18 16:19:37 -07001723 @classmethod
1724 def IssueConfigKey(cls):
1725 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001726 raise NotImplementedError()
1727
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001728 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001729 def PatchsetConfigKey(cls):
1730 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001731 raise NotImplementedError()
1732
tandrii5d48c322016-08-18 16:19:37 -07001733 @classmethod
1734 def CodereviewServerConfigKey(cls):
1735 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001736 raise NotImplementedError()
1737
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001738 def _PostUnsetIssueProperties(self):
1739 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001740 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001741
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001742 def GetRieveldObjForPresubmit(self):
1743 # This is an unfortunate Rietveld-embeddedness in presubmit.
1744 # For non-Rietveld codereviews, this probably should return a dummy object.
1745 raise NotImplementedError()
1746
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001747 def GetGerritObjForPresubmit(self):
1748 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1749 return None
1750
dsansomee2d6fd92016-09-08 00:10:47 -07001751 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001752 """Update the description on codereview site."""
1753 raise NotImplementedError()
1754
1755 def CloseIssue(self):
1756 """Closes the issue."""
1757 raise NotImplementedError()
1758
1759 def GetApprovingReviewers(self):
1760 """Returns a list of reviewers approving the change.
1761
1762 Note: not necessarily committers.
1763 """
1764 raise NotImplementedError()
1765
1766 def GetMostRecentPatchset(self):
1767 """Returns the most recent patchset number from the codereview site."""
1768 raise NotImplementedError()
1769
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001770 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1771 directory):
1772 """Fetches and applies the issue.
1773
1774 Arguments:
1775 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1776 reject: if True, reject the failed patch instead of switching to 3-way
1777 merge. Rietveld only.
1778 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1779 only.
1780 directory: switch to directory before applying the patch. Rietveld only.
1781 """
1782 raise NotImplementedError()
1783
1784 @staticmethod
1785 def ParseIssueURL(parsed_url):
1786 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1787 failed."""
1788 raise NotImplementedError()
1789
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001790 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001791 """Best effort check that user is authenticated with codereview server.
1792
1793 Arguments:
1794 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001795 refresh: whether to attempt to refresh credentials. Ignored if not
1796 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001797 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001798 raise NotImplementedError()
1799
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001800 def EnsureCanUploadPatchset(self):
1801 """Best effort check that uploading isn't supposed to fail for predictable
1802 reasons.
1803
1804 This method should raise informative exception if uploading shouldn't
1805 proceed.
1806 """
1807 pass
1808
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001809 def CMDUploadChange(self, options, args, change):
1810 """Uploads a change to codereview."""
1811 raise NotImplementedError()
1812
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001813 def SetCQState(self, new_state):
1814 """Update the CQ state for latest patchset.
1815
1816 Issue must have been already uploaded and known.
1817 """
1818 raise NotImplementedError()
1819
tandriie113dfd2016-10-11 10:20:12 -07001820 def CannotTriggerTryJobReason(self):
1821 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1822 raise NotImplementedError()
1823
tandriide281ae2016-10-12 06:02:30 -07001824 def GetIssueOwner(self):
1825 raise NotImplementedError()
1826
tandrii8c5a3532016-11-04 07:52:02 -07001827 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001828 raise NotImplementedError()
1829
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001830
1831class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001832 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 super(_RietveldChangelistImpl, self).__init__(changelist)
1834 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001835 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001836 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001838 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001839 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001840 self._props = None
1841 self._rpc_server = None
1842
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001843 def GetCodereviewServer(self):
1844 if not self._rietveld_server:
1845 # If we're on a branch then get the server potentially associated
1846 # with that branch.
1847 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001848 self._rietveld_server = gclient_utils.UpgradeToHttps(
1849 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001850 if not self._rietveld_server:
1851 self._rietveld_server = settings.GetDefaultServerUrl()
1852 return self._rietveld_server
1853
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001854 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001855 """Best effort check that user is authenticated with Rietveld server."""
1856 if self._auth_config.use_oauth2:
1857 authenticator = auth.get_authenticator_for_host(
1858 self.GetCodereviewServer(), self._auth_config)
1859 if not authenticator.has_cached_credentials():
1860 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001861 if refresh:
1862 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001863
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001864 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001865 issue = self.GetIssue()
1866 assert issue
1867 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001868 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001869 except urllib2.HTTPError as e:
1870 if e.code == 404:
1871 DieWithError(
1872 ('\nWhile fetching the description for issue %d, received a '
1873 '404 (not found)\n'
1874 'error. It is likely that you deleted this '
1875 'issue on the server. If this is the\n'
1876 'case, please run\n\n'
1877 ' git cl issue 0\n\n'
1878 'to clear the association with the deleted issue. Then run '
1879 'this command again.') % issue)
1880 else:
1881 DieWithError(
1882 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1883 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001884 print('Warning: Failed to retrieve CL description due to network '
1885 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001886 return ''
1887
1888 def GetMostRecentPatchset(self):
1889 return self.GetIssueProperties()['patchsets'][-1]
1890
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001891 def GetIssueProperties(self):
1892 if self._props is None:
1893 issue = self.GetIssue()
1894 if not issue:
1895 self._props = {}
1896 else:
1897 self._props = self.RpcServer().get_issue_properties(issue, True)
1898 return self._props
1899
tandriie113dfd2016-10-11 10:20:12 -07001900 def CannotTriggerTryJobReason(self):
1901 props = self.GetIssueProperties()
1902 if not props:
1903 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1904 if props.get('closed'):
1905 return 'CL %s is closed' % self.GetIssue()
1906 if props.get('private'):
1907 return 'CL %s is private' % self.GetIssue()
1908 return None
1909
tandrii8c5a3532016-11-04 07:52:02 -07001910 def GetTryjobProperties(self, patchset=None):
1911 """Returns dictionary of properties to launch tryjob."""
1912 project = (self.GetIssueProperties() or {}).get('project')
1913 return {
1914 'issue': self.GetIssue(),
1915 'patch_project': project,
1916 'patch_storage': 'rietveld',
1917 'patchset': patchset or self.GetPatchset(),
1918 'rietveld': self.GetCodereviewServer(),
1919 }
1920
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 def GetApprovingReviewers(self):
1922 return get_approving_reviewers(self.GetIssueProperties())
1923
tandriide281ae2016-10-12 06:02:30 -07001924 def GetIssueOwner(self):
1925 return (self.GetIssueProperties() or {}).get('owner_email')
1926
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001927 def AddComment(self, message):
1928 return self.RpcServer().add_comment(self.GetIssue(), message)
1929
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001930 def GetStatus(self):
1931 """Apply a rough heuristic to give a simple summary of an issue's review
1932 or CQ status, assuming adherence to a common workflow.
1933
1934 Returns None if no issue for this branch, or one of the following keywords:
1935 * 'error' - error from review tool (including deleted issues)
1936 * 'unsent' - not sent for review
1937 * 'waiting' - waiting for review
1938 * 'reply' - waiting for owner to reply to review
1939 * 'lgtm' - LGTM from at least one approved reviewer
1940 * 'commit' - in the commit queue
1941 * 'closed' - closed
1942 """
1943 if not self.GetIssue():
1944 return None
1945
1946 try:
1947 props = self.GetIssueProperties()
1948 except urllib2.HTTPError:
1949 return 'error'
1950
1951 if props.get('closed'):
1952 # Issue is closed.
1953 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001954 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001955 # Issue is in the commit queue.
1956 return 'commit'
1957
1958 try:
1959 reviewers = self.GetApprovingReviewers()
1960 except urllib2.HTTPError:
1961 return 'error'
1962
1963 if reviewers:
1964 # Was LGTM'ed.
1965 return 'lgtm'
1966
1967 messages = props.get('messages') or []
1968
tandrii9d2c7a32016-06-22 03:42:45 -07001969 # Skip CQ messages that don't require owner's action.
1970 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
1971 if 'Dry run:' in messages[-1]['text']:
1972 messages.pop()
1973 elif 'The CQ bit was unchecked' in messages[-1]['text']:
1974 # This message always follows prior messages from CQ,
1975 # so skip this too.
1976 messages.pop()
1977 else:
1978 # This is probably a CQ messages warranting user attention.
1979 break
1980
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001981 if not messages:
1982 # No message was sent.
1983 return 'unsent'
1984 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07001985 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001986 return 'reply'
1987 return 'waiting'
1988
dsansomee2d6fd92016-09-08 00:10:47 -07001989 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001990 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001991
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001992 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001993 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001994
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001995 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07001996 return self.SetFlags({flag: value})
1997
1998 def SetFlags(self, flags):
1999 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002000 """
phajdan.jr68598232016-08-10 03:28:28 -07002001 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002002 try:
tandrii4b233bd2016-07-06 03:50:29 -07002003 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002004 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002005 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002006 if e.code == 404:
2007 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2008 if e.code == 403:
2009 DieWithError(
2010 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002011 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002012 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002013
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002014 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002015 """Returns an upload.RpcServer() to access this review's rietveld instance.
2016 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002017 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002018 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002019 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002020 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002021 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002022
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002023 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002024 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002025 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002026
tandrii5d48c322016-08-18 16:19:37 -07002027 @classmethod
2028 def PatchsetConfigKey(cls):
2029 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002030
tandrii5d48c322016-08-18 16:19:37 -07002031 @classmethod
2032 def CodereviewServerConfigKey(cls):
2033 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002034
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002035 def GetRieveldObjForPresubmit(self):
2036 return self.RpcServer()
2037
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002038 def SetCQState(self, new_state):
2039 props = self.GetIssueProperties()
2040 if props.get('private'):
2041 DieWithError('Cannot set-commit on private issue')
2042
2043 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002044 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002045 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002046 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002047 else:
tandrii4b233bd2016-07-06 03:50:29 -07002048 assert new_state == _CQState.DRY_RUN
2049 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002050
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002051 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2052 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002053 # PatchIssue should never be called with a dirty tree. It is up to the
2054 # caller to check this, but just in case we assert here since the
2055 # consequences of the caller not checking this could be dire.
2056 assert(not git_common.is_dirty_git_tree('apply'))
2057 assert(parsed_issue_arg.valid)
2058 self._changelist.issue = parsed_issue_arg.issue
2059 if parsed_issue_arg.hostname:
2060 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2061
skobes6468b902016-10-24 08:45:10 -07002062 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2063 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2064 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065 try:
skobes6468b902016-10-24 08:45:10 -07002066 scm_obj.apply_patch(patchset_object)
2067 except Exception as e:
2068 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 return 1
2070
2071 # If we had an issue, commit the current state and register the issue.
2072 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002073 self.SetIssue(self.GetIssue())
2074 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002075 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2076 'patch from issue %(i)s at patchset '
2077 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2078 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002079 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002081 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002082 return 0
2083
2084 @staticmethod
2085 def ParseIssueURL(parsed_url):
2086 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2087 return None
wychen3c1c1722016-08-04 11:46:36 -07002088 # Rietveld patch: https://domain/<number>/#ps<patchset>
2089 match = re.match(r'/(\d+)/$', parsed_url.path)
2090 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2091 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002092 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002093 issue=int(match.group(1)),
2094 patchset=int(match2.group(1)),
2095 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002096 # Typical url: https://domain/<issue_number>[/[other]]
2097 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2098 if match:
skobes6468b902016-10-24 08:45:10 -07002099 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002100 issue=int(match.group(1)),
2101 hostname=parsed_url.netloc)
2102 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2103 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2104 if match:
skobes6468b902016-10-24 08:45:10 -07002105 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002106 issue=int(match.group(1)),
2107 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002108 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002109 return None
2110
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002111 def CMDUploadChange(self, options, args, change):
2112 """Upload the patch to Rietveld."""
2113 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2114 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002115 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2116 if options.emulate_svn_auto_props:
2117 upload_args.append('--emulate_svn_auto_props')
2118
2119 change_desc = None
2120
2121 if options.email is not None:
2122 upload_args.extend(['--email', options.email])
2123
2124 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002125 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002126 upload_args.extend(['--title', options.title])
2127 if options.message:
2128 upload_args.extend(['--message', options.message])
2129 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002130 print('This branch is associated with issue %s. '
2131 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002132 else:
nodirca166002016-06-27 10:59:51 -07002133 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002134 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002135 if options.message:
2136 message = options.message
2137 else:
2138 message = CreateDescriptionFromLog(args)
2139 if options.title:
2140 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002141 change_desc = ChangeDescription(message)
2142 if options.reviewers or options.tbr_owners:
2143 change_desc.update_reviewers(options.reviewers,
2144 options.tbr_owners,
2145 change)
2146 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002147 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148
2149 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002150 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002151 return 1
2152
2153 upload_args.extend(['--message', change_desc.description])
2154 if change_desc.get_reviewers():
2155 upload_args.append('--reviewers=%s' % ','.join(
2156 change_desc.get_reviewers()))
2157 if options.send_mail:
2158 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002159 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002160 upload_args.append('--send_mail')
2161
2162 # We check this before applying rietveld.private assuming that in
2163 # rietveld.cc only addresses which we can send private CLs to are listed
2164 # if rietveld.private is set, and so we should ignore rietveld.cc only
2165 # when --private is specified explicitly on the command line.
2166 if options.private:
2167 logging.warn('rietveld.cc is ignored since private flag is specified. '
2168 'You need to review and add them manually if necessary.')
2169 cc = self.GetCCListWithoutDefault()
2170 else:
2171 cc = self.GetCCList()
2172 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002173 if change_desc.get_cced():
2174 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002175 if cc:
2176 upload_args.extend(['--cc', cc])
2177
2178 if options.private or settings.GetDefaultPrivateFlag() == "True":
2179 upload_args.append('--private')
2180
2181 upload_args.extend(['--git_similarity', str(options.similarity)])
2182 if not options.find_copies:
2183 upload_args.extend(['--git_no_find_copies'])
2184
2185 # Include the upstream repo's URL in the change -- this is useful for
2186 # projects that have their source spread across multiple repos.
2187 remote_url = self.GetGitBaseUrlFromConfig()
2188 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002189 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2190 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2191 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002192 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002193 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002194 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002195 if target_ref:
2196 upload_args.extend(['--target_ref', target_ref])
2197
2198 # Look for dependent patchsets. See crbug.com/480453 for more details.
2199 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2200 upstream_branch = ShortBranchName(upstream_branch)
2201 if remote is '.':
2202 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002203 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002205 print()
2206 print('Skipping dependency patchset upload because git config '
2207 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2208 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002209 else:
2210 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002211 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002212 auth_config=auth_config)
2213 branch_cl_issue_url = branch_cl.GetIssueURL()
2214 branch_cl_issue = branch_cl.GetIssue()
2215 branch_cl_patchset = branch_cl.GetPatchset()
2216 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2217 upload_args.extend(
2218 ['--depends_on_patchset', '%s:%s' % (
2219 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002220 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002221 '\n'
2222 'The current branch (%s) is tracking a local branch (%s) with '
2223 'an associated CL.\n'
2224 'Adding %s/#ps%s as a dependency patchset.\n'
2225 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2226 branch_cl_patchset))
2227
2228 project = settings.GetProject()
2229 if project:
2230 upload_args.extend(['--project', project])
2231
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 try:
2233 upload_args = ['upload'] + upload_args + args
2234 logging.info('upload.RealMain(%s)', upload_args)
2235 issue, patchset = upload.RealMain(upload_args)
2236 issue = int(issue)
2237 patchset = int(patchset)
2238 except KeyboardInterrupt:
2239 sys.exit(1)
2240 except:
2241 # If we got an exception after the user typed a description for their
2242 # change, back up the description before re-raising.
2243 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002244 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002245 raise
2246
2247 if not self.GetIssue():
2248 self.SetIssue(issue)
2249 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002250 return 0
2251
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002252
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002253class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002254 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002255 # auth_config is Rietveld thing, kept here to preserve interface only.
2256 super(_GerritChangelistImpl, self).__init__(changelist)
2257 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002258 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002259 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002260 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002261 # Map from change number (issue) to its detail cache.
2262 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002263
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002264 if codereview_host is not None:
2265 assert not codereview_host.startswith('https://'), codereview_host
2266 self._gerrit_host = codereview_host
2267 self._gerrit_server = 'https://%s' % codereview_host
2268
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002269 def _GetGerritHost(self):
2270 # Lazy load of configs.
2271 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002272 if self._gerrit_host and '.' not in self._gerrit_host:
2273 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2274 # This happens for internal stuff http://crbug.com/614312.
2275 parsed = urlparse.urlparse(self.GetRemoteUrl())
2276 if parsed.scheme == 'sso':
2277 print('WARNING: using non https URLs for remote is likely broken\n'
2278 ' Your current remote is: %s' % self.GetRemoteUrl())
2279 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2280 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002281 return self._gerrit_host
2282
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002283 def _GetGitHost(self):
2284 """Returns git host to be used when uploading change to Gerrit."""
2285 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2286
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002287 def GetCodereviewServer(self):
2288 if not self._gerrit_server:
2289 # If we're on a branch then get the server potentially associated
2290 # with that branch.
2291 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002292 self._gerrit_server = self._GitGetBranchConfigValue(
2293 self.CodereviewServerConfigKey())
2294 if self._gerrit_server:
2295 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002296 if not self._gerrit_server:
2297 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2298 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002299 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002300 parts[0] = parts[0] + '-review'
2301 self._gerrit_host = '.'.join(parts)
2302 self._gerrit_server = 'https://%s' % self._gerrit_host
2303 return self._gerrit_server
2304
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002305 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002306 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002307 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002308
tandrii5d48c322016-08-18 16:19:37 -07002309 @classmethod
2310 def PatchsetConfigKey(cls):
2311 return 'gerritpatchset'
2312
2313 @classmethod
2314 def CodereviewServerConfigKey(cls):
2315 return 'gerritserver'
2316
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002317 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002318 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002319 if settings.GetGerritSkipEnsureAuthenticated():
2320 # For projects with unusual authentication schemes.
2321 # See http://crbug.com/603378.
2322 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002323 # Lazy-loader to identify Gerrit and Git hosts.
2324 if gerrit_util.GceAuthenticator.is_gce():
2325 return
2326 self.GetCodereviewServer()
2327 git_host = self._GetGitHost()
2328 assert self._gerrit_server and self._gerrit_host
2329 cookie_auth = gerrit_util.CookiesAuthenticator()
2330
2331 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2332 git_auth = cookie_auth.get_auth_header(git_host)
2333 if gerrit_auth and git_auth:
2334 if gerrit_auth == git_auth:
2335 return
2336 print((
2337 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2338 ' Check your %s or %s file for credentials of hosts:\n'
2339 ' %s\n'
2340 ' %s\n'
2341 ' %s') %
2342 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2343 git_host, self._gerrit_host,
2344 cookie_auth.get_new_password_message(git_host)))
2345 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002346 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002347 return
2348 else:
2349 missing = (
2350 [] if gerrit_auth else [self._gerrit_host] +
2351 [] if git_auth else [git_host])
2352 DieWithError('Credentials for the following hosts are required:\n'
2353 ' %s\n'
2354 'These are read from %s (or legacy %s)\n'
2355 '%s' % (
2356 '\n '.join(missing),
2357 cookie_auth.get_gitcookies_path(),
2358 cookie_auth.get_netrc_path(),
2359 cookie_auth.get_new_password_message(git_host)))
2360
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002361 def EnsureCanUploadPatchset(self):
2362 """Best effort check that uploading isn't supposed to fail for predictable
2363 reasons.
2364
2365 This method should raise informative exception if uploading shouldn't
2366 proceed.
2367 """
2368 if not self.GetIssue():
2369 return
2370
2371 # Warm change details cache now to avoid RPCs later, reducing latency for
2372 # developers.
2373 self.FetchDescription()
2374
2375 status = self._GetChangeDetail()['status']
2376 if status in ('MERGED', 'ABANDONED'):
2377 DieWithError('Change %s has been %s, new uploads are not allowed' %
2378 (self.GetIssueURL(),
2379 'submitted' if status == 'MERGED' else 'abandoned'))
2380
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002381 def _PostUnsetIssueProperties(self):
2382 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002383 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002384
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002385 def GetRieveldObjForPresubmit(self):
2386 class ThisIsNotRietveldIssue(object):
2387 def __nonzero__(self):
2388 # This is a hack to make presubmit_support think that rietveld is not
2389 # defined, yet still ensure that calls directly result in a decent
2390 # exception message below.
2391 return False
2392
2393 def __getattr__(self, attr):
2394 print(
2395 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2396 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2397 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2398 'or use Rietveld for codereview.\n'
2399 'See also http://crbug.com/579160.' % attr)
2400 raise NotImplementedError()
2401 return ThisIsNotRietveldIssue()
2402
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002403 def GetGerritObjForPresubmit(self):
2404 return presubmit_support.GerritAccessor(self._GetGerritHost())
2405
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002406 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002407 """Apply a rough heuristic to give a simple summary of an issue's review
2408 or CQ status, assuming adherence to a common workflow.
2409
2410 Returns None if no issue for this branch, or one of the following keywords:
2411 * 'error' - error from review tool (including deleted issues)
2412 * 'unsent' - no reviewers added
2413 * 'waiting' - waiting for review
2414 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002415 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002416 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002417 * 'commit' - in the commit queue
2418 * 'closed' - abandoned
2419 """
2420 if not self.GetIssue():
2421 return None
2422
2423 try:
2424 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002425 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002426 return 'error'
2427
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002428 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002429 return 'closed'
2430
2431 cq_label = data['labels'].get('Commit-Queue', {})
2432 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002433 votes = cq_label.get('all', [])
2434 highest_vote = 0
2435 for v in votes:
2436 highest_vote = max(highest_vote, v.get('value', 0))
2437 vote_value = str(highest_vote)
2438 if vote_value != '0':
2439 # Add a '+' if the value is not 0 to match the values in the label.
2440 # The cq_label does not have negatives.
2441 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002442 vote_text = cq_label.get('values', {}).get(vote_value, '')
2443 if vote_text.lower() == 'commit':
2444 return 'commit'
2445
2446 lgtm_label = data['labels'].get('Code-Review', {})
2447 if lgtm_label:
2448 if 'rejected' in lgtm_label:
2449 return 'not lgtm'
2450 if 'approved' in lgtm_label:
2451 return 'lgtm'
2452
2453 if not data.get('reviewers', {}).get('REVIEWER', []):
2454 return 'unsent'
2455
2456 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002457 owner = data['owner'].get('_account_id')
2458 while messages:
2459 last_message_author = messages.pop().get('author', {})
2460 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2461 # Ignore replies from CQ.
2462 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002463 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002464 # Some reply from non-owner.
2465 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002466 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002467
2468 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002469 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002470 return data['revisions'][data['current_revision']]['_number']
2471
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002472 def FetchDescription(self, force=False):
2473 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2474 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002475 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002476 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002477
dsansomee2d6fd92016-09-08 00:10:47 -07002478 def UpdateDescriptionRemote(self, description, force=False):
2479 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2480 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002481 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002482 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002483 'unpublished edit. Either publish the edit in the Gerrit web UI '
2484 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002485
2486 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2487 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002488 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002489 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002490
2491 def CloseIssue(self):
2492 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2493
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002494 def GetApprovingReviewers(self):
2495 """Returns a list of reviewers approving the change.
2496
2497 Note: not necessarily committers.
2498 """
2499 raise NotImplementedError()
2500
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002501 def SubmitIssue(self, wait_for_merge=True):
2502 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2503 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002504
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002505 def _GetChangeDetail(self, options=None, issue=None,
2506 no_cache=False):
2507 """Returns details of the issue by querying Gerrit and caching results.
2508
2509 If fresh data is needed, set no_cache=True which will clear cache and
2510 thus new data will be fetched from Gerrit.
2511 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002512 options = options or []
2513 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002514 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002515
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002516 # Optimization to avoid multiple RPCs:
2517 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2518 'CURRENT_COMMIT' not in options):
2519 options.append('CURRENT_COMMIT')
2520
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002521 # Normalize issue and options for consistent keys in cache.
2522 issue = str(issue)
2523 options = [o.upper() for o in options]
2524
2525 # Check in cache first unless no_cache is True.
2526 if no_cache:
2527 self._detail_cache.pop(issue, None)
2528 else:
2529 options_set = frozenset(options)
2530 for cached_options_set, data in self._detail_cache.get(issue, []):
2531 # Assumption: data fetched before with extra options is suitable
2532 # for return for a smaller set of options.
2533 # For example, if we cached data for
2534 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2535 # and request is for options=[CURRENT_REVISION],
2536 # THEN we can return prior cached data.
2537 if options_set.issubset(cached_options_set):
2538 return data
2539
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002540 try:
2541 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2542 options, ignore_404=False)
2543 except gerrit_util.GerritError as e:
2544 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002545 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002546 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002547
2548 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002549 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002550
agable32978d92016-11-01 12:55:02 -07002551 def _GetChangeCommit(self, issue=None):
2552 issue = issue or self.GetIssue()
2553 assert issue, 'issue is required to query Gerrit'
2554 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2555 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002556 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002557 return data
2558
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002559 def CMDLand(self, force, bypass_hooks, verbose):
2560 if git_common.is_dirty_git_tree('land'):
2561 return 1
tandriid60367b2016-06-22 05:25:12 -07002562 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2563 if u'Commit-Queue' in detail.get('labels', {}):
2564 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002565 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2566 'which can test and land changes for you. '
2567 'Are you sure you wish to bypass it?\n',
2568 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002569
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002570 differs = True
tandriic4344b52016-08-29 06:04:54 -07002571 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002572 # Note: git diff outputs nothing if there is no diff.
2573 if not last_upload or RunGit(['diff', last_upload]).strip():
2574 print('WARNING: some changes from local branch haven\'t been uploaded')
2575 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002576 if detail['current_revision'] == last_upload:
2577 differs = False
2578 else:
2579 print('WARNING: local branch contents differ from latest uploaded '
2580 'patchset')
2581 if differs:
2582 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002583 confirm_or_exit(
2584 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2585 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002586 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2587 elif not bypass_hooks:
2588 hook_results = self.RunHook(
2589 committing=True,
2590 may_prompt=not force,
2591 verbose=verbose,
2592 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2593 if not hook_results.should_continue():
2594 return 1
2595
2596 self.SubmitIssue(wait_for_merge=True)
2597 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002598 links = self._GetChangeCommit().get('web_links', [])
2599 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002600 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002601 print('Landed as %s' % link.get('url'))
2602 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002603 return 0
2604
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002605 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2606 directory):
2607 assert not reject
2608 assert not nocommit
2609 assert not directory
2610 assert parsed_issue_arg.valid
2611
2612 self._changelist.issue = parsed_issue_arg.issue
2613
2614 if parsed_issue_arg.hostname:
2615 self._gerrit_host = parsed_issue_arg.hostname
2616 self._gerrit_server = 'https://%s' % self._gerrit_host
2617
tandriic2405f52016-10-10 08:13:15 -07002618 try:
2619 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002620 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002621 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002622
2623 if not parsed_issue_arg.patchset:
2624 # Use current revision by default.
2625 revision_info = detail['revisions'][detail['current_revision']]
2626 patchset = int(revision_info['_number'])
2627 else:
2628 patchset = parsed_issue_arg.patchset
2629 for revision_info in detail['revisions'].itervalues():
2630 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2631 break
2632 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002633 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002634 (parsed_issue_arg.patchset, self.GetIssue()))
2635
2636 fetch_info = revision_info['fetch']['http']
2637 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002638 self.SetIssue(self.GetIssue())
2639 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002640 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002641 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002642 (self.GetIssue(), self.GetPatchset()))
2643 return 0
2644
2645 @staticmethod
2646 def ParseIssueURL(parsed_url):
2647 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2648 return None
2649 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2650 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2651 # Short urls like https://domain/<issue_number> can be used, but don't allow
2652 # specifying the patchset (you'd 404), but we allow that here.
2653 if parsed_url.path == '/':
2654 part = parsed_url.fragment
2655 else:
2656 part = parsed_url.path
2657 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2658 if match:
2659 return _ParsedIssueNumberArgument(
2660 issue=int(match.group(2)),
2661 patchset=int(match.group(4)) if match.group(4) else None,
2662 hostname=parsed_url.netloc)
2663 return None
2664
tandrii16e0b4e2016-06-07 10:34:28 -07002665 def _GerritCommitMsgHookCheck(self, offer_removal):
2666 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2667 if not os.path.exists(hook):
2668 return
2669 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2670 # custom developer made one.
2671 data = gclient_utils.FileRead(hook)
2672 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2673 return
2674 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002675 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002676 'and may interfere with it in subtle ways.\n'
2677 'We recommend you remove the commit-msg hook.')
2678 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002679 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002680 gclient_utils.rm_file_or_tree(hook)
2681 print('Gerrit commit-msg hook removed.')
2682 else:
2683 print('OK, will keep Gerrit commit-msg hook in place.')
2684
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002685 def CMDUploadChange(self, options, args, change):
2686 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002687 if options.squash and options.no_squash:
2688 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002689
2690 if not options.squash and not options.no_squash:
2691 # Load default for user, repo, squash=true, in this order.
2692 options.squash = settings.GetSquashGerritUploads()
2693 elif options.no_squash:
2694 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002695
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002696 # We assume the remote called "origin" is the one we want.
2697 # It is probably not worthwhile to support different workflows.
2698 gerrit_remote = 'origin'
2699
2700 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002701 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002702
Aaron Gableb56ad332017-01-06 15:24:31 -08002703 # This may be None; default fallback value is determined in logic below.
2704 title = options.title
Aaron Gable856585d2017-01-23 15:32:00 -08002705 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002706
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002707 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002708 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002709 if self.GetIssue():
2710 # Try to get the message from a previous upload.
2711 message = self.GetDescription()
2712 if not message:
2713 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002714 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002715 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002716 if not title:
2717 default_title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
2718 title = ask_for_data(
2719 'Title for patchset [%s]: ' % default_title) or default_title
Aaron Gable856585d2017-01-23 15:32:00 -08002720 if title == default_title:
2721 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002722 change_id = self._GetChangeDetail()['change_id']
2723 while True:
2724 footer_change_ids = git_footers.get_footer_change_id(message)
2725 if footer_change_ids == [change_id]:
2726 break
2727 if not footer_change_ids:
2728 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002729 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730 continue
2731 # There is already a valid footer but with different or several ids.
2732 # Doing this automatically is non-trivial as we don't want to lose
2733 # existing other footers, yet we want to append just 1 desired
2734 # Change-Id. Thus, just create a new footer, but let user verify the
2735 # new description.
2736 message = '%s\n\nChange-Id: %s' % (message, change_id)
2737 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002738 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002739 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002740 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002741 'Please, check the proposed correction to the description, '
2742 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2743 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2744 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002745 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 if not options.force:
2747 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002748 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002749 message = change_desc.description
2750 if not message:
2751 DieWithError("Description is empty. Aborting...")
2752 # Continue the while loop.
2753 # Sanity check of this code - we should end up with proper message
2754 # footer.
2755 assert [change_id] == git_footers.get_footer_change_id(message)
2756 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002757 else: # if not self.GetIssue()
2758 if options.message:
2759 message = options.message
2760 else:
2761 message = CreateDescriptionFromLog(args)
2762 if options.title:
2763 message = options.title + '\n\n' + message
2764 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002765 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002766 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002767 # On first upload, patchset title is always this string, while
2768 # --title flag gets converted to first line of message.
2769 title = 'Initial upload'
Aaron Gable856585d2017-01-23 15:32:00 -08002770 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002771 if not change_desc.description:
2772 DieWithError("Description is empty. Aborting...")
2773 message = change_desc.description
2774 change_ids = git_footers.get_footer_change_id(message)
2775 if len(change_ids) > 1:
2776 DieWithError('too many Change-Id footers, at most 1 allowed.')
2777 if not change_ids:
2778 # Generate the Change-Id automatically.
2779 message = git_footers.add_footer_change_id(
2780 message, GenerateGerritChangeId(message))
2781 change_desc.set_description(message)
2782 change_ids = git_footers.get_footer_change_id(message)
2783 assert len(change_ids) == 1
2784 change_id = change_ids[0]
2785
2786 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2787 if remote is '.':
2788 # If our upstream branch is local, we base our squashed commit on its
2789 # squashed version.
2790 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2791 # Check the squashed hash of the parent.
2792 parent = RunGit(['config',
2793 'branch.%s.gerritsquashhash' % upstream_branch_name],
2794 error_ok=True).strip()
2795 # Verify that the upstream branch has been uploaded too, otherwise
2796 # Gerrit will create additional CLs when uploading.
2797 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2798 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002799 DieWithError(
Aaron Gable48746652017-01-06 11:49:21 -08002800 '\nUpload upstream branch %s first.\n'
2801 'It is likely that this branch has been rebased since its last '
2802 'upload, so you just need to upload it again.\n'
2803 '(If you uploaded it with --no-squash, then branch dependencies '
2804 'are not supported, and you should reupload with --squash.)'
Christopher Lamf732cd52017-01-24 12:40:11 +11002805 % upstream_branch_name, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002806 else:
2807 parent = self.GetCommonAncestorWithUpstream()
2808
2809 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2810 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2811 '-m', message]).strip()
2812 else:
2813 change_desc = ChangeDescription(
2814 options.message or CreateDescriptionFromLog(args))
2815 if not change_desc.description:
2816 DieWithError("Description is empty. Aborting...")
2817
2818 if not git_footers.get_footer_change_id(change_desc.description):
2819 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002820 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2821 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002822 ref_to_push = 'HEAD'
2823 parent = '%s/%s' % (gerrit_remote, branch)
2824 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2825
2826 assert change_desc
2827 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2828 ref_to_push)]).splitlines()
2829 if len(commits) > 1:
2830 print('WARNING: This will upload %d commits. Run the following command '
2831 'to see which commits will be uploaded: ' % len(commits))
2832 print('git log %s..%s' % (parent, ref_to_push))
2833 print('You can also use `git squash-branch` to squash these into a '
2834 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002835 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002836
2837 if options.reviewers or options.tbr_owners:
2838 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2839 change)
2840
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002841 # Extra options that can be specified at push time. Doc:
2842 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2843 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002844 if change_desc.get_reviewers(tbr_only=True):
2845 print('Adding self-LGTM (Code-Review +1) because of TBRs')
2846 refspec_opts.append('l=Code-Review+1')
2847
Aaron Gable9b713dd2016-12-14 16:04:21 -08002848 if title:
2849 if not re.match(r'^[\w ]+$', title):
2850 title = re.sub(r'[^\w ]', '', title)
Aaron Gable856585d2017-01-23 15:32:00 -08002851 if not automatic_title:
2852 print('WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08002853 'and spaces. You can edit it in the UI. '
2854 'See https://crbug.com/663787.\n'
2855 'Cleaned up title: %s' % title)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002856 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2857 # reverse on its side.
Aaron Gable9b713dd2016-12-14 16:04:21 -08002858 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002859
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002860 if options.send_mail:
2861 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002862 DieWithError('Must specify reviewers to send email.', change_desc)
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002863 refspec_opts.append('notify=ALL')
2864 else:
2865 refspec_opts.append('notify=NONE')
2866
tandrii99a72f22016-08-17 14:33:24 -07002867 reviewers = change_desc.get_reviewers()
2868 if reviewers:
Andrii Shyshkalovaf3a9992017-02-09 14:18:01 +01002869 # TODO(tandrii): remove this horrible hack once (Poly)Gerrit fixes their
2870 # side for real (b/34702620).
2871 def clean_invisible_chars(email):
2872 return email.decode('unicode_escape').encode('ascii', 'ignore')
2873 refspec_opts.extend('r=' + clean_invisible_chars(email).strip()
2874 for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002875
agablec6787972016-09-09 16:13:34 -07002876 if options.private:
2877 refspec_opts.append('draft')
2878
rmistry9eadede2016-09-19 11:22:43 -07002879 if options.topic:
2880 # Documentation on Gerrit topics is here:
2881 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
2882 refspec_opts.append('topic=%s' % options.topic)
2883
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002884 refspec_suffix = ''
2885 if refspec_opts:
2886 refspec_suffix = '%' + ','.join(refspec_opts)
2887 assert ' ' not in refspec_suffix, (
2888 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002889 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002890
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002891 try:
2892 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01002893 ['git', 'push', self.GetRemoteUrl(), refspec],
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002894 print_stdout=True,
2895 # Flush after every line: useful for seeing progress when running as
2896 # recipe.
2897 filter_fn=lambda _: sys.stdout.flush())
2898 except subprocess2.CalledProcessError:
2899 DieWithError('Failed to create a change. Please examine output above '
Christopher Lamf732cd52017-01-24 12:40:11 +11002900 'for the reason of the failure. ', change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002901
2902 if options.squash:
2903 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2904 change_numbers = [m.group(1)
2905 for m in map(regex.match, push_stdout.splitlines())
2906 if m]
2907 if len(change_numbers) != 1:
2908 DieWithError(
2909 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002910 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002911 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002912 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002913
2914 # Add cc's from the CC_LIST and --cc flag (if any).
2915 cc = self.GetCCList().split(',')
2916 if options.cc:
2917 cc.extend(options.cc)
2918 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07002919 if change_desc.get_cced():
2920 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07002921 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08002922 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08002923 self._GetGerritHost(), self.GetIssue(), cc,
2924 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002925 return 0
2926
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002927 def _AddChangeIdToCommitMessage(self, options, args):
2928 """Re-commits using the current message, assumes the commit hook is in
2929 place.
2930 """
2931 log_desc = options.message or CreateDescriptionFromLog(args)
2932 git_command = ['commit', '--amend', '-m', log_desc]
2933 RunGit(git_command)
2934 new_log_desc = CreateDescriptionFromLog(args)
2935 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002936 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002937 return new_log_desc
2938 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002939 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002940
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002941 def SetCQState(self, new_state):
2942 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002943 vote_map = {
2944 _CQState.NONE: 0,
2945 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002946 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002947 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002948 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
2949 if new_state == _CQState.DRY_RUN:
2950 # Don't spam everybody reviewer/owner.
2951 kwargs['notify'] = 'NONE'
2952 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002953
tandriie113dfd2016-10-11 10:20:12 -07002954 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002955 try:
2956 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002957 except GerritChangeNotExists:
2958 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002959
2960 if data['status'] in ('ABANDONED', 'MERGED'):
2961 return 'CL %s is closed' % self.GetIssue()
2962
2963 def GetTryjobProperties(self, patchset=None):
2964 """Returns dictionary of properties to launch tryjob."""
2965 data = self._GetChangeDetail(['ALL_REVISIONS'])
2966 patchset = int(patchset or self.GetPatchset())
2967 assert patchset
2968 revision_data = None # Pylint wants it to be defined.
2969 for revision_data in data['revisions'].itervalues():
2970 if int(revision_data['_number']) == patchset:
2971 break
2972 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002973 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002974 (patchset, self.GetIssue()))
2975 return {
2976 'patch_issue': self.GetIssue(),
2977 'patch_set': patchset or self.GetPatchset(),
2978 'patch_project': data['project'],
2979 'patch_storage': 'gerrit',
2980 'patch_ref': revision_data['fetch']['http']['ref'],
2981 'patch_repository_url': revision_data['fetch']['http']['url'],
2982 'patch_gerrit_url': self.GetCodereviewServer(),
2983 }
tandriie113dfd2016-10-11 10:20:12 -07002984
tandriide281ae2016-10-12 06:02:30 -07002985 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002986 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002987
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002988
2989_CODEREVIEW_IMPLEMENTATIONS = {
2990 'rietveld': _RietveldChangelistImpl,
2991 'gerrit': _GerritChangelistImpl,
2992}
2993
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002994
iannuccie53c9352016-08-17 14:40:40 -07002995def _add_codereview_issue_select_options(parser, extra=""):
2996 _add_codereview_select_options(parser)
2997
2998 text = ('Operate on this issue number instead of the current branch\'s '
2999 'implicit issue.')
3000 if extra:
3001 text += ' '+extra
3002 parser.add_option('-i', '--issue', type=int, help=text)
3003
3004
3005def _process_codereview_issue_select_options(parser, options):
3006 _process_codereview_select_options(parser, options)
3007 if options.issue is not None and not options.forced_codereview:
3008 parser.error('--issue must be specified with either --rietveld or --gerrit')
3009
3010
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003011def _add_codereview_select_options(parser):
3012 """Appends --gerrit and --rietveld options to force specific codereview."""
3013 parser.codereview_group = optparse.OptionGroup(
3014 parser, 'EXPERIMENTAL! Codereview override options')
3015 parser.add_option_group(parser.codereview_group)
3016 parser.codereview_group.add_option(
3017 '--gerrit', action='store_true',
3018 help='Force the use of Gerrit for codereview')
3019 parser.codereview_group.add_option(
3020 '--rietveld', action='store_true',
3021 help='Force the use of Rietveld for codereview')
3022
3023
3024def _process_codereview_select_options(parser, options):
3025 if options.gerrit and options.rietveld:
3026 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3027 options.forced_codereview = None
3028 if options.gerrit:
3029 options.forced_codereview = 'gerrit'
3030 elif options.rietveld:
3031 options.forced_codereview = 'rietveld'
3032
3033
tandriif9aefb72016-07-01 09:06:51 -07003034def _get_bug_line_values(default_project, bugs):
3035 """Given default_project and comma separated list of bugs, yields bug line
3036 values.
3037
3038 Each bug can be either:
3039 * a number, which is combined with default_project
3040 * string, which is left as is.
3041
3042 This function may produce more than one line, because bugdroid expects one
3043 project per line.
3044
3045 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3046 ['v8:123', 'chromium:789']
3047 """
3048 default_bugs = []
3049 others = []
3050 for bug in bugs.split(','):
3051 bug = bug.strip()
3052 if bug:
3053 try:
3054 default_bugs.append(int(bug))
3055 except ValueError:
3056 others.append(bug)
3057
3058 if default_bugs:
3059 default_bugs = ','.join(map(str, default_bugs))
3060 if default_project:
3061 yield '%s:%s' % (default_project, default_bugs)
3062 else:
3063 yield default_bugs
3064 for other in sorted(others):
3065 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3066 yield other
3067
3068
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003069class ChangeDescription(object):
3070 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003071 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003072 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Mark Mentovai600d3092017-03-08 12:58:18 -05003073 BUG_LINE = r'^[ \t]*(BUGS?|Bugs?)[ \t]*[:=][ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003074 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003075
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003076 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003077 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003078
agable@chromium.org42c20792013-09-12 17:34:49 +00003079 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003080 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003081 return '\n'.join(self._description_lines)
3082
3083 def set_description(self, desc):
3084 if isinstance(desc, basestring):
3085 lines = desc.splitlines()
3086 else:
3087 lines = [line.rstrip() for line in desc]
3088 while lines and not lines[0]:
3089 lines.pop(0)
3090 while lines and not lines[-1]:
3091 lines.pop(-1)
3092 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003093
piman@chromium.org336f9122014-09-04 02:16:55 +00003094 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003095 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003096 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003097 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003098 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003099 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003100
agable@chromium.org42c20792013-09-12 17:34:49 +00003101 # Get the set of R= and TBR= lines and remove them from the desciption.
3102 regexp = re.compile(self.R_LINE)
3103 matches = [regexp.match(line) for line in self._description_lines]
3104 new_desc = [l for i, l in enumerate(self._description_lines)
3105 if not matches[i]]
3106 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003107
agable@chromium.org42c20792013-09-12 17:34:49 +00003108 # Construct new unified R= and TBR= lines.
3109 r_names = []
3110 tbr_names = []
3111 for match in matches:
3112 if not match:
3113 continue
3114 people = cleanup_list([match.group(2).strip()])
3115 if match.group(1) == 'TBR':
3116 tbr_names.extend(people)
3117 else:
3118 r_names.extend(people)
3119 for name in r_names:
3120 if name not in reviewers:
3121 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003122 if add_owners_tbr:
3123 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07003124 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003125 all_reviewers = set(tbr_names + reviewers)
3126 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3127 all_reviewers)
3128 tbr_names.extend(owners_db.reviewers_for(missing_files,
3129 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003130 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3131 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3132
3133 # Put the new lines in the description where the old first R= line was.
3134 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3135 if 0 <= line_loc < len(self._description_lines):
3136 if new_tbr_line:
3137 self._description_lines.insert(line_loc, new_tbr_line)
3138 if new_r_line:
3139 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003140 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003141 if new_r_line:
3142 self.append_footer(new_r_line)
3143 if new_tbr_line:
3144 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003145
tandriif9aefb72016-07-01 09:06:51 -07003146 def prompt(self, bug=None):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003147 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003148 self.set_description([
3149 '# Enter a description of the change.',
3150 '# This will be displayed on the codereview site.',
3151 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003152 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003153 '--------------------',
3154 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003155
agable@chromium.org42c20792013-09-12 17:34:49 +00003156 regexp = re.compile(self.BUG_LINE)
3157 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003158 prefix = settings.GetBugPrefix()
3159 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Mark Mentovai57c47212017-03-09 11:14:09 -05003160 bug_line_format = settings.GetBugLineFormat()
tandriif9aefb72016-07-01 09:06:51 -07003161 for value in values:
Mark Mentovai57c47212017-03-09 11:14:09 -05003162 self.append_footer(bug_line_format % value)
tandriif9aefb72016-07-01 09:06:51 -07003163
agable@chromium.org42c20792013-09-12 17:34:49 +00003164 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003165 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003166 if not content:
3167 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003168 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003169
3170 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003171 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3172 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003173 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003174 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003175
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003176 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003177 """Adds a footer line to the description.
3178
3179 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3180 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3181 that Gerrit footers are always at the end.
3182 """
3183 parsed_footer_line = git_footers.parse_footer(line)
3184 if parsed_footer_line:
3185 # Line is a gerrit footer in the form: Footer-Key: any value.
3186 # Thus, must be appended observing Gerrit footer rules.
3187 self.set_description(
3188 git_footers.add_footer(self.description,
3189 key=parsed_footer_line[0],
3190 value=parsed_footer_line[1]))
3191 return
3192
3193 if not self._description_lines:
3194 self._description_lines.append(line)
3195 return
3196
3197 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3198 if gerrit_footers:
3199 # git_footers.split_footers ensures that there is an empty line before
3200 # actual (gerrit) footers, if any. We have to keep it that way.
3201 assert top_lines and top_lines[-1] == ''
3202 top_lines, separator = top_lines[:-1], top_lines[-1:]
3203 else:
3204 separator = [] # No need for separator if there are no gerrit_footers.
3205
3206 prev_line = top_lines[-1] if top_lines else ''
3207 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3208 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3209 top_lines.append('')
3210 top_lines.append(line)
3211 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003212
tandrii99a72f22016-08-17 14:33:24 -07003213 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003215 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003216 reviewers = [match.group(2).strip()
3217 for match in matches
3218 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003219 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003220
bradnelsond975b302016-10-23 12:20:23 -07003221 def get_cced(self):
3222 """Retrieves the list of reviewers."""
3223 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3224 cced = [match.group(2).strip() for match in matches if match]
3225 return cleanup_list(cced)
3226
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003227 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3228 """Updates this commit description given the parent.
3229
3230 This is essentially what Gnumbd used to do.
3231 Consult https://goo.gl/WMmpDe for more details.
3232 """
3233 assert parent_msg # No, orphan branch creation isn't supported.
3234 assert parent_hash
3235 assert dest_ref
3236 parent_footer_map = git_footers.parse_footers(parent_msg)
3237 # This will also happily parse svn-position, which GnumbD is no longer
3238 # supporting. While we'd generate correct footers, the verifier plugin
3239 # installed in Gerrit will block such commit (ie git push below will fail).
3240 parent_position = git_footers.get_position(parent_footer_map)
3241
3242 # Cherry-picks may have last line obscuring their prior footers,
3243 # from git_footers perspective. This is also what Gnumbd did.
3244 cp_line = None
3245 if (self._description_lines and
3246 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3247 cp_line = self._description_lines.pop()
3248
3249 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3250
3251 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3252 # user interference with actual footers we'd insert below.
3253 for i, (k, v) in enumerate(parsed_footers):
3254 if k.startswith('Cr-'):
3255 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3256
3257 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003258 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003259 if parent_position[0] == dest_ref:
3260 # Same branch as parent.
3261 number = int(parent_position[1]) + 1
3262 else:
3263 number = 1 # New branch, and extra lineage.
3264 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3265 int(parent_position[1])))
3266
3267 parsed_footers.append(('Cr-Commit-Position',
3268 '%s@{#%d}' % (dest_ref, number)))
3269 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3270
3271 self._description_lines = top_lines
3272 if cp_line:
3273 self._description_lines.append(cp_line)
3274 if self._description_lines[-1] != '':
3275 self._description_lines.append('') # Ensure footer separator.
3276 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3277
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003278
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003279def get_approving_reviewers(props):
3280 """Retrieves the reviewers that approved a CL from the issue properties with
3281 messages.
3282
3283 Note that the list may contain reviewers that are not committer, thus are not
3284 considered by the CQ.
3285 """
3286 return sorted(
3287 set(
3288 message['sender']
3289 for message in props['messages']
3290 if message['approval'] and message['sender'] in props['reviewers']
3291 )
3292 )
3293
3294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003295def FindCodereviewSettingsFile(filename='codereview.settings'):
3296 """Finds the given file starting in the cwd and going up.
3297
3298 Only looks up to the top of the repository unless an
3299 'inherit-review-settings-ok' file exists in the root of the repository.
3300 """
3301 inherit_ok_file = 'inherit-review-settings-ok'
3302 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003303 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003304 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3305 root = '/'
3306 while True:
3307 if filename in os.listdir(cwd):
3308 if os.path.isfile(os.path.join(cwd, filename)):
3309 return open(os.path.join(cwd, filename))
3310 if cwd == root:
3311 break
3312 cwd = os.path.dirname(cwd)
3313
3314
3315def LoadCodereviewSettingsFromFile(fileobj):
3316 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003317 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003318
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003319 def SetProperty(name, setting, unset_error_ok=False):
3320 fullname = 'rietveld.' + name
3321 if setting in keyvals:
3322 RunGit(['config', fullname, keyvals[setting]])
3323 else:
3324 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3325
tandrii48df5812016-10-17 03:55:37 -07003326 if not keyvals.get('GERRIT_HOST', False):
3327 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003328 # Only server setting is required. Other settings can be absent.
3329 # In that case, we ignore errors raised during option deletion attempt.
3330 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003331 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003332 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3333 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
Mark Mentovai57c47212017-03-09 11:14:09 -05003334 SetProperty('bug-line-format', 'BUG_LINE_FORMAT', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003335 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003336 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3337 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003338 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003339 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3340 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003341
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003342 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003343 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003344
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003345 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003346 RunGit(['config', 'gerrit.squash-uploads',
3347 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003348
tandrii@chromium.org28253532016-04-14 13:46:56 +00003349 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003350 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003351 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3352
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003353 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003354 # should be of the form
3355 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3356 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003357 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3358 keyvals['ORIGIN_URL_CONFIG']])
3359
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003360
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003361def urlretrieve(source, destination):
3362 """urllib is broken for SSL connections via a proxy therefore we
3363 can't use urllib.urlretrieve()."""
3364 with open(destination, 'w') as f:
3365 f.write(urllib2.urlopen(source).read())
3366
3367
ukai@chromium.org712d6102013-11-27 00:52:58 +00003368def hasSheBang(fname):
3369 """Checks fname is a #! script."""
3370 with open(fname) as f:
3371 return f.read(2).startswith('#!')
3372
3373
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003374# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3375def DownloadHooks(*args, **kwargs):
3376 pass
3377
3378
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003379def DownloadGerritHook(force):
3380 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003381
3382 Args:
3383 force: True to update hooks. False to install hooks if not present.
3384 """
3385 if not settings.GetIsGerrit():
3386 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003387 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003388 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3389 if not os.access(dst, os.X_OK):
3390 if os.path.exists(dst):
3391 if not force:
3392 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003393 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003394 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003395 if not hasSheBang(dst):
3396 DieWithError('Not a script: %s\n'
3397 'You need to download from\n%s\n'
3398 'into .git/hooks/commit-msg and '
3399 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003400 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3401 except Exception:
3402 if os.path.exists(dst):
3403 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003404 DieWithError('\nFailed to download hooks.\n'
3405 'You need to download from\n%s\n'
3406 'into .git/hooks/commit-msg and '
3407 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003408
3409
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003410def GetRietveldCodereviewSettingsInteractively():
3411 """Prompt the user for settings."""
3412 server = settings.GetDefaultServerUrl(error_ok=True)
3413 prompt = 'Rietveld server (host[:port])'
3414 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3415 newserver = ask_for_data(prompt + ':')
3416 if not server and not newserver:
3417 newserver = DEFAULT_SERVER
3418 if newserver:
3419 newserver = gclient_utils.UpgradeToHttps(newserver)
3420 if newserver != server:
3421 RunGit(['config', 'rietveld.server', newserver])
3422
3423 def SetProperty(initial, caption, name, is_url):
3424 prompt = caption
3425 if initial:
3426 prompt += ' ("x" to clear) [%s]' % initial
3427 new_val = ask_for_data(prompt + ':')
3428 if new_val == 'x':
3429 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3430 elif new_val:
3431 if is_url:
3432 new_val = gclient_utils.UpgradeToHttps(new_val)
3433 if new_val != initial:
3434 RunGit(['config', 'rietveld.' + name, new_val])
3435
3436 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3437 SetProperty(settings.GetDefaultPrivateFlag(),
3438 'Private flag (rietveld only)', 'private', False)
3439 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3440 'tree-status-url', False)
3441 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3442 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3443 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3444 'run-post-upload-hook', False)
3445
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003446
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003447class _GitCookiesChecker(object):
3448 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003449
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003450 _GOOGLESOURCE = 'googlesource.com'
3451
3452 def __init__(self):
3453 # Cached list of [host, identity, source], where source is either
3454 # .gitcookies or .netrc.
3455 self._all_hosts = None
3456
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003457 def ensure_configured_gitcookies(self):
3458 """Runs checks and suggests fixes to make git use .gitcookies from default
3459 path."""
3460 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3461 configured_path = RunGitSilent(
3462 ['config', '--global', 'http.cookiefile']).strip()
3463 if configured_path:
3464 self._ensure_default_gitcookies_path(configured_path, default)
3465 else:
3466 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003467
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003468 @staticmethod
3469 def _ensure_default_gitcookies_path(configured_path, default_path):
3470 assert configured_path
3471 if configured_path == default_path:
3472 print('git is already configured to use your .gitcookies from %s' %
3473 configured_path)
3474 return
3475
3476 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3477 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3478 (configured_path, default_path))
3479
3480 if not os.path.exists(configured_path):
3481 print('However, your configured .gitcookies file is missing.')
3482 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3483 action='reconfigure')
3484 RunGit(['config', '--global', 'http.cookiefile', default_path])
3485 return
3486
3487 if os.path.exists(default_path):
3488 print('WARNING: default .gitcookies file already exists %s' %
3489 default_path)
3490 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3491 default_path)
3492
3493 confirm_or_exit('Move existing .gitcookies to default location?',
3494 action='move')
3495 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003496 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003497 print('Moved and reconfigured git to use .gitcookies from %s' %
3498 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003499
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003500 @staticmethod
3501 def _configure_gitcookies_path(default_path):
3502 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3503 if os.path.exists(netrc_path):
3504 print('You seem to be using outdated .netrc for git credentials: %s' %
3505 netrc_path)
3506 print('This tool will guide you through setting up recommended '
3507 '.gitcookies store for git credentials.\n'
3508 '\n'
3509 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3510 ' git config --global --unset http.cookiefile\n'
3511 ' mv %s %s.backup\n\n' % (default_path, default_path))
3512 confirm_or_exit(action='setup .gitcookies')
3513 RunGit(['config', '--global', 'http.cookiefile', default_path])
3514 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003515
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003516 def get_hosts_with_creds(self, include_netrc=False):
3517 if self._all_hosts is None:
3518 a = gerrit_util.CookiesAuthenticator()
3519 self._all_hosts = [
3520 (h, u, s)
3521 for h, u, s in itertools.chain(
3522 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3523 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3524 )
3525 if h.endswith(self._GOOGLESOURCE)
3526 ]
3527
3528 if include_netrc:
3529 return self._all_hosts
3530 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3531
3532 def print_current_creds(self, include_netrc=False):
3533 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3534 if not hosts:
3535 print('No Git/Gerrit credentials found')
3536 return
3537 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3538 header = [('Host', 'User', 'Which file'),
3539 ['=' * l for l in lengths]]
3540 for row in (header + hosts):
3541 print('\t'.join((('%%+%ds' % l) % s)
3542 for l, s in zip(lengths, row)))
3543
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003544 @staticmethod
3545 def _parse_identity(identity):
3546 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3547 username, domain = identity.split('.', 1)
3548 if username.startswith('git-'):
3549 username = username[len('git-'):]
3550 return username, domain
3551
3552 def _get_usernames_of_domain(self, domain):
3553 """Returns list of usernames referenced by .gitcookies in a given domain."""
3554 identities_by_domain = {}
3555 for _, identity, _ in self.get_hosts_with_creds():
3556 username, domain = self._parse_identity(identity)
3557 identities_by_domain.setdefault(domain, []).append(username)
3558 return identities_by_domain.get(domain)
3559
3560 def _canonical_git_googlesource_host(self, host):
3561 """Normalizes Gerrit hosts (with '-review') to Git host."""
3562 assert host.endswith(self._GOOGLESOURCE)
3563 # Prefix doesn't include '.' at the end.
3564 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3565 if prefix.endswith('-review'):
3566 prefix = prefix[:-len('-review')]
3567 return prefix + '.' + self._GOOGLESOURCE
3568
3569 def has_generic_host(self):
3570 """Returns whether generic .googlesource.com has been configured.
3571
3572 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3573 """
3574 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3575 if host == '.' + self._GOOGLESOURCE:
3576 return True
3577 return False
3578
3579 def _get_git_gerrit_identity_pairs(self):
3580 """Returns map from canonic host to pair of identities (Git, Gerrit).
3581
3582 One of identities might be None, meaning not configured.
3583 """
3584 host_to_identity_pairs = {}
3585 for host, identity, _ in self.get_hosts_with_creds():
3586 canonical = self._canonical_git_googlesource_host(host)
3587 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3588 idx = 0 if canonical == host else 1
3589 pair[idx] = identity
3590 return host_to_identity_pairs
3591
3592 def get_partially_configured_hosts(self):
3593 return set(
3594 host for host, identities_pair in
3595 self._get_git_gerrit_identity_pairs().iteritems()
3596 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3597
3598 def get_conflicting_hosts(self):
3599 return set(
3600 host for host, (i1, i2) in
3601 self._get_git_gerrit_identity_pairs().iteritems()
3602 if None not in (i1, i2) and i1 != i2)
3603
3604 def get_duplicated_hosts(self):
3605 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3606 return set(host for host, count in counters.iteritems() if count > 1)
3607
3608 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3609 'chromium.googlesource.com': 'chromium.org',
3610 'chrome-internal.googlesource.com': 'google.com',
3611 }
3612
3613 def get_hosts_with_wrong_identities(self):
3614 """Finds hosts which **likely** reference wrong identities.
3615
3616 Note: skips hosts which have conflicting identities for Git and Gerrit.
3617 """
3618 hosts = set()
3619 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3620 pair = self._get_git_gerrit_identity_pairs().get(host)
3621 if pair and pair[0] == pair[1]:
3622 _, domain = self._parse_identity(pair[0])
3623 if domain != expected:
3624 hosts.add(host)
3625 return hosts
3626
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003627
3628def CMDcreds_check(parser, args):
3629 """Checks credentials and suggests changes."""
3630 _, _ = parser.parse_args(args)
3631
3632 if gerrit_util.GceAuthenticator.is_gce():
3633 DieWithError('this command is not designed for GCE, are you on a bot?')
3634
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003635 checker = _GitCookiesChecker()
3636 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003637
3638 print('Your .netrc and .gitcookies have credentails for these hosts:')
3639 checker.print_current_creds(include_netrc=True)
3640
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003641 # TODO(tandrii): add report && autofixes.
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003642 return 0
3643
3644
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003645@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003646def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003647 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003648
tandrii5d0a0422016-09-14 06:24:35 -07003649 print('WARNING: git cl config works for Rietveld only')
3650 # TODO(tandrii): remove this once we switch to Gerrit.
3651 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003652 parser.add_option('--activate-update', action='store_true',
3653 help='activate auto-updating [rietveld] section in '
3654 '.git/config')
3655 parser.add_option('--deactivate-update', action='store_true',
3656 help='deactivate auto-updating [rietveld] section in '
3657 '.git/config')
3658 options, args = parser.parse_args(args)
3659
3660 if options.deactivate_update:
3661 RunGit(['config', 'rietveld.autoupdate', 'false'])
3662 return
3663
3664 if options.activate_update:
3665 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3666 return
3667
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003668 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003669 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003670 return 0
3671
3672 url = args[0]
3673 if not url.endswith('codereview.settings'):
3674 url = os.path.join(url, 'codereview.settings')
3675
3676 # Load code review settings and download hooks (if available).
3677 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3678 return 0
3679
3680
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003681def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003682 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003683 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3684 branch = ShortBranchName(branchref)
3685 _, args = parser.parse_args(args)
3686 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003687 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003688 return RunGit(['config', 'branch.%s.base-url' % branch],
3689 error_ok=False).strip()
3690 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003691 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003692 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3693 error_ok=False).strip()
3694
3695
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003696def color_for_status(status):
3697 """Maps a Changelist status to color, for CMDstatus and other tools."""
3698 return {
3699 'unsent': Fore.RED,
3700 'waiting': Fore.BLUE,
3701 'reply': Fore.YELLOW,
3702 'lgtm': Fore.GREEN,
3703 'commit': Fore.MAGENTA,
3704 'closed': Fore.CYAN,
3705 'error': Fore.WHITE,
3706 }.get(status, Fore.WHITE)
3707
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003708
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003709def get_cl_statuses(changes, fine_grained, max_processes=None):
3710 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003711
3712 If fine_grained is true, this will fetch CL statuses from the server.
3713 Otherwise, simply indicate if there's a matching url for the given branches.
3714
3715 If max_processes is specified, it is used as the maximum number of processes
3716 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3717 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003718
3719 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003720 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003721 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003722 upload.verbosity = 0
3723
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003724 if not changes:
3725 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003726
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003727 if not fine_grained:
3728 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003729 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003730 for cl in changes:
3731 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003732 return
3733
3734 # First, sort out authentication issues.
3735 logging.debug('ensuring credentials exist')
3736 for cl in changes:
3737 cl.EnsureAuthenticated(force=False, refresh=True)
3738
3739 def fetch(cl):
3740 try:
3741 return (cl, cl.GetStatus())
3742 except:
3743 # See http://crbug.com/629863.
3744 logging.exception('failed to fetch status for %s:', cl)
3745 raise
3746
3747 threads_count = len(changes)
3748 if max_processes:
3749 threads_count = max(1, min(threads_count, max_processes))
3750 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3751
3752 pool = ThreadPool(threads_count)
3753 fetched_cls = set()
3754 try:
3755 it = pool.imap_unordered(fetch, changes).__iter__()
3756 while True:
3757 try:
3758 cl, status = it.next(timeout=5)
3759 except multiprocessing.TimeoutError:
3760 break
3761 fetched_cls.add(cl)
3762 yield cl, status
3763 finally:
3764 pool.close()
3765
3766 # Add any branches that failed to fetch.
3767 for cl in set(changes) - fetched_cls:
3768 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003769
rmistry@google.com2dd99862015-06-22 12:22:18 +00003770
3771def upload_branch_deps(cl, args):
3772 """Uploads CLs of local branches that are dependents of the current branch.
3773
3774 If the local branch dependency tree looks like:
3775 test1 -> test2.1 -> test3.1
3776 -> test3.2
3777 -> test2.2 -> test3.3
3778
3779 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3780 run on the dependent branches in this order:
3781 test2.1, test3.1, test3.2, test2.2, test3.3
3782
3783 Note: This function does not rebase your local dependent branches. Use it when
3784 you make a change to the parent branch that will not conflict with its
3785 dependent branches, and you would like their dependencies updated in
3786 Rietveld.
3787 """
3788 if git_common.is_dirty_git_tree('upload-branch-deps'):
3789 return 1
3790
3791 root_branch = cl.GetBranch()
3792 if root_branch is None:
3793 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3794 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01003795 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003796 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3797 'patchset dependencies without an uploaded CL.')
3798
3799 branches = RunGit(['for-each-ref',
3800 '--format=%(refname:short) %(upstream:short)',
3801 'refs/heads'])
3802 if not branches:
3803 print('No local branches found.')
3804 return 0
3805
3806 # Create a dictionary of all local branches to the branches that are dependent
3807 # on it.
3808 tracked_to_dependents = collections.defaultdict(list)
3809 for b in branches.splitlines():
3810 tokens = b.split()
3811 if len(tokens) == 2:
3812 branch_name, tracked = tokens
3813 tracked_to_dependents[tracked].append(branch_name)
3814
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print()
3816 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003817 dependents = []
3818 def traverse_dependents_preorder(branch, padding=''):
3819 dependents_to_process = tracked_to_dependents.get(branch, [])
3820 padding += ' '
3821 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003822 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003823 dependents.append(dependent)
3824 traverse_dependents_preorder(dependent, padding)
3825 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003827
3828 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003829 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003830 return 0
3831
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003832 confirm_or_exit('This command will checkout all dependent branches and run '
3833 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003834
andybons@chromium.org962f9462016-02-03 20:00:42 +00003835 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003836 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003837 args.extend(['-t', 'Updated patchset dependency'])
3838
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839 # Record all dependents that failed to upload.
3840 failures = {}
3841 # Go through all dependents, checkout the branch and upload.
3842 try:
3843 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print()
3845 print('--------------------------------------')
3846 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003847 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003849 try:
3850 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003851 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003852 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003853 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003854 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003855 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003856 finally:
3857 # Swap back to the original root branch.
3858 RunGit(['checkout', '-q', root_branch])
3859
vapiera7fbd5a2016-06-16 09:17:49 -07003860 print()
3861 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003862 for dependent_branch in dependents:
3863 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003864 print(' %s : %s' % (dependent_branch, upload_status))
3865 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003866
3867 return 0
3868
3869
kmarshall3bff56b2016-06-06 18:31:47 -07003870def CMDarchive(parser, args):
3871 """Archives and deletes branches associated with closed changelists."""
3872 parser.add_option(
3873 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003874 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003875 parser.add_option(
3876 '-f', '--force', action='store_true',
3877 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003878 parser.add_option(
3879 '-d', '--dry-run', action='store_true',
3880 help='Skip the branch tagging and removal steps.')
3881 parser.add_option(
3882 '-t', '--notags', action='store_true',
3883 help='Do not tag archived branches. '
3884 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003885
3886 auth.add_auth_options(parser)
3887 options, args = parser.parse_args(args)
3888 if args:
3889 parser.error('Unsupported args: %s' % ' '.join(args))
3890 auth_config = auth.extract_auth_config_from_options(options)
3891
3892 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3893 if not branches:
3894 return 0
3895
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07003897 changes = [Changelist(branchref=b, auth_config=auth_config)
3898 for b in branches.splitlines()]
3899 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3900 statuses = get_cl_statuses(changes,
3901 fine_grained=True,
3902 max_processes=options.maxjobs)
3903 proposal = [(cl.GetBranch(),
3904 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3905 for cl, status in statuses
3906 if status == 'closed']
3907 proposal.sort()
3908
3909 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003910 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003911 return 0
3912
3913 current_branch = GetCurrentBranch()
3914
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003916 if options.notags:
3917 for next_item in proposal:
3918 print(' ' + next_item[0])
3919 else:
3920 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3921 for next_item in proposal:
3922 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003923
kmarshall9249e012016-08-23 12:02:16 -07003924 # Quit now on precondition failure or if instructed by the user, either
3925 # via an interactive prompt or by command line flags.
3926 if options.dry_run:
3927 print('\nNo changes were made (dry run).\n')
3928 return 0
3929 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003930 print('You are currently on a branch \'%s\' which is associated with a '
3931 'closed codereview issue, so archive cannot proceed. Please '
3932 'checkout another branch and run this command again.' %
3933 current_branch)
3934 return 1
kmarshall9249e012016-08-23 12:02:16 -07003935 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003936 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3937 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003938 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003939 return 1
3940
3941 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003942 if not options.notags:
3943 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003944 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003945
vapiera7fbd5a2016-06-16 09:17:49 -07003946 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003947
3948 return 0
3949
3950
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003951def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003952 """Show status of changelists.
3953
3954 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003955 - Red not sent for review or broken
3956 - Blue waiting for review
3957 - Yellow waiting for you to reply to review
3958 - Green LGTM'ed
3959 - Magenta in the commit queue
3960 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003961
3962 Also see 'git cl comments'.
3963 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003964 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003965 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003966 parser.add_option('-f', '--fast', action='store_true',
3967 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003968 parser.add_option(
3969 '-j', '--maxjobs', action='store', type=int,
3970 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003971
3972 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07003973 _add_codereview_issue_select_options(
3974 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003975 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07003976 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003977 if args:
3978 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003979 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003980
iannuccie53c9352016-08-17 14:40:40 -07003981 if options.issue is not None and not options.field:
3982 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07003983
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003984 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07003985 cl = Changelist(auth_config=auth_config, issue=options.issue,
3986 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003987 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003989 elif options.field == 'id':
3990 issueid = cl.GetIssue()
3991 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003992 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003993 elif options.field == 'patch':
3994 patchset = cl.GetPatchset()
3995 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003996 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003997 elif options.field == 'status':
3998 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003999 elif options.field == 'url':
4000 url = cl.GetIssueURL()
4001 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004003 return 0
4004
4005 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4006 if not branches:
4007 print('No local branch found.')
4008 return 0
4009
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004010 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004011 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004012 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004013 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004014 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004015 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004016 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004017
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004018 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004019 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4020 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4021 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004022 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004023 c, status = output.next()
4024 branch_statuses[c.GetBranch()] = status
4025 status = branch_statuses.pop(branch)
4026 url = cl.GetIssueURL()
4027 if url and (not status or status == 'error'):
4028 # The issue probably doesn't exist anymore.
4029 url += ' (broken)'
4030
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004031 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004032 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004033 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004034 color = ''
4035 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004036 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004037 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004038 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004039 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004040
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004041
4042 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004043 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004044 print('Current branch: %s' % branch)
4045 for cl in changes:
4046 if cl.GetBranch() == branch:
4047 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004048 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004050 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004051 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004052 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print('Issue description:')
4054 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004055 return 0
4056
4057
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004058def colorize_CMDstatus_doc():
4059 """To be called once in main() to add colors to git cl status help."""
4060 colors = [i for i in dir(Fore) if i[0].isupper()]
4061
4062 def colorize_line(line):
4063 for color in colors:
4064 if color in line.upper():
4065 # Extract whitespaces first and the leading '-'.
4066 indent = len(line) - len(line.lstrip(' ')) + 1
4067 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4068 return line
4069
4070 lines = CMDstatus.__doc__.splitlines()
4071 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4072
4073
phajdan.jre328cf92016-08-22 04:12:17 -07004074def write_json(path, contents):
4075 with open(path, 'w') as f:
4076 json.dump(contents, f)
4077
4078
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004079@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004081 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004082
4083 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004084 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004085 parser.add_option('-r', '--reverse', action='store_true',
4086 help='Lookup the branch(es) for the specified issues. If '
4087 'no issues are specified, all branches with mapped '
4088 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004089 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004090 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004091 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004092 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004093
dnj@chromium.org406c4402015-03-03 17:22:28 +00004094 if options.reverse:
4095 branches = RunGit(['for-each-ref', 'refs/heads',
4096 '--format=%(refname:short)']).splitlines()
4097
4098 # Reverse issue lookup.
4099 issue_branch_map = {}
4100 for branch in branches:
4101 cl = Changelist(branchref=branch)
4102 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4103 if not args:
4104 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004105 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004106 for issue in args:
4107 if not issue:
4108 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004109 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004110 print('Branch for issue number %s: %s' % (
4111 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004112 if options.json:
4113 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004114 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004115 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004116 if len(args) > 0:
4117 try:
4118 issue = int(args[0])
4119 except ValueError:
4120 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004121 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004122 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004124 if options.json:
4125 write_json(options.json, {
4126 'issue': cl.GetIssue(),
4127 'issue_url': cl.GetIssueURL(),
4128 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004129 return 0
4130
4131
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004132def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004133 """Shows or posts review comments for any changelist."""
4134 parser.add_option('-a', '--add-comment', dest='comment',
4135 help='comment to add to an issue')
4136 parser.add_option('-i', dest='issue',
4137 help="review issue id (defaults to current issue)")
smut@google.comc85ac942015-09-15 16:34:43 +00004138 parser.add_option('-j', '--json-file',
4139 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004140 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004141 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004142 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004143
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004144 issue = None
4145 if options.issue:
4146 try:
4147 issue = int(options.issue)
4148 except ValueError:
4149 DieWithError('A review issue id is expected to be a number')
4150
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00004151 cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004152
4153 if options.comment:
4154 cl.AddComment(options.comment)
4155 return 0
4156
4157 data = cl.GetIssueProperties()
smut@google.comc85ac942015-09-15 16:34:43 +00004158 summary = []
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00004159 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
smut@google.comc85ac942015-09-15 16:34:43 +00004160 summary.append({
4161 'date': message['date'],
4162 'lgtm': False,
4163 'message': message['text'],
4164 'not_lgtm': False,
4165 'sender': message['sender'],
4166 })
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004167 if message['disapproval']:
4168 color = Fore.RED
smut@google.comc85ac942015-09-15 16:34:43 +00004169 summary[-1]['not lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004170 elif message['approval']:
4171 color = Fore.GREEN
smut@google.comc85ac942015-09-15 16:34:43 +00004172 summary[-1]['lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004173 elif message['sender'] == data['owner_email']:
4174 color = Fore.MAGENTA
4175 else:
4176 color = Fore.BLUE
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print('\n%s%s %s%s' % (
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004178 color, message['date'].split('.', 1)[0], message['sender'],
vapiera7fbd5a2016-06-16 09:17:49 -07004179 Fore.RESET))
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004180 if message['text'].strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('\n'.join(' ' + l for l in message['text'].splitlines()))
smut@google.comc85ac942015-09-15 16:34:43 +00004182 if options.json_file:
4183 with open(options.json_file, 'wb') as f:
4184 json.dump(summary, f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004185 return 0
4186
4187
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004188@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004189def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004190 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004191 parser.add_option('-d', '--display', action='store_true',
4192 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004193 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004194 help='New description to set for this issue (- for stdin, '
4195 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004196 parser.add_option('-f', '--force', action='store_true',
4197 help='Delete any unpublished Gerrit edits for this issue '
4198 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004199
4200 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004201 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004202 options, args = parser.parse_args(args)
4203 _process_codereview_select_options(parser, options)
4204
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004205 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004206 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004207 target_issue_arg = ParseIssueNumberArgument(args[0])
4208 if not target_issue_arg.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004209 parser.print_help()
4210 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004211
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004212 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004213
martiniss6eda05f2016-06-30 10:18:35 -07004214 kwargs = {
4215 'auth_config': auth_config,
4216 'codereview': options.forced_codereview,
4217 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004218 if target_issue_arg:
4219 kwargs['issue'] = target_issue_arg.issue
4220 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004221
4222 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004223
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004224 if not cl.GetIssue():
4225 DieWithError('This branch has no associated changelist.')
4226 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004227
smut@google.com34fb6b12015-07-13 20:03:26 +00004228 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004230 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004231
4232 if options.new_description:
4233 text = options.new_description
4234 if text == '-':
4235 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004236 elif text == '+':
4237 base_branch = cl.GetCommonAncestorWithUpstream()
4238 change = cl.GetChange(base_branch, None, local_description=True)
4239 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004240
4241 description.set_description(text)
4242 else:
4243 description.prompt()
4244
wychen@chromium.org063e4e52015-04-03 06:51:44 +00004245 if cl.GetDescription() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004246 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004247 return 0
4248
4249
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004250def CreateDescriptionFromLog(args):
4251 """Pulls out the commit log to use as a base for the CL description."""
4252 log_args = []
4253 if len(args) == 1 and not args[0].endswith('.'):
4254 log_args = [args[0] + '..']
4255 elif len(args) == 1 and args[0].endswith('...'):
4256 log_args = [args[0][:-1]]
4257 elif len(args) == 2:
4258 log_args = [args[0] + '..' + args[1]]
4259 else:
4260 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004261 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004262
4263
thestig@chromium.org44202a22014-03-11 19:22:18 +00004264def CMDlint(parser, args):
4265 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004266 parser.add_option('--filter', action='append', metavar='-x,+y',
4267 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004268 auth.add_auth_options(parser)
4269 options, args = parser.parse_args(args)
4270 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004271
4272 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004273 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004274 try:
4275 import cpplint
4276 import cpplint_chromium
4277 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004278 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004279 return 1
4280
4281 # Change the current working directory before calling lint so that it
4282 # shows the correct base.
4283 previous_cwd = os.getcwd()
4284 os.chdir(settings.GetRoot())
4285 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004286 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004287 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4288 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004289 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004290 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004291 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004292
4293 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004294 command = args + files
4295 if options.filter:
4296 command = ['--filter=' + ','.join(options.filter)] + command
4297 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004298
4299 white_regex = re.compile(settings.GetLintRegex())
4300 black_regex = re.compile(settings.GetLintIgnoreRegex())
4301 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4302 for filename in filenames:
4303 if white_regex.match(filename):
4304 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004306 else:
4307 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4308 extra_check_functions)
4309 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004310 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004311 finally:
4312 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004313 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004314 if cpplint._cpplint_state.error_count != 0:
4315 return 1
4316 return 0
4317
4318
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004319def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004320 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004321 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004322 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004323 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004324 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004325 auth.add_auth_options(parser)
4326 options, args = parser.parse_args(args)
4327 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004328
sbc@chromium.org71437c02015-04-09 19:29:40 +00004329 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004330 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004331 return 1
4332
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004333 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004334 if args:
4335 base_branch = args[0]
4336 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004337 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004338 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004339
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004340 cl.RunHook(
4341 committing=not options.upload,
4342 may_prompt=False,
4343 verbose=options.verbose,
4344 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004345 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004346
4347
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004348def GenerateGerritChangeId(message):
4349 """Returns Ixxxxxx...xxx change id.
4350
4351 Works the same way as
4352 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4353 but can be called on demand on all platforms.
4354
4355 The basic idea is to generate git hash of a state of the tree, original commit
4356 message, author/committer info and timestamps.
4357 """
4358 lines = []
4359 tree_hash = RunGitSilent(['write-tree'])
4360 lines.append('tree %s' % tree_hash.strip())
4361 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4362 if code == 0:
4363 lines.append('parent %s' % parent.strip())
4364 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4365 lines.append('author %s' % author.strip())
4366 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4367 lines.append('committer %s' % committer.strip())
4368 lines.append('')
4369 # Note: Gerrit's commit-hook actually cleans message of some lines and
4370 # whitespace. This code is not doing this, but it clearly won't decrease
4371 # entropy.
4372 lines.append(message)
4373 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4374 stdin='\n'.join(lines))
4375 return 'I%s' % change_hash.strip()
4376
4377
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004378def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004379 """Computes the remote branch ref to use for the CL.
4380
4381 Args:
4382 remote (str): The git remote for the CL.
4383 remote_branch (str): The git remote branch for the CL.
4384 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004385 """
4386 if not (remote and remote_branch):
4387 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004388
wittman@chromium.org455dc922015-01-26 20:15:50 +00004389 if target_branch:
4390 # Cannonicalize branch references to the equivalent local full symbolic
4391 # refs, which are then translated into the remote full symbolic refs
4392 # below.
4393 if '/' not in target_branch:
4394 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4395 else:
4396 prefix_replacements = (
4397 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4398 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4399 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4400 )
4401 match = None
4402 for regex, replacement in prefix_replacements:
4403 match = re.search(regex, target_branch)
4404 if match:
4405 remote_branch = target_branch.replace(match.group(0), replacement)
4406 break
4407 if not match:
4408 # This is a branch path but not one we recognize; use as-is.
4409 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004410 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4411 # Handle the refs that need to land in different refs.
4412 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004413
wittman@chromium.org455dc922015-01-26 20:15:50 +00004414 # Create the true path to the remote branch.
4415 # Does the following translation:
4416 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4417 # * refs/remotes/origin/master -> refs/heads/master
4418 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4419 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4420 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4421 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4422 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4423 'refs/heads/')
4424 elif remote_branch.startswith('refs/remotes/branch-heads'):
4425 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004426
wittman@chromium.org455dc922015-01-26 20:15:50 +00004427 return remote_branch
4428
4429
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004430def cleanup_list(l):
4431 """Fixes a list so that comma separated items are put as individual items.
4432
4433 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4434 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4435 """
4436 items = sum((i.split(',') for i in l), [])
4437 stripped_items = (i.strip() for i in items)
4438 return sorted(filter(None, stripped_items))
4439
4440
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004441@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004442def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004443 """Uploads the current changelist to codereview.
4444
4445 Can skip dependency patchset uploads for a branch by running:
4446 git config branch.branch_name.skip-deps-uploads True
4447 To unset run:
4448 git config --unset branch.branch_name.skip-deps-uploads
4449 Can also set the above globally by using the --global flag.
4450 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004451 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4452 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004453 parser.add_option('--bypass-watchlists', action='store_true',
4454 dest='bypass_watchlists',
4455 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004456 parser.add_option('-f', action='store_true', dest='force',
4457 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004458 parser.add_option('--message', '-m', dest='message',
4459 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004460 parser.add_option('-b', '--bug',
4461 help='pre-populate the bug number(s) for this issue. '
4462 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004463 parser.add_option('--message-file', dest='message_file',
4464 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004465 parser.add_option('--title', '-t', dest='title',
4466 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004467 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004468 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004469 help='reviewer email addresses')
4470 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004471 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004472 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004473 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004474 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004475 parser.add_option('--emulate_svn_auto_props',
4476 '--emulate-svn-auto-props',
4477 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004478 dest="emulate_svn_auto_props",
4479 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004480 parser.add_option('-c', '--use-commit-queue', action='store_true',
4481 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004482 parser.add_option('--private', action='store_true',
4483 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004484 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004485 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004486 metavar='TARGET',
4487 help='Apply CL to remote ref TARGET. ' +
4488 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004489 parser.add_option('--squash', action='store_true',
4490 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004491 parser.add_option('--no-squash', action='store_true',
4492 help='Don\'t squash multiple commits into one ' +
4493 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004494 parser.add_option('--topic', default=None,
4495 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004496 parser.add_option('--email', default=None,
4497 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004498 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4499 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004500 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4501 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004502 help='Send the patchset to do a CQ dry run right after '
4503 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004504 parser.add_option('--dependencies', action='store_true',
4505 help='Uploads CLs of all the local branches that depend on '
4506 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004507
rmistry@google.com2dd99862015-06-22 12:22:18 +00004508 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004509 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004510 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004511 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004512 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004513 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004514 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004515
sbc@chromium.org71437c02015-04-09 19:29:40 +00004516 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004517 return 1
4518
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004519 options.reviewers = cleanup_list(options.reviewers)
4520 options.cc = cleanup_list(options.cc)
4521
tandriib80458a2016-06-23 12:20:07 -07004522 if options.message_file:
4523 if options.message:
4524 parser.error('only one of --message and --message-file allowed.')
4525 options.message = gclient_utils.FileRead(options.message_file)
4526 options.message_file = None
4527
tandrii4d0545a2016-07-06 03:56:49 -07004528 if options.cq_dry_run and options.use_commit_queue:
4529 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4530
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004531 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4532 settings.GetIsGerrit()
4533
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004534 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004535 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004536
4537
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004538@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004540 """DEPRECATED: Used to commit the current changelist via git-svn."""
4541 message = ('git-cl no longer supports committing to SVN repositories via '
4542 'git-svn. You probably want to use `git cl land` instead.')
4543 print(message)
4544 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545
4546
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004547@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004548def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004549 """Commits the current changelist via git.
4550
4551 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4552 upstream and closes the issue automatically and atomically.
4553
4554 Otherwise (in case of Rietveld):
4555 Squashes branch into a single commit.
4556 Updates commit message with metadata (e.g. pointer to review).
4557 Pushes the code upstream.
4558 Updates review and closes.
4559 """
4560 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4561 help='bypass upload presubmit hook')
4562 parser.add_option('-m', dest='message',
4563 help="override review description")
4564 parser.add_option('-f', action='store_true', dest='force',
4565 help="force yes to questions (don't prompt)")
4566 parser.add_option('-c', dest='contributor',
4567 help="external contributor for patch (appended to " +
4568 "description and used as author for git). Should be " +
4569 "formatted as 'First Last <email@example.com>'")
4570 add_git_similarity(parser)
4571 auth.add_auth_options(parser)
4572 (options, args) = parser.parse_args(args)
4573 auth_config = auth.extract_auth_config_from_options(options)
4574
4575 cl = Changelist(auth_config=auth_config)
4576
4577 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4578 if cl.IsGerrit():
4579 if options.message:
4580 # This could be implemented, but it requires sending a new patch to
4581 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4582 # Besides, Gerrit has the ability to change the commit message on submit
4583 # automatically, thus there is no need to support this option (so far?).
4584 parser.error('-m MESSAGE option is not supported for Gerrit.')
4585 if options.contributor:
4586 parser.error(
4587 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4588 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4589 'the contributor\'s "name <email>". If you can\'t upload such a '
4590 'commit for review, contact your repository admin and request'
4591 '"Forge-Author" permission.')
4592 if not cl.GetIssue():
4593 DieWithError('You must upload the change first to Gerrit.\n'
4594 ' If you would rather have `git cl land` upload '
4595 'automatically for you, see http://crbug.com/642759')
4596 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4597 options.verbose)
4598
4599 current = cl.GetBranch()
4600 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4601 if remote == '.':
4602 print()
4603 print('Attempting to push branch %r into another local branch!' % current)
4604 print()
4605 print('Either reparent this branch on top of origin/master:')
4606 print(' git reparent-branch --root')
4607 print()
4608 print('OR run `git rebase-update` if you think the parent branch is ')
4609 print('already committed.')
4610 print()
4611 print(' Current parent: %r' % upstream_branch)
4612 return 1
4613
4614 if not args:
4615 # Default to merging against our best guess of the upstream branch.
4616 args = [cl.GetUpstreamBranch()]
4617
4618 if options.contributor:
4619 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4620 print("Please provide contibutor as 'First Last <email@example.com>'")
4621 return 1
4622
4623 base_branch = args[0]
4624
4625 if git_common.is_dirty_git_tree('land'):
4626 return 1
4627
4628 # This rev-list syntax means "show all commits not in my branch that
4629 # are in base_branch".
4630 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4631 base_branch]).splitlines()
4632 if upstream_commits:
4633 print('Base branch "%s" has %d commits '
4634 'not in this branch.' % (base_branch, len(upstream_commits)))
4635 print('Run "git merge %s" before attempting to land.' % base_branch)
4636 return 1
4637
4638 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4639 if not options.bypass_hooks:
4640 author = None
4641 if options.contributor:
4642 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4643 hook_results = cl.RunHook(
4644 committing=True,
4645 may_prompt=not options.force,
4646 verbose=options.verbose,
4647 change=cl.GetChange(merge_base, author))
4648 if not hook_results.should_continue():
4649 return 1
4650
4651 # Check the tree status if the tree status URL is set.
4652 status = GetTreeStatus()
4653 if 'closed' == status:
4654 print('The tree is closed. Please wait for it to reopen. Use '
4655 '"git cl land --bypass-hooks" to commit on a closed tree.')
4656 return 1
4657 elif 'unknown' == status:
4658 print('Unable to determine tree status. Please verify manually and '
4659 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4660 return 1
4661
4662 change_desc = ChangeDescription(options.message)
4663 if not change_desc.description and cl.GetIssue():
4664 change_desc = ChangeDescription(cl.GetDescription())
4665
4666 if not change_desc.description:
4667 if not cl.GetIssue() and options.bypass_hooks:
4668 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4669 else:
4670 print('No description set.')
4671 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4672 return 1
4673
4674 # Keep a separate copy for the commit message, because the commit message
4675 # contains the link to the Rietveld issue, while the Rietveld message contains
4676 # the commit viewvc url.
4677 if cl.GetIssue():
4678 change_desc.update_reviewers(cl.GetApprovingReviewers())
4679
4680 commit_desc = ChangeDescription(change_desc.description)
4681 if cl.GetIssue():
4682 # Xcode won't linkify this URL unless there is a non-whitespace character
4683 # after it. Add a period on a new line to circumvent this. Also add a space
4684 # before the period to make sure that Gitiles continues to correctly resolve
4685 # the URL.
4686 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4687 if options.contributor:
4688 commit_desc.append_footer('Patch from %s.' % options.contributor)
4689
4690 print('Description:')
4691 print(commit_desc.description)
4692
4693 branches = [merge_base, cl.GetBranchRef()]
4694 if not options.force:
4695 print_stats(options.similarity, options.find_copies, branches)
4696
4697 # We want to squash all this branch's commits into one commit with the proper
4698 # description. We do this by doing a "reset --soft" to the base branch (which
4699 # keeps the working copy the same), then landing that.
4700 MERGE_BRANCH = 'git-cl-commit'
4701 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4702 # Delete the branches if they exist.
4703 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4704 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4705 result = RunGitWithCode(showref_cmd)
4706 if result[0] == 0:
4707 RunGit(['branch', '-D', branch])
4708
4709 # We might be in a directory that's present in this branch but not in the
4710 # trunk. Move up to the top of the tree so that git commands that expect a
4711 # valid CWD won't fail after we check out the merge branch.
4712 rel_base_path = settings.GetRelativeRoot()
4713 if rel_base_path:
4714 os.chdir(rel_base_path)
4715
4716 # Stuff our change into the merge branch.
4717 # We wrap in a try...finally block so if anything goes wrong,
4718 # we clean up the branches.
4719 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004720 revision = None
4721 try:
4722 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4723 RunGit(['reset', '--soft', merge_base])
4724 if options.contributor:
4725 RunGit(
4726 [
4727 'commit', '--author', options.contributor,
4728 '-m', commit_desc.description,
4729 ])
4730 else:
4731 RunGit(['commit', '-m', commit_desc.description])
4732
4733 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4734 mirror = settings.GetGitMirror(remote)
4735 if mirror:
4736 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004737 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004738 else:
4739 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004740 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004741 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4742
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004743 if git_numberer_enabled:
4744 # TODO(tandrii): maybe do autorebase + retry on failure
4745 # http://crbug.com/682934, but better just use Gerrit :)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004746 logging.debug('Adding git number footers')
4747 parent_msg = RunGit(['show', '-s', '--format=%B', merge_base]).strip()
4748 commit_desc.update_with_git_number_footers(merge_base, parent_msg,
4749 branch)
4750 # Ensure timestamps are monotonically increasing.
4751 timestamp = max(1 + _get_committer_timestamp(merge_base),
4752 _get_committer_timestamp('HEAD'))
4753 _git_amend_head(commit_desc.description, timestamp)
4754 change_desc = ChangeDescription(commit_desc.description)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004755
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004756 retcode, output = RunGitWithCode(
4757 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004758 if retcode == 0:
4759 revision = RunGit(['rev-parse', 'HEAD']).strip()
4760 logging.debug(output)
4761 except: # pylint: disable=bare-except
4762 if _IS_BEING_TESTED:
4763 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4764 + '-' * 30 + '8<' + '-' * 30)
4765 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4766 raise
4767 finally:
4768 # And then swap back to the original branch and clean up.
4769 RunGit(['checkout', '-q', cl.GetBranch()])
4770 RunGit(['branch', '-D', MERGE_BRANCH])
4771
4772 if not revision:
4773 print('Failed to push. If this persists, please file a bug.')
4774 return 1
4775
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004776 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004777 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004778 if viewvc_url and revision:
4779 change_desc.append_footer(
4780 'Committed: %s%s' % (viewvc_url, revision))
4781 elif revision:
4782 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004783 print('Closing issue '
4784 '(you may be prompted for your codereview password)...')
4785 cl.UpdateDescription(change_desc.description)
4786 cl.CloseIssue()
4787 props = cl.GetIssueProperties()
4788 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004789 comment = "Committed patchset #%d (id:%d) manually as %s" % (
4790 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004791 if options.bypass_hooks:
4792 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4793 else:
4794 comment += ' (presubmit successful).'
4795 cl.RpcServer().add_comment(cl.GetIssue(), comment)
4796
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004797 if os.path.isfile(POSTUPSTREAM_HOOK):
4798 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
4799
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004800 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004801
4802
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004803@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004804def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004805 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004806 parser.add_option('-b', dest='newbranch',
4807 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004808 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004809 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004810 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4811 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004812 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004813 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004814 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004815 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004816 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004817 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004818
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004819
4820 group = optparse.OptionGroup(
4821 parser,
4822 'Options for continuing work on the current issue uploaded from a '
4823 'different clone (e.g. different machine). Must be used independently '
4824 'from the other options. No issue number should be specified, and the '
4825 'branch must have an issue number associated with it')
4826 group.add_option('--reapply', action='store_true', dest='reapply',
4827 help='Reset the branch and reapply the issue.\n'
4828 'CAUTION: This will undo any local changes in this '
4829 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004830
4831 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004832 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004833 parser.add_option_group(group)
4834
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004835 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004836 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004837 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004838 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004839 auth_config = auth.extract_auth_config_from_options(options)
4840
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004841
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004842 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004843 if options.newbranch:
4844 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004845 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004846 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004847
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004848 cl = Changelist(auth_config=auth_config,
4849 codereview=options.forced_codereview)
4850 if not cl.GetIssue():
4851 parser.error('current branch must have an associated issue')
4852
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004853 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004854 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004855 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004856
4857 RunGit(['reset', '--hard', upstream])
4858 if options.pull:
4859 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004860
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004861 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4862 options.directory)
4863
4864 if len(args) != 1 or not args[0]:
4865 parser.error('Must specify issue number or url')
4866
4867 # We don't want uncommitted changes mixed up with the patch.
4868 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004869 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004870
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004871 if options.newbranch:
4872 if options.force:
4873 RunGit(['branch', '-D', options.newbranch],
4874 stderr=subprocess2.PIPE, error_ok=True)
4875 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07004876 elif not GetCurrentBranch():
4877 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004878
4879 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4880
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004881 if cl.IsGerrit():
4882 if options.reject:
4883 parser.error('--reject is not supported with Gerrit codereview.')
4884 if options.nocommit:
4885 parser.error('--nocommit is not supported with Gerrit codereview.')
4886 if options.directory:
4887 parser.error('--directory is not supported with Gerrit codereview.')
4888
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004889 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004890 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004891
4892
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004893def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004894 """Fetches the tree status and returns either 'open', 'closed',
4895 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004896 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004897 if url:
4898 status = urllib2.urlopen(url).read().lower()
4899 if status.find('closed') != -1 or status == '0':
4900 return 'closed'
4901 elif status.find('open') != -1 or status == '1':
4902 return 'open'
4903 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004904 return 'unset'
4905
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004906
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004907def GetTreeStatusReason():
4908 """Fetches the tree status from a json url and returns the message
4909 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004910 url = settings.GetTreeStatusUrl()
4911 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004912 connection = urllib2.urlopen(json_url)
4913 status = json.loads(connection.read())
4914 connection.close()
4915 return status['message']
4916
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004917
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004918def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004919 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004920 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004921 status = GetTreeStatus()
4922 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004923 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004924 return 2
4925
vapiera7fbd5a2016-06-16 09:17:49 -07004926 print('The tree is %s' % status)
4927 print()
4928 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004929 if status != 'open':
4930 return 1
4931 return 0
4932
4933
maruel@chromium.org15192402012-09-06 12:38:29 +00004934def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07004935 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07004936 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004937 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004938 '-b', '--bot', action='append',
4939 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4940 'times to specify multiple builders. ex: '
4941 '"-b win_rel -b win_layout". See '
4942 'the try server waterfall for the builders name and the tests '
4943 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004944 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004945 '-B', '--bucket', default='',
4946 help=('Buildbucket bucket to send the try requests.'))
4947 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004948 '-m', '--master', default='',
4949 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004950 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004951 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07004952 help='Revision to use for the try job; default: the revision will '
4953 'be determined by the try recipe that builder runs, which usually '
4954 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004955 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004956 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004957 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004958 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004959 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004960 '--project',
4961 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004962 'in recipe to determine to which repository or directory to '
4963 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004964 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004965 '-p', '--property', dest='properties', action='append', default=[],
4966 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004967 'key2=value2 etc. The value will be treated as '
4968 'json if decodable, or as string otherwise. '
4969 'NOTE: using this may make your try job not usable for CQ, '
4970 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004971 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004972 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4973 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004974 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004975 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004976 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004977 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004978
machenbach@chromium.org45453142015-09-15 08:45:22 +00004979 # Make sure that all properties are prop=value pairs.
4980 bad_params = [x for x in options.properties if '=' not in x]
4981 if bad_params:
4982 parser.error('Got properties with missing "=": %s' % bad_params)
4983
maruel@chromium.org15192402012-09-06 12:38:29 +00004984 if args:
4985 parser.error('Unknown arguments: %s' % args)
4986
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004987 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00004988 if not cl.GetIssue():
4989 parser.error('Need to upload first')
4990
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004991 if cl.IsGerrit():
4992 # HACK: warm up Gerrit change detail cache to save on RPCs.
4993 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
4994
tandriie113dfd2016-10-11 10:20:12 -07004995 error_message = cl.CannotTriggerTryJobReason()
4996 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07004997 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004998
borenet6c0efe62016-10-19 08:13:29 -07004999 if options.bucket and options.master:
5000 parser.error('Only one of --bucket and --master may be used.')
5001
qyearsley1fdfcb62016-10-24 13:22:03 -07005002 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005003
qyearsleydd49f942016-10-28 11:57:22 -07005004 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5005 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005006 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005007 if options.verbose:
5008 print('git cl try with no bots now defaults to CQ Dry Run.')
5009 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005010
borenet6c0efe62016-10-19 08:13:29 -07005011 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005012 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005013 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005014 'of bot requires an initial job from a parent (usually a builder). '
5015 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005016 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005017 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005018
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005019 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005020 # TODO(tandrii): Checking local patchset against remote patchset is only
5021 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5022 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005023 print('Warning: Codereview server has newer patchsets (%s) than most '
5024 'recent upload from local checkout (%s). Did a previous upload '
5025 'fail?\n'
5026 'By default, git cl try uses the latest patchset from '
5027 'codereview, continuing to use patchset %s.\n' %
5028 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005029
tandrii568043b2016-10-11 07:49:18 -07005030 try:
borenet6c0efe62016-10-19 08:13:29 -07005031 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5032 patchset)
tandrii568043b2016-10-11 07:49:18 -07005033 except BuildbucketResponseException as ex:
5034 print('ERROR: %s' % ex)
5035 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005036 return 0
5037
5038
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005039def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005040 """Prints info about try jobs associated with current CL."""
5041 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005042 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005043 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005044 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005045 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005046 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005047 '--color', action='store_true', default=setup_color.IS_TTY,
5048 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005049 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005050 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5051 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005052 group.add_option(
5053 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005054 parser.add_option_group(group)
5055 auth.add_auth_options(parser)
5056 options, args = parser.parse_args(args)
5057 if args:
5058 parser.error('Unrecognized args: %s' % ' '.join(args))
5059
5060 auth_config = auth.extract_auth_config_from_options(options)
5061 cl = Changelist(auth_config=auth_config)
5062 if not cl.GetIssue():
5063 parser.error('Need to upload first')
5064
tandrii221ab252016-10-06 08:12:04 -07005065 patchset = options.patchset
5066 if not patchset:
5067 patchset = cl.GetMostRecentPatchset()
5068 if not patchset:
5069 parser.error('Codereview doesn\'t know about issue %s. '
5070 'No access to issue or wrong issue number?\n'
5071 'Either upload first, or pass --patchset explicitely' %
5072 cl.GetIssue())
5073
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005074 # TODO(tandrii): Checking local patchset against remote patchset is only
5075 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5076 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005077 print('Warning: Codereview server has newer patchsets (%s) than most '
5078 'recent upload from local checkout (%s). Did a previous upload '
5079 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005080 'By default, git cl try-results uses the latest patchset from '
5081 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005082 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005083 try:
tandrii221ab252016-10-06 08:12:04 -07005084 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005085 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005086 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005087 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005088 if options.json:
5089 write_try_results_json(options.json, jobs)
5090 else:
5091 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005092 return 0
5093
5094
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005095@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005096def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005097 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005098 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005099 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005100 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005101
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005102 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005103 if args:
5104 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005105 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005106 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005107 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005108 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005109
5110 # Clear configured merge-base, if there is one.
5111 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005112 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005113 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005114 return 0
5115
5116
thestig@chromium.org00858c82013-12-02 23:08:03 +00005117def CMDweb(parser, args):
5118 """Opens the current CL in the web browser."""
5119 _, args = parser.parse_args(args)
5120 if args:
5121 parser.error('Unrecognized args: %s' % ' '.join(args))
5122
5123 issue_url = Changelist().GetIssueURL()
5124 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005125 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005126 return 1
5127
5128 webbrowser.open(issue_url)
5129 return 0
5130
5131
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005132def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005133 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005134 parser.add_option('-d', '--dry-run', action='store_true',
5135 help='trigger in dry run mode')
5136 parser.add_option('-c', '--clear', action='store_true',
5137 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005138 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005139 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005140 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005141 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005142 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005143 if args:
5144 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005145 if options.dry_run and options.clear:
5146 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5147
iannuccie53c9352016-08-17 14:40:40 -07005148 cl = Changelist(auth_config=auth_config, issue=options.issue,
5149 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005150 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005151 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005152 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005153 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005154 state = _CQState.DRY_RUN
5155 else:
5156 state = _CQState.COMMIT
5157 if not cl.GetIssue():
5158 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005159 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005160 return 0
5161
5162
groby@chromium.org411034a2013-02-26 15:12:01 +00005163def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005164 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005165 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005166 auth.add_auth_options(parser)
5167 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005168 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005169 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005170 if args:
5171 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005172 cl = Changelist(auth_config=auth_config, issue=options.issue,
5173 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005174 # Ensure there actually is an issue to close.
5175 cl.GetDescription()
5176 cl.CloseIssue()
5177 return 0
5178
5179
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005180def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005181 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005182 parser.add_option(
5183 '--stat',
5184 action='store_true',
5185 dest='stat',
5186 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005187 auth.add_auth_options(parser)
5188 options, args = parser.parse_args(args)
5189 auth_config = auth.extract_auth_config_from_options(options)
5190 if args:
5191 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005192
5193 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005194 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005195 # Staged changes would be committed along with the patch from last
5196 # upload, hence counted toward the "last upload" side in the final
5197 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005198 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005199 return 1
5200
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005201 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005202 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005203 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005204 if not issue:
5205 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005206 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005207 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005208
5209 # Create a new branch based on the merge-base
5210 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005211 # Clear cached branch in cl object, to avoid overwriting original CL branch
5212 # properties.
5213 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005214 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005215 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005216 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005217 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005218 return rtn
5219
wychen@chromium.org06928532015-02-03 02:11:29 +00005220 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005221 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005222 cmd = ['git', 'diff']
5223 if options.stat:
5224 cmd.append('--stat')
5225 cmd.extend([TMP_BRANCH, branch, '--'])
5226 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005227 finally:
5228 RunGit(['checkout', '-q', branch])
5229 RunGit(['branch', '-D', TMP_BRANCH])
5230
5231 return 0
5232
5233
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005234def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005235 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005236 parser.add_option(
5237 '--no-color',
5238 action='store_true',
5239 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005240 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005241 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005242 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005243
5244 author = RunGit(['config', 'user.email']).strip() or None
5245
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005246 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005247
5248 if args:
5249 if len(args) > 1:
5250 parser.error('Unknown args')
5251 base_branch = args[0]
5252 else:
5253 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005254 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005255
5256 change = cl.GetChange(base_branch, None)
5257 return owners_finder.OwnersFinder(
5258 [f.LocalPath() for f in
5259 cl.GetChange(base_branch, None).AffectedFiles()],
5260 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07005261 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005262 disable_color=options.no_color).run()
5263
5264
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005265def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005266 """Generates a diff command."""
5267 # Generate diff for the current branch's changes.
5268 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005269 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005270
5271 if args:
5272 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005273 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005274 diff_cmd.append(arg)
5275 else:
5276 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005277
5278 return diff_cmd
5279
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005280
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005281def MatchingFileType(file_name, extensions):
5282 """Returns true if the file name ends with one of the given extensions."""
5283 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005284
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005285
enne@chromium.org555cfe42014-01-29 18:21:39 +00005286@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005287def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005288 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005289 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005290 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005291 parser.add_option('--full', action='store_true',
5292 help='Reformat the full content of all touched files')
5293 parser.add_option('--dry-run', action='store_true',
5294 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005295 parser.add_option('--python', action='store_true',
5296 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005297 parser.add_option('--js', action='store_true',
5298 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005299 parser.add_option('--diff', action='store_true',
5300 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005301 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005302
Daniel Chengc55eecf2016-12-30 03:11:02 -08005303 # Normalize any remaining args against the current path, so paths relative to
5304 # the current directory are still resolved as expected.
5305 args = [os.path.join(os.getcwd(), arg) for arg in args]
5306
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005307 # git diff generates paths against the root of the repository. Change
5308 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005309 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005310 if rel_base_path:
5311 os.chdir(rel_base_path)
5312
digit@chromium.org29e47272013-05-17 17:01:46 +00005313 # Grab the merge-base commit, i.e. the upstream commit of the current
5314 # branch when it was created or the last time it was rebased. This is
5315 # to cover the case where the user may have called "git fetch origin",
5316 # moving the origin branch to a newer commit, but hasn't rebased yet.
5317 upstream_commit = None
5318 cl = Changelist()
5319 upstream_branch = cl.GetUpstreamBranch()
5320 if upstream_branch:
5321 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5322 upstream_commit = upstream_commit.strip()
5323
5324 if not upstream_commit:
5325 DieWithError('Could not find base commit for this branch. '
5326 'Are you in detached state?')
5327
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005328 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5329 diff_output = RunGit(changed_files_cmd)
5330 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005331 # Filter out files deleted by this CL
5332 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005333
Christopher Lamc5ba6922017-01-24 11:19:14 +11005334 if opts.js:
5335 CLANG_EXTS.append('.js')
5336
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005337 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5338 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5339 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005340 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005341
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005342 top_dir = os.path.normpath(
5343 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5344
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005345 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5346 # formatted. This is used to block during the presubmit.
5347 return_value = 0
5348
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005349 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005350 # Locate the clang-format binary in the checkout
5351 try:
5352 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005353 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005354 DieWithError(e)
5355
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005356 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005357 cmd = [clang_format_tool]
5358 if not opts.dry_run and not opts.diff:
5359 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005360 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005361 if opts.diff:
5362 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005363 else:
5364 env = os.environ.copy()
5365 env['PATH'] = str(os.path.dirname(clang_format_tool))
5366 try:
5367 script = clang_format.FindClangFormatScriptInChromiumTree(
5368 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005369 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005370 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005371
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005372 cmd = [sys.executable, script, '-p0']
5373 if not opts.dry_run and not opts.diff:
5374 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005375
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005376 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5377 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005378
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005379 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5380 if opts.diff:
5381 sys.stdout.write(stdout)
5382 if opts.dry_run and len(stdout) > 0:
5383 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005384
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005385 # Similar code to above, but using yapf on .py files rather than clang-format
5386 # on C/C++ files
5387 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005388 yapf_tool = gclient_utils.FindExecutable('yapf')
5389 if yapf_tool is None:
5390 DieWithError('yapf not found in PATH')
5391
5392 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005393 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005394 cmd = [yapf_tool]
5395 if not opts.dry_run and not opts.diff:
5396 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005397 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005398 if opts.diff:
5399 sys.stdout.write(stdout)
5400 else:
5401 # TODO(sbc): yapf --lines mode still has some issues.
5402 # https://github.com/google/yapf/issues/154
5403 DieWithError('--python currently only works with --full')
5404
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005405 # Dart's formatter does not have the nice property of only operating on
5406 # modified chunks, so hard code full.
5407 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005408 try:
5409 command = [dart_format.FindDartFmtToolInChromiumTree()]
5410 if not opts.dry_run and not opts.diff:
5411 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005412 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005413
ppi@chromium.org6593d932016-03-03 15:41:15 +00005414 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005415 if opts.dry_run and stdout:
5416 return_value = 2
5417 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005418 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5419 'found in this checkout. Files in other languages are still '
5420 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005421
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005422 # Format GN build files. Always run on full build files for canonical form.
5423 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005424 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005425 if opts.dry_run or opts.diff:
5426 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005427 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005428 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5429 shell=sys.platform == 'win32',
5430 cwd=top_dir)
5431 if opts.dry_run and gn_ret == 2:
5432 return_value = 2 # Not formatted.
5433 elif opts.diff and gn_ret == 2:
5434 # TODO this should compute and print the actual diff.
5435 print("This change has GN build file diff for " + gn_diff_file)
5436 elif gn_ret != 0:
5437 # For non-dry run cases (and non-2 return values for dry-run), a
5438 # nonzero error code indicates a failure, probably because the file
5439 # doesn't parse.
5440 DieWithError("gn format failed on " + gn_diff_file +
5441 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005442
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005443 metrics_xml_files = [
5444 'tools/metrics/actions/actions.xml',
5445 'tools/metrics/histograms/histograms.xml',
5446 'tools/metrics/rappor/rappor.xml']
5447 for xml_file in metrics_xml_files:
5448 if xml_file in diff_files:
5449 tool_dir = top_dir + '/' + os.path.dirname(xml_file)
5450 cmd = [tool_dir + '/pretty_print.py', '--non-interactive']
5451 if opts.dry_run or opts.diff:
5452 cmd.append('--diff')
5453 stdout = RunCommand(cmd, cwd=top_dir)
5454 if opts.diff:
5455 sys.stdout.write(stdout)
5456 if opts.dry_run and stdout:
5457 return_value = 2 # Not formatted.
5458
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005459 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005460
5461
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005462@subcommand.usage('<codereview url or issue id>')
5463def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005464 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005465 _, args = parser.parse_args(args)
5466
5467 if len(args) != 1:
5468 parser.print_help()
5469 return 1
5470
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005471 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005472 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005473 parser.print_help()
5474 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005475 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005476
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005477 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005478 output = RunGit(['config', '--local', '--get-regexp',
5479 r'branch\..*\.%s' % issueprefix],
5480 error_ok=True)
5481 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005482 if issue == target_issue:
5483 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005484
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005485 branches = []
5486 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005487 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005488 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005489 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005490 return 1
5491 if len(branches) == 1:
5492 RunGit(['checkout', branches[0]])
5493 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005494 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005495 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005496 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005497 which = raw_input('Choose by index: ')
5498 try:
5499 RunGit(['checkout', branches[int(which)]])
5500 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005501 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005502 return 1
5503
5504 return 0
5505
5506
maruel@chromium.org29404b52014-09-08 22:58:00 +00005507def CMDlol(parser, args):
5508 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005509 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005510 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5511 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5512 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005513 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005514 return 0
5515
5516
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005517class OptionParser(optparse.OptionParser):
5518 """Creates the option parse and add --verbose support."""
5519 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005520 optparse.OptionParser.__init__(
5521 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005522 self.add_option(
5523 '-v', '--verbose', action='count', default=0,
5524 help='Use 2 times for more debugging info')
5525
5526 def parse_args(self, args=None, values=None):
5527 options, args = optparse.OptionParser.parse_args(self, args, values)
5528 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005529 logging.basicConfig(
5530 level=levels[min(options.verbose, len(levels) - 1)],
5531 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5532 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005533 return options, args
5534
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005535
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005536def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005537 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005538 print('\nYour python version %s is unsupported, please upgrade.\n' %
5539 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005540 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005541
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005542 # Reload settings.
5543 global settings
5544 settings = Settings()
5545
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005546 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005547 dispatcher = subcommand.CommandDispatcher(__name__)
5548 try:
5549 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005550 except auth.AuthenticationError as e:
5551 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005552 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005553 if e.code != 500:
5554 raise
5555 DieWithError(
5556 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5557 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005558 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005559
5560
5561if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005562 # These affect sys.stdout so do it outside of main() to simplify mocks in
5563 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005564 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005565 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005566 try:
5567 sys.exit(main(sys.argv[1:]))
5568 except KeyboardInterrupt:
5569 sys.stderr.write('interrupted\n')
5570 sys.exit(1)