blob: 1a67a458d85af12b7ebcd31fe3f18f85d04a2844 [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 Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000062import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000063import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064import watchlists
65
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
tandrii9d2c7a32016-06-22 03:42:45 -070068COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070069DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080070POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000071DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000072REFS_THAT_ALIAS_TO_OTHER_REFS = {
73 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
74 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
75}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000076
thestig@chromium.org44202a22014-03-11 19:22:18 +000077# Valid extensions for files we want to lint.
78DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
79DEFAULT_LINT_IGNORE_REGEX = r"$^"
80
borenet6c0efe62016-10-19 08:13:29 -070081# Buildbucket master name prefix.
82MASTER_PREFIX = 'master.'
83
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000084# Shortcut since it quickly becomes redundant.
85Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000086
maruel@chromium.orgddd59412011-11-30 14:20:38 +000087# Initialized in main()
88settings = None
89
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010090# Used by tests/git_cl_test.py to add extra logging.
91# Inside the weirdly failing test, add this:
92# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
93# And scroll up to see the strack trace printed.
94_IS_BEING_TESTED = False
95
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096
Christopher Lamf732cd52017-01-24 12:40:11 +110097def DieWithError(message, change_desc=None):
98 if change_desc:
99 SaveDescriptionBackup(change_desc)
100
vapiera7fbd5a2016-06-16 09:17:49 -0700101 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 sys.exit(1)
103
104
Christopher Lamf732cd52017-01-24 12:40:11 +1100105def SaveDescriptionBackup(change_desc):
106 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
107 print('\nError after CL description prompt -- saving description to %s\n' %
108 backup_path)
109 backup_file = open(backup_path, 'w')
110 backup_file.write(change_desc.description)
111 backup_file.close()
112
113
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000114def GetNoGitPagerEnv():
115 env = os.environ.copy()
116 # 'cat' is a magical git string that disables pagers on all platforms.
117 env['GIT_PAGER'] = 'cat'
118 return env
119
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000120
bsep@chromium.org627d9002016-04-29 00:00:52 +0000121def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000122 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000124 except subprocess2.CalledProcessError as e:
125 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000126 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000127 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 'Command "%s" failed.\n%s' % (
129 ' '.join(args), error_message or e.stdout or ''))
130 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131
132
133def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000134 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000135 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136
137
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000138def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000139 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700140 if suppress_stderr:
141 stderr = subprocess2.VOID
142 else:
143 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000144 try:
tandrii5d48c322016-08-18 16:19:37 -0700145 (out, _), code = subprocess2.communicate(['git'] + args,
146 env=GetNoGitPagerEnv(),
147 stdout=subprocess2.PIPE,
148 stderr=stderr)
149 return code, out
150 except subprocess2.CalledProcessError as e:
151 logging.debug('Failed running %s', args)
152 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153
154
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000155def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000156 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157 return RunGitWithCode(args, suppress_stderr=True)[1]
158
159
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000160def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000161 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 return (version.startswith(prefix) and
164 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000165
166
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000167def BranchExists(branch):
168 """Return True if specified branch exists."""
169 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
170 suppress_stderr=True)
171 return not code
172
173
tandrii2a16b952016-10-19 07:09:44 -0700174def time_sleep(seconds):
175 # Use this so that it can be mocked in tests without interfering with python
176 # system machinery.
177 import time # Local import to discourage others from importing time globally.
178 return time.sleep(seconds)
179
180
maruel@chromium.org90541732011-04-01 17:54:18 +0000181def ask_for_data(prompt):
182 try:
183 return raw_input(prompt)
184 except KeyboardInterrupt:
185 # Hide the exception.
186 sys.exit(1)
187
188
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100189def confirm_or_exit(prefix='', action='confirm'):
190 """Asks user to press enter to continue or press Ctrl+C to abort."""
191 if not prefix or prefix.endswith('\n'):
192 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100193 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100194 mid = ' Press'
195 elif prefix.endswith(' '):
196 mid = 'press'
197 else:
198 mid = ' press'
199 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
200
201
202def ask_for_explicit_yes(prompt):
203 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
204 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
205 while True:
206 if 'yes'.startswith(result):
207 return True
208 if 'no'.startswith(result):
209 return False
210 result = ask_for_data('Please, type yes or no: ').lower()
211
212
tandrii5d48c322016-08-18 16:19:37 -0700213def _git_branch_config_key(branch, key):
214 """Helper method to return Git config key for a branch."""
215 assert branch, 'branch name is required to set git config for it'
216 return 'branch.%s.%s' % (branch, key)
217
218
219def _git_get_branch_config_value(key, default=None, value_type=str,
220 branch=False):
221 """Returns git config value of given or current branch if any.
222
223 Returns default in all other cases.
224 """
225 assert value_type in (int, str, bool)
226 if branch is False: # Distinguishing default arg value from None.
227 branch = GetCurrentBranch()
228
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000229 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700230 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231
tandrii5d48c322016-08-18 16:19:37 -0700232 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700233 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700234 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700235 # git config also has --int, but apparently git config suffers from integer
236 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700237 args.append(_git_branch_config_key(branch, key))
238 code, out = RunGitWithCode(args)
239 if code == 0:
240 value = out.strip()
241 if value_type == int:
242 return int(value)
243 if value_type == bool:
244 return bool(value.lower() == 'true')
245 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000246 return default
247
248
tandrii5d48c322016-08-18 16:19:37 -0700249def _git_set_branch_config_value(key, value, branch=None, **kwargs):
250 """Sets the value or unsets if it's None of a git branch config.
251
252 Valid, though not necessarily existing, branch must be provided,
253 otherwise currently checked out branch is used.
254 """
255 if not branch:
256 branch = GetCurrentBranch()
257 assert branch, 'a branch name OR currently checked out branch is required'
258 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700259 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700260 if value is None:
261 args.append('--unset')
262 elif isinstance(value, bool):
263 args.append('--bool')
264 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700265 else:
tandrii33a46ff2016-08-23 05:53:40 -0700266 # git config also has --int, but apparently git config suffers from integer
267 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700268 value = str(value)
269 args.append(_git_branch_config_key(branch, key))
270 if value is not None:
271 args.append(value)
272 RunGit(args, **kwargs)
273
274
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100275def _get_committer_timestamp(commit):
276 """Returns unix timestamp as integer of a committer in a commit.
277
278 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
279 """
280 # Git also stores timezone offset, but it only affects visual display,
281 # actual point in time is defined by this timestamp only.
282 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
283
284
285def _git_amend_head(message, committer_timestamp):
286 """Amends commit with new message and desired committer_timestamp.
287
288 Sets committer timezone to UTC.
289 """
290 env = os.environ.copy()
291 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
292 return RunGit(['commit', '--amend', '-m', message], env=env)
293
294
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000295def add_git_similarity(parser):
296 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700297 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000298 help='Sets the percentage that a pair of files need to match in order to'
299 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000300 parser.add_option(
301 '--find-copies', action='store_true',
302 help='Allows git to look for copies.')
303 parser.add_option(
304 '--no-find-copies', action='store_false', dest='find_copies',
305 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000306
307 old_parser_args = parser.parse_args
308 def Parse(args):
309 options, args = old_parser_args(args)
310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700312 options.similarity = _git_get_branch_config_value(
313 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000315 print('Note: Saving similarity of %d%% in git config.'
316 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700317 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000318
iannucci@chromium.org79540052012-10-19 23:15:26 +0000319 options.similarity = max(0, min(options.similarity, 100))
320
321 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700322 options.find_copies = _git_get_branch_config_value(
323 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000324 else:
tandrii5d48c322016-08-18 16:19:37 -0700325 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000326
327 print('Using %d%% similarity for rename/copy detection. '
328 'Override with --similarity.' % options.similarity)
329
330 return options, args
331 parser.parse_args = Parse
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000344def _prefix_master(master):
345 """Convert user-specified master name to full master name.
346
347 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
348 name, while the developers always use shortened master name
349 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
350 function does the conversion for buildbucket migration.
351 """
borenet6c0efe62016-10-19 08:13:29 -0700352 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000353 return master
borenet6c0efe62016-10-19 08:13:29 -0700354 return '%s%s' % (MASTER_PREFIX, master)
355
356
357def _unprefix_master(bucket):
358 """Convert bucket name to shortened master name.
359
360 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
361 name, while the developers always use shortened master name
362 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
363 function does the conversion for buildbucket migration.
364 """
365 if bucket.startswith(MASTER_PREFIX):
366 return bucket[len(MASTER_PREFIX):]
367 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000368
369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370def _buildbucket_retry(operation_name, http, *args, **kwargs):
371 """Retries requests to buildbucket service and returns parsed json content."""
372 try_count = 0
373 while True:
374 response, content = http.request(*args, **kwargs)
375 try:
376 content_json = json.loads(content)
377 except ValueError:
378 content_json = None
379
380 # Buildbucket could return an error even if status==200.
381 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000382 error = content_json.get('error')
383 if error.get('code') == 403:
384 raise BuildbucketResponseException(
385 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000388 raise BuildbucketResponseException(msg)
389
390 if response.status == 200:
391 if not content_json:
392 raise BuildbucketResponseException(
393 'Buildbucket returns invalid json content: %s.\n'
394 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
395 content)
396 return content_json
397 if response.status < 500 or try_count >= 2:
398 raise httplib2.HttpLib2Error(content)
399
400 # status >= 500 means transient failures.
401 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700402 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 try_count += 1
404 assert False, 'unreachable'
405
406
qyearsley1fdfcb62016-10-24 13:22:03 -0700407def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700408 """Returns a dict mapping bucket names to builders and tests,
409 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """
qyearsleydd49f942016-10-28 11:57:22 -0700411 # If no bots are listed, we try to get a set of builders and tests based
412 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 if not options.bot:
414 change = changelist.GetChange(
415 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700416 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700417 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 change=change,
419 changed_files=change.LocalPaths(),
420 repository_root=settings.GetRoot(),
421 default_presubmit=None,
422 project=None,
423 verbose=options.verbose,
424 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700425 if masters is None:
426 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100427 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 if options.bucket:
430 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700431 if options.master:
432 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700433
qyearsleydd49f942016-10-28 11:57:22 -0700434 # If bots are listed but no master or bucket, then we need to find out
435 # the corresponding master for each bot.
436 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
437 if error_message:
438 option_parser.error(
439 'Tryserver master cannot be found because: %s\n'
440 'Please manually specify the tryserver master, e.g. '
441 '"-m tryserver.chromium.linux".' % error_message)
442 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
qyearsley123a4682016-10-26 09:12:17 -0700445def _get_bucket_map_for_builders(builders):
446 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 map_url = 'https://builders-map.appspot.com/'
448 try:
qyearsley123a4682016-10-26 09:12:17 -0700449 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 except urllib2.URLError as e:
451 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
452 (map_url, e))
453 except ValueError as e:
454 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700455 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 return None, 'Failed to build master map.'
457
qyearsley123a4682016-10-26 09:12:17 -0700458 bucket_map = {}
459 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700460 masters = builders_map.get(builder, [])
461 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700463 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700464 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700465 (builder, masters))
466 bucket = _prefix_master(masters[0])
467 bucket_map.setdefault(bucket, {})[builder] = []
468
469 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700470
471
borenet6c0efe62016-10-19 08:13:29 -0700472def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700473 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 """Sends a request to Buildbucket to trigger try jobs for a changelist.
475
476 Args:
477 auth_config: AuthConfig for Rietveld.
478 changelist: Changelist that the try jobs are associated with.
479 buckets: A nested dict mapping bucket names to builders to tests.
480 options: Command-line options.
481 """
tandriide281ae2016-10-12 06:02:30 -0700482 assert changelist.GetIssue(), 'CL must be uploaded first'
483 codereview_url = changelist.GetCodereviewServer()
484 assert codereview_url, 'CL must be uploaded first'
485 patchset = patchset or changelist.GetMostRecentPatchset()
486 assert patchset, 'CL must be uploaded first'
487
488 codereview_host = urlparse.urlparse(codereview_url).hostname
489 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000490 http = authenticator.authorize(httplib2.Http())
491 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 buildbucket_put_url = (
494 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000495 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700496 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
497 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
498 hostname=codereview_host,
499 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700501
502 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
503 shared_parameters_properties['category'] = category
504 if options.clobber:
505 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700506 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700507 if extra_properties:
508 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509
510 batch_req_body = {'builds': []}
511 print_text = []
512 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700513 for bucket, builders_and_tests in sorted(buckets.iteritems()):
514 print_text.append('Bucket: %s' % bucket)
515 master = None
516 if bucket.startswith(MASTER_PREFIX):
517 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000518 for builder, tests in sorted(builders_and_tests.iteritems()):
519 print_text.append(' %s: %s' % (builder, tests))
520 parameters = {
521 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100523 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000524 'revision': options.revision,
525 }],
tandrii8c5a3532016-11-04 07:52:02 -0700526 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000527 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000528 if 'presubmit' in builder.lower():
529 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000530 if tests:
531 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700532
533 tags = [
534 'builder:%s' % builder,
535 'buildset:%s' % buildset,
536 'user_agent:git_cl_try',
537 ]
538 if master:
539 parameters['properties']['master'] = master
540 tags.append('master:%s' % master)
541
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000542 batch_req_body['builds'].append(
543 {
544 'bucket': bucket,
545 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700547 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 }
549 )
550
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700552 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 http,
554 buildbucket_put_url,
555 'PUT',
556 body=json.dumps(batch_req_body),
557 headers={'Content-Type': 'application/json'}
558 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000559 print_text.append('To see results here, run: git cl try-results')
560 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700561 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000562
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000563
tandrii221ab252016-10-06 08:12:04 -0700564def fetch_try_jobs(auth_config, changelist, buildbucket_host,
565 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700566 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
qyearsley53f48a12016-09-01 10:45:13 -0700568 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """
tandrii221ab252016-10-06 08:12:04 -0700570 assert buildbucket_host
571 assert changelist.GetIssue(), 'CL must be uploaded first'
572 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
573 patchset = patchset or changelist.GetMostRecentPatchset()
574 assert patchset, 'CL must be uploaded first'
575
576 codereview_url = changelist.GetCodereviewServer()
577 codereview_host = urlparse.urlparse(codereview_url).hostname
578 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 if authenticator.has_cached_credentials():
580 http = authenticator.authorize(httplib2.Http())
581 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700582 print('Warning: Some results might be missing because %s' %
583 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700584 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 http = httplib2.Http()
586
587 http.force_exception_to_status_code = True
588
tandrii221ab252016-10-06 08:12:04 -0700589 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
590 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
591 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700593 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 params = {'tag': 'buildset:%s' % buildset}
595
596 builds = {}
597 while True:
598 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700599 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700601 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602 for build in content.get('builds', []):
603 builds[build['id']] = build
604 if 'next_cursor' in content:
605 params['start_cursor'] = content['next_cursor']
606 else:
607 break
608 return builds
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700614 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
617 # Make a copy, because we'll be modifying builds dictionary.
618 builds = builds.copy()
619 builder_names_cache = {}
620
621 def get_builder(b):
622 try:
623 return builder_names_cache[b['id']]
624 except KeyError:
625 try:
626 parameters = json.loads(b['parameters_json'])
627 name = parameters['builder_name']
628 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700629 print('WARNING: failed to get builder name for build %s: %s' % (
630 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 name = None
632 builder_names_cache[b['id']] = name
633 return name
634
635 def get_bucket(b):
636 bucket = b['bucket']
637 if bucket.startswith('master.'):
638 return bucket[len('master.'):]
639 return bucket
640
641 if options.print_master:
642 name_fmt = '%%-%ds %%-%ds' % (
643 max(len(str(get_bucket(b))) for b in builds.itervalues()),
644 max(len(str(get_builder(b))) for b in builds.itervalues()))
645 def get_name(b):
646 return name_fmt % (get_bucket(b), get_builder(b))
647 else:
648 name_fmt = '%%-%ds' % (
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % get_builder(b)
652
653 def sort_key(b):
654 return b['status'], b.get('result'), get_name(b), b.get('url')
655
656 def pop(title, f, color=None, **kwargs):
657 """Pop matching builds from `builds` dict and print them."""
658
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000659 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 colorize = str
661 else:
662 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
663
664 result = []
665 for b in builds.values():
666 if all(b.get(k) == v for k, v in kwargs.iteritems()):
667 builds.pop(b['id'])
668 result.append(b)
669 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700672 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
675 pop(status='COMPLETED', result='SUCCESS',
676 title='Successes:', color=Fore.GREEN,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
679 title='Infra Failures:', color=Fore.MAGENTA,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
682 title='Failures:', color=Fore.RED,
683 f=lambda b: (get_name(b), b.get('url')))
684 pop(status='COMPLETED', result='CANCELED',
685 title='Canceled:', color=Fore.MAGENTA,
686 f=lambda b: (get_name(b),))
687 pop(status='COMPLETED', result='FAILURE',
688 failure_reason='INVALID_BUILD_DEFINITION',
689 title='Wrong master/builder name:', color=Fore.MAGENTA,
690 f=lambda b: (get_name(b),))
691 pop(status='COMPLETED', result='FAILURE',
692 title='Other failures:',
693 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
694 pop(status='COMPLETED',
695 title='Other finished:',
696 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
697 pop(status='STARTED',
698 title='Started:', color=Fore.YELLOW,
699 f=lambda b: (get_name(b), b.get('url')))
700 pop(status='SCHEDULED',
701 title='Scheduled:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 # The last section is just in case buildbucket API changes OR there is a bug.
704 pop(title='Other:',
705 f=lambda b: (get_name(b), 'id=%s' % b['id']))
706 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700707 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000708
709
qyearsley53f48a12016-09-01 10:45:13 -0700710def write_try_results_json(output_file, builds):
711 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
712
713 The input |builds| dict is assumed to be generated by Buildbucket.
714 Buildbucket documentation: http://goo.gl/G0s101
715 """
716
717 def convert_build_dict(build):
718 return {
719 'buildbucket_id': build.get('id'),
720 'status': build.get('status'),
721 'result': build.get('result'),
722 'bucket': build.get('bucket'),
723 'builder_name': json.loads(
724 build.get('parameters_json', '{}')).get('builder_name'),
725 'failure_reason': build.get('failure_reason'),
726 'url': build.get('url'),
727 }
728
729 converted = []
730 for _, build in sorted(builds.items()):
731 converted.append(convert_build_dict(build))
732 write_json(output_file, converted)
733
734
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800745 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746 else:
747 similarity_options = ['-M%s' % similarity]
748
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000749 try:
750 stdout = sys.stdout.fileno()
751 except AttributeError:
752 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000756 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
765 self.default_server = None
766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000775 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000776 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
792 def GetDefaultServerUrl(self, error_ok=False):
793 if not self.default_server:
794 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000795 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 if error_ok:
798 return self.default_server
799 if not self.default_server:
800 error_message = ('Could not find settings file. You must configure '
801 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000802 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000803 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 return self.default_server
805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
808 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000815 def GetGitMirror(self, remote='origin'):
816 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000817 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000818 if not os.path.isdir(local_url):
819 return None
820 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
821 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100822 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100823 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000824 if mirror.exists():
825 return mirror
826 return None
827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000832 self.tree_status_url = self._GetRietveldConfig(
833 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
Mark Mentovai57c47212017-03-09 11:14:09 -0500841 def GetBugLineFormat(self):
842 # rietveld.bug-line-format should have a %s where the list of bugs should
843 # go. This is a bit of a quirk, because normal people will always want the
844 # bug list to go right after a prefix like BUG= or Bug:. The %s format
845 # approach is used strictly because there isn't a great way to carry the
846 # desired space after Bug: all the way from codereview.settings to here
847 # without treating : specially or inventing a quoting scheme.
848 bug_line_format = self._GetRietveldConfig('bug-line-format', error_ok=True)
849 if not bug_line_format:
850 # TODO(tandrii): change this to 'Bug: %s' to be a proper Gerrit footer.
851 bug_line_format = 'BUG=%s'
852 return bug_line_format
853
rmistry@google.com90752582014-01-14 21:04:50 +0000854 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000856
rmistry@google.com78948ed2015-07-08 23:09:57 +0000857 def GetIsSkipDependencyUpload(self, branch_name):
858 """Returns true if specified branch should skip dep uploads."""
859 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
860 error_ok=True)
861
rmistry@google.com5626a922015-02-26 14:03:30 +0000862 def GetRunPostUploadHook(self):
863 run_post_upload_hook = self._GetRietveldConfig(
864 'run-post-upload-hook', error_ok=True)
865 return run_post_upload_hook == "True"
866
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000867 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000868 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000869
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000870 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000871 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000872
ukai@chromium.orge8077812012-02-03 03:41:46 +0000873 def GetIsGerrit(self):
874 """Return true if this repo is assosiated with gerrit code review system."""
875 if self.is_gerrit is None:
876 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
877 return self.is_gerrit
878
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000879 def GetSquashGerritUploads(self):
880 """Return true if uploads to Gerrit should be squashed by default."""
881 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700882 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
883 if self.squash_gerrit_uploads is None:
884 # Default is squash now (http://crbug.com/611892#c23).
885 self.squash_gerrit_uploads = not (
886 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
887 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000888 return self.squash_gerrit_uploads
889
tandriia60502f2016-06-20 02:01:53 -0700890 def GetSquashGerritUploadsOverride(self):
891 """Return True or False if codereview.settings should be overridden.
892
893 Returns None if no override has been defined.
894 """
895 # See also http://crbug.com/611892#c23
896 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
897 error_ok=True).strip()
898 if result == 'true':
899 return True
900 if result == 'false':
901 return False
902 return None
903
tandrii@chromium.org28253532016-04-14 13:46:56 +0000904 def GetGerritSkipEnsureAuthenticated(self):
905 """Return True if EnsureAuthenticated should not be done for Gerrit
906 uploads."""
907 if self.gerrit_skip_ensure_authenticated is None:
908 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000909 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000910 error_ok=True).strip() == 'true')
911 return self.gerrit_skip_ensure_authenticated
912
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000913 def GetGitEditor(self):
914 """Return the editor specified in the git config, or None if none is."""
915 if self.git_editor is None:
916 self.git_editor = self._GetConfig('core.editor', error_ok=True)
917 return self.git_editor or None
918
thestig@chromium.org44202a22014-03-11 19:22:18 +0000919 def GetLintRegex(self):
920 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
921 DEFAULT_LINT_REGEX)
922
923 def GetLintIgnoreRegex(self):
924 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
925 DEFAULT_LINT_IGNORE_REGEX)
926
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000927 def GetProject(self):
928 if not self.project:
929 self.project = self._GetRietveldConfig('project', error_ok=True)
930 return self.project
931
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000932 def _GetRietveldConfig(self, param, **kwargs):
933 return self._GetConfig('rietveld.' + param, **kwargs)
934
rmistry@google.com78948ed2015-07-08 23:09:57 +0000935 def _GetBranchConfig(self, branch_name, param, **kwargs):
936 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
937
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000938 def _GetConfig(self, param, **kwargs):
939 self.LazyUpdateIfNeeded()
940 return RunGit(['config', param], **kwargs).strip()
941
942
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100943@contextlib.contextmanager
944def _get_gerrit_project_config_file(remote_url):
945 """Context manager to fetch and store Gerrit's project.config from
946 refs/meta/config branch and store it in temp file.
947
948 Provides a temporary filename or None if there was error.
949 """
950 error, _ = RunGitWithCode([
951 'fetch', remote_url,
952 '+refs/meta/config:refs/git_cl/meta/config'])
953 if error:
954 # Ref doesn't exist or isn't accessible to current user.
955 print('WARNING: failed to fetch project config for %s: %s' %
956 (remote_url, error))
957 yield None
958 return
959
960 error, project_config_data = RunGitWithCode(
961 ['show', 'refs/git_cl/meta/config:project.config'])
962 if error:
963 print('WARNING: project.config file not found')
964 yield None
965 return
966
967 with gclient_utils.temporary_directory() as tempdir:
968 project_config_file = os.path.join(tempdir, 'project.config')
969 gclient_utils.FileWrite(project_config_file, project_config_data)
970 yield project_config_file
971
972
973def _is_git_numberer_enabled(remote_url, remote_ref):
974 """Returns True if Git Numberer is enabled on this ref."""
975 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100976 KNOWN_PROJECTS_WHITELIST = [
977 'chromium/src',
978 'external/webrtc',
979 'v8/v8',
980 ]
981
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100982 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
983 url_parts = urlparse.urlparse(remote_url)
984 project_name = url_parts.path.lstrip('/').rstrip('git./')
985 for known in KNOWN_PROJECTS_WHITELIST:
986 if project_name.endswith(known):
987 break
988 else:
989 # Early exit to avoid extra fetches for repos that aren't using Git
990 # Numberer.
991 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100992
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100993 with _get_gerrit_project_config_file(remote_url) as project_config_file:
994 if project_config_file is None:
995 # Failed to fetch project.config, which shouldn't happen on open source
996 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100997 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 def get_opts(x):
999 code, out = RunGitWithCode(
1000 ['config', '-f', project_config_file, '--get-all',
1001 'plugin.git-numberer.validate-%s-refglob' % x])
1002 if code == 0:
1003 return out.strip().splitlines()
1004 return []
1005 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001006
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001007 logging.info('validator config enabled %s disabled %s refglobs for '
1008 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001009
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001010 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001011 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001012 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001013 return True
1014 return False
1015
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001016 if match_refglobs(disabled):
1017 return False
1018 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001019
1020
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001021def ShortBranchName(branch):
1022 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001023 return branch.replace('refs/heads/', '', 1)
1024
1025
1026def GetCurrentBranchRef():
1027 """Returns branch ref (e.g., refs/heads/master) or None."""
1028 return RunGit(['symbolic-ref', 'HEAD'],
1029 stderr=subprocess2.VOID, error_ok=True).strip() or None
1030
1031
1032def GetCurrentBranch():
1033 """Returns current branch or None.
1034
1035 For refs/heads/* branches, returns just last part. For others, full ref.
1036 """
1037 branchref = GetCurrentBranchRef()
1038 if branchref:
1039 return ShortBranchName(branchref)
1040 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041
1042
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001043class _CQState(object):
1044 """Enum for states of CL with respect to Commit Queue."""
1045 NONE = 'none'
1046 DRY_RUN = 'dry_run'
1047 COMMIT = 'commit'
1048
1049 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1050
1051
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001052class _ParsedIssueNumberArgument(object):
1053 def __init__(self, issue=None, patchset=None, hostname=None):
1054 self.issue = issue
1055 self.patchset = patchset
1056 self.hostname = hostname
1057
1058 @property
1059 def valid(self):
1060 return self.issue is not None
1061
1062
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001063def ParseIssueNumberArgument(arg):
1064 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1065 fail_result = _ParsedIssueNumberArgument()
1066
1067 if arg.isdigit():
1068 return _ParsedIssueNumberArgument(issue=int(arg))
1069 if not arg.startswith('http'):
1070 return fail_result
1071 url = gclient_utils.UpgradeToHttps(arg)
1072 try:
1073 parsed_url = urlparse.urlparse(url)
1074 except ValueError:
1075 return fail_result
1076 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
1077 tmp = cls.ParseIssueURL(parsed_url)
1078 if tmp is not None:
1079 return tmp
1080 return fail_result
1081
1082
Aaron Gablea45ee112016-11-22 15:14:38 -08001083class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001084 def __init__(self, issue, url):
1085 self.issue = issue
1086 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001087 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001088
1089 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001090 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001091 self.issue, self.url)
1092
1093
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001094_CommentSummary = collections.namedtuple(
1095 '_CommentSummary', ['date', 'message', 'sender',
1096 # TODO(tandrii): these two aren't known in Gerrit.
1097 'approval', 'disapproval'])
1098
1099
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001101 """Changelist works with one changelist in local branch.
1102
1103 Supports two codereview backends: Rietveld or Gerrit, selected at object
1104 creation.
1105
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001106 Notes:
1107 * Not safe for concurrent multi-{thread,process} use.
1108 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001109 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001110 """
1111
1112 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1113 """Create a new ChangeList instance.
1114
1115 If issue is given, the codereview must be given too.
1116
1117 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1118 Otherwise, it's decided based on current configuration of the local branch,
1119 with default being 'rietveld' for backwards compatibility.
1120 See _load_codereview_impl for more details.
1121
1122 **kwargs will be passed directly to codereview implementation.
1123 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001125 global settings
1126 if not settings:
1127 # Happens when git_cl.py is used as a utility library.
1128 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001129
1130 if issue:
1131 assert codereview, 'codereview must be known, if issue is known'
1132
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 self.branchref = branchref
1134 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001135 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136 self.branch = ShortBranchName(self.branchref)
1137 else:
1138 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001140 self.lookedup_issue = False
1141 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 self.has_description = False
1143 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001144 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001146 self.cc = None
1147 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001148 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001149
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001150 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001151 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001152 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001153 assert self._codereview_impl
1154 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001155
1156 def _load_codereview_impl(self, codereview=None, **kwargs):
1157 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001158 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1159 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1160 self._codereview = codereview
1161 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 return
1163
1164 # Automatic selection based on issue number set for a current branch.
1165 # Rietveld takes precedence over Gerrit.
1166 assert not self.issue
1167 # Whether we find issue or not, we are doing the lookup.
1168 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001169 if self.GetBranch():
1170 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1171 issue = _git_get_branch_config_value(
1172 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1173 if issue:
1174 self._codereview = codereview
1175 self._codereview_impl = cls(self, **kwargs)
1176 self.issue = int(issue)
1177 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001178
1179 # No issue is set for this branch, so decide based on repo-wide settings.
1180 return self._load_codereview_impl(
1181 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1182 **kwargs)
1183
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001184 def IsGerrit(self):
1185 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001186
1187 def GetCCList(self):
1188 """Return the users cc'd on this CL.
1189
agable92bec4f2016-08-24 09:27:27 -07001190 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001191 """
1192 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001193 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001194 more_cc = ','.join(self.watchers)
1195 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1196 return self.cc
1197
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001198 def GetCCListWithoutDefault(self):
1199 """Return the users cc'd on this CL excluding default ones."""
1200 if self.cc is None:
1201 self.cc = ','.join(self.watchers)
1202 return self.cc
1203
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001204 def SetWatchers(self, watchers):
1205 """Set the list of email addresses that should be cc'd based on the changed
1206 files in this CL.
1207 """
1208 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001209
1210 def GetBranch(self):
1211 """Returns the short branch name, e.g. 'master'."""
1212 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001213 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001214 if not branchref:
1215 return None
1216 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217 self.branch = ShortBranchName(self.branchref)
1218 return self.branch
1219
1220 def GetBranchRef(self):
1221 """Returns the full branch name, e.g. 'refs/heads/master'."""
1222 self.GetBranch() # Poke the lazy loader.
1223 return self.branchref
1224
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001225 def ClearBranch(self):
1226 """Clears cached branch data of this object."""
1227 self.branch = self.branchref = None
1228
tandrii5d48c322016-08-18 16:19:37 -07001229 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1230 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1231 kwargs['branch'] = self.GetBranch()
1232 return _git_get_branch_config_value(key, default, **kwargs)
1233
1234 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1235 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1236 assert self.GetBranch(), (
1237 'this CL must have an associated branch to %sset %s%s' %
1238 ('un' if value is None else '',
1239 key,
1240 '' if value is None else ' to %r' % value))
1241 kwargs['branch'] = self.GetBranch()
1242 return _git_set_branch_config_value(key, value, **kwargs)
1243
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 @staticmethod
1245 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001246 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 e.g. 'origin', 'refs/heads/master'
1248 """
1249 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001250 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1251
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001253 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001255 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1256 error_ok=True).strip()
1257 if upstream_branch:
1258 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001260 # Else, try to guess the origin remote.
1261 remote_branches = RunGit(['branch', '-r']).split()
1262 if 'origin/master' in remote_branches:
1263 # Fall back on origin/master if it exits.
1264 remote = 'origin'
1265 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001267 DieWithError(
1268 'Unable to determine default branch to diff against.\n'
1269 'Either pass complete "git diff"-style arguments, like\n'
1270 ' git cl upload origin/master\n'
1271 'or verify this branch is set up to track another \n'
1272 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273
1274 return remote, upstream_branch
1275
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001276 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001277 upstream_branch = self.GetUpstreamBranch()
1278 if not BranchExists(upstream_branch):
1279 DieWithError('The upstream for the current branch (%s) does not exist '
1280 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001281 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001282 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001283
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284 def GetUpstreamBranch(self):
1285 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001286 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001287 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001288 upstream_branch = upstream_branch.replace('refs/heads/',
1289 'refs/remotes/%s/' % remote)
1290 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1291 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 self.upstream_branch = upstream_branch
1293 return self.upstream_branch
1294
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001295 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001296 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001297 remote, branch = None, self.GetBranch()
1298 seen_branches = set()
1299 while branch not in seen_branches:
1300 seen_branches.add(branch)
1301 remote, branch = self.FetchUpstreamTuple(branch)
1302 branch = ShortBranchName(branch)
1303 if remote != '.' or branch.startswith('refs/remotes'):
1304 break
1305 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001306 remotes = RunGit(['remote'], error_ok=True).split()
1307 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001308 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001309 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001310 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001311 logging.warn('Could not determine which remote this change is '
1312 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001313 else:
1314 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001315 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001316 branch = 'HEAD'
1317 if branch.startswith('refs/remotes'):
1318 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001319 elif branch.startswith('refs/branch-heads/'):
1320 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 else:
1322 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001323 return self._remote
1324
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001325 def GitSanityChecks(self, upstream_git_obj):
1326 """Checks git repo status and ensures diff is from local commits."""
1327
sbc@chromium.org79706062015-01-14 21:18:12 +00001328 if upstream_git_obj is None:
1329 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001330 print('ERROR: unable to determine current branch (detached HEAD?)',
1331 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001332 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001333 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001334 return False
1335
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001336 # Verify the commit we're diffing against is in our current branch.
1337 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1338 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1339 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001340 print('ERROR: %s is not in the current branch. You may need to rebase '
1341 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001342 return False
1343
1344 # List the commits inside the diff, and verify they are all local.
1345 commits_in_diff = RunGit(
1346 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1347 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1348 remote_branch = remote_branch.strip()
1349 if code != 0:
1350 _, remote_branch = self.GetRemoteBranch()
1351
1352 commits_in_remote = RunGit(
1353 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1354
1355 common_commits = set(commits_in_diff) & set(commits_in_remote)
1356 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001357 print('ERROR: Your diff contains %d commits already in %s.\n'
1358 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1359 'the diff. If you are using a custom git flow, you can override'
1360 ' the reference used for this check with "git config '
1361 'gitcl.remotebranch <git-ref>".' % (
1362 len(common_commits), remote_branch, upstream_git_obj),
1363 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001364 return False
1365 return True
1366
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001367 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001368 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001369
1370 Returns None if it is not set.
1371 """
tandrii5d48c322016-08-18 16:19:37 -07001372 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001373
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001374 def GetRemoteUrl(self):
1375 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1376
1377 Returns None if there is no remote.
1378 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001379 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001380 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1381
1382 # If URL is pointing to a local directory, it is probably a git cache.
1383 if os.path.isdir(url):
1384 url = RunGit(['config', 'remote.%s.url' % remote],
1385 error_ok=True,
1386 cwd=url).strip()
1387 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001389 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001390 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001391 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001392 self.issue = self._GitGetBranchConfigValue(
1393 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001394 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001395 return self.issue
1396
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397 def GetIssueURL(self):
1398 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001399 issue = self.GetIssue()
1400 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001401 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001402 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001404 def GetDescription(self, pretty=False, force=False):
1405 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001407 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 self.has_description = True
1409 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001410 # Set width to 72 columns + 2 space indent.
1411 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001413 lines = self.description.splitlines()
1414 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 return self.description
1416
1417 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001418 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001419 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001420 self.patchset = self._GitGetBranchConfigValue(
1421 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001422 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001423 return self.patchset
1424
1425 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001426 """Set this branch's patchset. If patchset=0, clears the patchset."""
1427 assert self.GetBranch()
1428 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001429 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001430 else:
1431 self.patchset = int(patchset)
1432 self._GitSetBranchConfigValue(
1433 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001434
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001435 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001436 """Set this branch's issue. If issue isn't given, clears the issue."""
1437 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001438 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001439 issue = int(issue)
1440 self._GitSetBranchConfigValue(
1441 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001442 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001443 codereview_server = self._codereview_impl.GetCodereviewServer()
1444 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001445 self._GitSetBranchConfigValue(
1446 self._codereview_impl.CodereviewServerConfigKey(),
1447 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448 else:
tandrii5d48c322016-08-18 16:19:37 -07001449 # Reset all of these just to be clean.
1450 reset_suffixes = [
1451 'last-upload-hash',
1452 self._codereview_impl.IssueConfigKey(),
1453 self._codereview_impl.PatchsetConfigKey(),
1454 self._codereview_impl.CodereviewServerConfigKey(),
1455 ] + self._PostUnsetIssueProperties()
1456 for prop in reset_suffixes:
1457 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001458 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001459 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460
dnjba1b0f32016-09-02 12:37:42 -07001461 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001462 if not self.GitSanityChecks(upstream_branch):
1463 DieWithError('\nGit sanity check failure')
1464
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001465 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001466 if not root:
1467 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001468 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001469
1470 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001471 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001472 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001473 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001474 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001475 except subprocess2.CalledProcessError:
1476 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001477 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001478 'This branch probably doesn\'t exist anymore. To reset the\n'
1479 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001480 ' git branch --set-upstream-to origin/master %s\n'
1481 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001482 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483
maruel@chromium.org52424302012-08-29 15:14:30 +00001484 issue = self.GetIssue()
1485 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001486 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001487 description = self.GetDescription()
1488 else:
1489 # If the change was never uploaded, use the log messages of all commits
1490 # up to the branch point, as git cl upload will prefill the description
1491 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001492 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1493 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001494
1495 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001496 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001497 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001498 name,
1499 description,
1500 absroot,
1501 files,
1502 issue,
1503 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001504 author,
1505 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001506
dsansomee2d6fd92016-09-08 00:10:47 -07001507 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001508 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001509 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001510 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001511
1512 def RunHook(self, committing, may_prompt, verbose, change):
1513 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1514 try:
1515 return presubmit_support.DoPresubmitChecks(change, committing,
1516 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1517 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001518 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1519 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001520 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001521 DieWithError(
1522 ('%s\nMaybe your depot_tools is out of date?\n'
1523 'If all fails, contact maruel@') % e)
1524
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001525 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1526 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001527 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1528 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001529 else:
1530 # Assume url.
1531 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1532 urlparse.urlparse(issue_arg))
1533 if not parsed_issue_arg or not parsed_issue_arg.valid:
1534 DieWithError('Failed to parse issue argument "%s". '
1535 'Must be an issue number or a valid URL.' % issue_arg)
1536 return self._codereview_impl.CMDPatchWithParsedIssue(
1537 parsed_issue_arg, reject, nocommit, directory)
1538
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539 def CMDUpload(self, options, git_diff_args, orig_args):
1540 """Uploads a change to codereview."""
1541 if git_diff_args:
1542 # TODO(ukai): is it ok for gerrit case?
1543 base_branch = git_diff_args[0]
1544 else:
1545 if self.GetBranch() is None:
1546 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1547
1548 # Default to diffing against common ancestor of upstream branch
1549 base_branch = self.GetCommonAncestorWithUpstream()
1550 git_diff_args = [base_branch, 'HEAD']
1551
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001552 # Fast best-effort checks to abort before running potentially
1553 # expensive hooks if uploading is likely to fail anyway. Passing these
1554 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001555 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001556 self._codereview_impl.EnsureCanUploadPatchset()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557
1558 # Apply watchlists on upload.
1559 change = self.GetChange(base_branch, None)
1560 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1561 files = [f.LocalPath() for f in change.AffectedFiles()]
1562 if not options.bypass_watchlists:
1563 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1564
1565 if not options.bypass_hooks:
1566 if options.reviewers or options.tbr_owners:
1567 # Set the reviewer list now so that presubmit checks can access it.
1568 change_description = ChangeDescription(change.FullDescriptionText())
1569 change_description.update_reviewers(options.reviewers,
1570 options.tbr_owners,
1571 change)
1572 change.SetDescriptionText(change_description.description)
1573 hook_results = self.RunHook(committing=False,
1574 may_prompt=not options.force,
1575 verbose=options.verbose,
1576 change=change)
1577 if not hook_results.should_continue():
1578 return 1
1579 if not options.reviewers and hook_results.reviewers:
1580 options.reviewers = hook_results.reviewers.split(',')
1581
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001582 # TODO(tandrii): Checking local patchset against remote patchset is only
1583 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1584 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001585 latest_patchset = self.GetMostRecentPatchset()
1586 local_patchset = self.GetPatchset()
1587 if (latest_patchset and local_patchset and
1588 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001589 print('The last upload made from this repository was patchset #%d but '
1590 'the most recent patchset on the server is #%d.'
1591 % (local_patchset, latest_patchset))
1592 print('Uploading will still work, but if you\'ve uploaded to this '
1593 'issue from another machine or branch the patch you\'re '
1594 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001595 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001596
1597 print_stats(options.similarity, options.find_copies, git_diff_args)
1598 ret = self.CMDUploadChange(options, git_diff_args, change)
1599 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001600 if options.use_commit_queue:
1601 self.SetCQState(_CQState.COMMIT)
1602 elif options.cq_dry_run:
1603 self.SetCQState(_CQState.DRY_RUN)
1604
tandrii5d48c322016-08-18 16:19:37 -07001605 _git_set_branch_config_value('last-upload-hash',
1606 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001607 # Run post upload hooks, if specified.
1608 if settings.GetRunPostUploadHook():
1609 presubmit_support.DoPostUploadExecuter(
1610 change,
1611 self,
1612 settings.GetRoot(),
1613 options.verbose,
1614 sys.stdout)
1615
1616 # Upload all dependencies if specified.
1617 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001618 print()
1619 print('--dependencies has been specified.')
1620 print('All dependent local branches will be re-uploaded.')
1621 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 # Remove the dependencies flag from args so that we do not end up in a
1623 # loop.
1624 orig_args.remove('--dependencies')
1625 ret = upload_branch_deps(self, orig_args)
1626 return ret
1627
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001628 def SetCQState(self, new_state):
1629 """Update the CQ state for latest patchset.
1630
1631 Issue must have been already uploaded and known.
1632 """
1633 assert new_state in _CQState.ALL_STATES
1634 assert self.GetIssue()
1635 return self._codereview_impl.SetCQState(new_state)
1636
qyearsley1fdfcb62016-10-24 13:22:03 -07001637 def TriggerDryRun(self):
1638 """Triggers a dry run and prints a warning on failure."""
1639 # TODO(qyearsley): Either re-use this method in CMDset_commit
1640 # and CMDupload, or change CMDtry to trigger dry runs with
1641 # just SetCQState, and catch keyboard interrupt and other
1642 # errors in that method.
1643 try:
1644 self.SetCQState(_CQState.DRY_RUN)
1645 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1646 return 0
1647 except KeyboardInterrupt:
1648 raise
1649 except:
1650 print('WARNING: failed to trigger CQ Dry Run.\n'
1651 'Either:\n'
1652 ' * your project has no CQ\n'
1653 ' * you don\'t have permission to trigger Dry Run\n'
1654 ' * bug in this code (see stack trace below).\n'
1655 'Consider specifying which bots to trigger manually '
1656 'or asking your project owners for permissions '
1657 'or contacting Chrome Infrastructure team at '
1658 'https://www.chromium.org/infra\n\n')
1659 # Still raise exception so that stack trace is printed.
1660 raise
1661
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001662 # Forward methods to codereview specific implementation.
1663
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001664 def AddComment(self, message):
1665 return self._codereview_impl.AddComment(message)
1666
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001667 def GetCommentsSummary(self):
1668 """Returns list of _CommentSummary for each comment.
1669
1670 Note: comments per file or per line are not included,
1671 only top-level comments are returned.
1672 """
1673 return self._codereview_impl.GetCommentsSummary()
1674
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 def CloseIssue(self):
1676 return self._codereview_impl.CloseIssue()
1677
1678 def GetStatus(self):
1679 return self._codereview_impl.GetStatus()
1680
1681 def GetCodereviewServer(self):
1682 return self._codereview_impl.GetCodereviewServer()
1683
tandriide281ae2016-10-12 06:02:30 -07001684 def GetIssueOwner(self):
1685 """Get owner from codereview, which may differ from this checkout."""
1686 return self._codereview_impl.GetIssueOwner()
1687
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001688 def GetApprovingReviewers(self):
1689 return self._codereview_impl.GetApprovingReviewers()
1690
1691 def GetMostRecentPatchset(self):
1692 return self._codereview_impl.GetMostRecentPatchset()
1693
tandriide281ae2016-10-12 06:02:30 -07001694 def CannotTriggerTryJobReason(self):
1695 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1696 return self._codereview_impl.CannotTriggerTryJobReason()
1697
tandrii8c5a3532016-11-04 07:52:02 -07001698 def GetTryjobProperties(self, patchset=None):
1699 """Returns dictionary of properties to launch tryjob."""
1700 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1701
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702 def __getattr__(self, attr):
1703 # This is because lots of untested code accesses Rietveld-specific stuff
1704 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001705 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001706 # Note that child method defines __getattr__ as well, and forwards it here,
1707 # because _RietveldChangelistImpl is not cleaned up yet, and given
1708 # deprecation of Rietveld, it should probably be just removed.
1709 # Until that time, avoid infinite recursion by bypassing __getattr__
1710 # of implementation class.
1711 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001712
1713
1714class _ChangelistCodereviewBase(object):
1715 """Abstract base class encapsulating codereview specifics of a changelist."""
1716 def __init__(self, changelist):
1717 self._changelist = changelist # instance of Changelist
1718
1719 def __getattr__(self, attr):
1720 # Forward methods to changelist.
1721 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1722 # _RietveldChangelistImpl to avoid this hack?
1723 return getattr(self._changelist, attr)
1724
1725 def GetStatus(self):
1726 """Apply a rough heuristic to give a simple summary of an issue's review
1727 or CQ status, assuming adherence to a common workflow.
1728
1729 Returns None if no issue for this branch, or specific string keywords.
1730 """
1731 raise NotImplementedError()
1732
1733 def GetCodereviewServer(self):
1734 """Returns server URL without end slash, like "https://codereview.com"."""
1735 raise NotImplementedError()
1736
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001737 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738 """Fetches and returns description from the codereview server."""
1739 raise NotImplementedError()
1740
tandrii5d48c322016-08-18 16:19:37 -07001741 @classmethod
1742 def IssueConfigKey(cls):
1743 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001744 raise NotImplementedError()
1745
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001746 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001747 def PatchsetConfigKey(cls):
1748 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749 raise NotImplementedError()
1750
tandrii5d48c322016-08-18 16:19:37 -07001751 @classmethod
1752 def CodereviewServerConfigKey(cls):
1753 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 raise NotImplementedError()
1755
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001756 def _PostUnsetIssueProperties(self):
1757 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001758 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001759
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001760 def GetRieveldObjForPresubmit(self):
1761 # This is an unfortunate Rietveld-embeddedness in presubmit.
1762 # For non-Rietveld codereviews, this probably should return a dummy object.
1763 raise NotImplementedError()
1764
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001765 def GetGerritObjForPresubmit(self):
1766 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1767 return None
1768
dsansomee2d6fd92016-09-08 00:10:47 -07001769 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770 """Update the description on codereview site."""
1771 raise NotImplementedError()
1772
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001773 def AddComment(self, message):
1774 """Posts a comment to the codereview site."""
1775 raise NotImplementedError()
1776
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001777 def GetCommentsSummary(self):
1778 raise NotImplementedError()
1779
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001780 def CloseIssue(self):
1781 """Closes the issue."""
1782 raise NotImplementedError()
1783
1784 def GetApprovingReviewers(self):
1785 """Returns a list of reviewers approving the change.
1786
1787 Note: not necessarily committers.
1788 """
1789 raise NotImplementedError()
1790
1791 def GetMostRecentPatchset(self):
1792 """Returns the most recent patchset number from the codereview site."""
1793 raise NotImplementedError()
1794
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001795 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1796 directory):
1797 """Fetches and applies the issue.
1798
1799 Arguments:
1800 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1801 reject: if True, reject the failed patch instead of switching to 3-way
1802 merge. Rietveld only.
1803 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1804 only.
1805 directory: switch to directory before applying the patch. Rietveld only.
1806 """
1807 raise NotImplementedError()
1808
1809 @staticmethod
1810 def ParseIssueURL(parsed_url):
1811 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1812 failed."""
1813 raise NotImplementedError()
1814
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001815 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001816 """Best effort check that user is authenticated with codereview server.
1817
1818 Arguments:
1819 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001820 refresh: whether to attempt to refresh credentials. Ignored if not
1821 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001822 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001823 raise NotImplementedError()
1824
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001825 def EnsureCanUploadPatchset(self):
1826 """Best effort check that uploading isn't supposed to fail for predictable
1827 reasons.
1828
1829 This method should raise informative exception if uploading shouldn't
1830 proceed.
1831 """
1832 pass
1833
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001834 def CMDUploadChange(self, options, args, change):
1835 """Uploads a change to codereview."""
1836 raise NotImplementedError()
1837
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001838 def SetCQState(self, new_state):
1839 """Update the CQ state for latest patchset.
1840
1841 Issue must have been already uploaded and known.
1842 """
1843 raise NotImplementedError()
1844
tandriie113dfd2016-10-11 10:20:12 -07001845 def CannotTriggerTryJobReason(self):
1846 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1847 raise NotImplementedError()
1848
tandriide281ae2016-10-12 06:02:30 -07001849 def GetIssueOwner(self):
1850 raise NotImplementedError()
1851
tandrii8c5a3532016-11-04 07:52:02 -07001852 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001853 raise NotImplementedError()
1854
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001855
1856class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001857 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001858 super(_RietveldChangelistImpl, self).__init__(changelist)
1859 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001860 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001861 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001862
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001863 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001864 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001865 self._props = None
1866 self._rpc_server = None
1867
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001868 def GetCodereviewServer(self):
1869 if not self._rietveld_server:
1870 # If we're on a branch then get the server potentially associated
1871 # with that branch.
1872 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001873 self._rietveld_server = gclient_utils.UpgradeToHttps(
1874 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001875 if not self._rietveld_server:
1876 self._rietveld_server = settings.GetDefaultServerUrl()
1877 return self._rietveld_server
1878
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001879 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001880 """Best effort check that user is authenticated with Rietveld server."""
1881 if self._auth_config.use_oauth2:
1882 authenticator = auth.get_authenticator_for_host(
1883 self.GetCodereviewServer(), self._auth_config)
1884 if not authenticator.has_cached_credentials():
1885 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001886 if refresh:
1887 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001888
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001889 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001890 issue = self.GetIssue()
1891 assert issue
1892 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001893 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001894 except urllib2.HTTPError as e:
1895 if e.code == 404:
1896 DieWithError(
1897 ('\nWhile fetching the description for issue %d, received a '
1898 '404 (not found)\n'
1899 'error. It is likely that you deleted this '
1900 'issue on the server. If this is the\n'
1901 'case, please run\n\n'
1902 ' git cl issue 0\n\n'
1903 'to clear the association with the deleted issue. Then run '
1904 'this command again.') % issue)
1905 else:
1906 DieWithError(
1907 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1908 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001909 print('Warning: Failed to retrieve CL description due to network '
1910 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 return ''
1912
1913 def GetMostRecentPatchset(self):
1914 return self.GetIssueProperties()['patchsets'][-1]
1915
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001916 def GetIssueProperties(self):
1917 if self._props is None:
1918 issue = self.GetIssue()
1919 if not issue:
1920 self._props = {}
1921 else:
1922 self._props = self.RpcServer().get_issue_properties(issue, True)
1923 return self._props
1924
tandriie113dfd2016-10-11 10:20:12 -07001925 def CannotTriggerTryJobReason(self):
1926 props = self.GetIssueProperties()
1927 if not props:
1928 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1929 if props.get('closed'):
1930 return 'CL %s is closed' % self.GetIssue()
1931 if props.get('private'):
1932 return 'CL %s is private' % self.GetIssue()
1933 return None
1934
tandrii8c5a3532016-11-04 07:52:02 -07001935 def GetTryjobProperties(self, patchset=None):
1936 """Returns dictionary of properties to launch tryjob."""
1937 project = (self.GetIssueProperties() or {}).get('project')
1938 return {
1939 'issue': self.GetIssue(),
1940 'patch_project': project,
1941 'patch_storage': 'rietveld',
1942 'patchset': patchset or self.GetPatchset(),
1943 'rietveld': self.GetCodereviewServer(),
1944 }
1945
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001946 def GetApprovingReviewers(self):
1947 return get_approving_reviewers(self.GetIssueProperties())
1948
tandriide281ae2016-10-12 06:02:30 -07001949 def GetIssueOwner(self):
1950 return (self.GetIssueProperties() or {}).get('owner_email')
1951
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 def AddComment(self, message):
1953 return self.RpcServer().add_comment(self.GetIssue(), message)
1954
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001955 def GetCommentsSummary(self):
1956 summary = []
1957 for message in self.GetIssueProperties().get('messages', []):
1958 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1959 summary.append(_CommentSummary(
1960 date=date,
1961 disapproval=bool(message['disapproval']),
1962 approval=bool(message['approval']),
1963 sender=message['sender'],
1964 message=message['text'],
1965 ))
1966 return summary
1967
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001968 def GetStatus(self):
1969 """Apply a rough heuristic to give a simple summary of an issue's review
1970 or CQ status, assuming adherence to a common workflow.
1971
1972 Returns None if no issue for this branch, or one of the following keywords:
1973 * 'error' - error from review tool (including deleted issues)
1974 * 'unsent' - not sent for review
1975 * 'waiting' - waiting for review
1976 * 'reply' - waiting for owner to reply to review
1977 * 'lgtm' - LGTM from at least one approved reviewer
1978 * 'commit' - in the commit queue
1979 * 'closed' - closed
1980 """
1981 if not self.GetIssue():
1982 return None
1983
1984 try:
1985 props = self.GetIssueProperties()
1986 except urllib2.HTTPError:
1987 return 'error'
1988
1989 if props.get('closed'):
1990 # Issue is closed.
1991 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001992 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001993 # Issue is in the commit queue.
1994 return 'commit'
1995
1996 try:
1997 reviewers = self.GetApprovingReviewers()
1998 except urllib2.HTTPError:
1999 return 'error'
2000
2001 if reviewers:
2002 # Was LGTM'ed.
2003 return 'lgtm'
2004
2005 messages = props.get('messages') or []
2006
tandrii9d2c7a32016-06-22 03:42:45 -07002007 # Skip CQ messages that don't require owner's action.
2008 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2009 if 'Dry run:' in messages[-1]['text']:
2010 messages.pop()
2011 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2012 # This message always follows prior messages from CQ,
2013 # so skip this too.
2014 messages.pop()
2015 else:
2016 # This is probably a CQ messages warranting user attention.
2017 break
2018
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002019 if not messages:
2020 # No message was sent.
2021 return 'unsent'
2022 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002023 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002024 return 'reply'
2025 return 'waiting'
2026
dsansomee2d6fd92016-09-08 00:10:47 -07002027 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002028 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002029
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002030 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002031 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002032
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002033 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002034 return self.SetFlags({flag: value})
2035
2036 def SetFlags(self, flags):
2037 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002038 """
phajdan.jr68598232016-08-10 03:28:28 -07002039 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002040 try:
tandrii4b233bd2016-07-06 03:50:29 -07002041 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002042 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002043 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002044 if e.code == 404:
2045 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2046 if e.code == 403:
2047 DieWithError(
2048 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002049 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002050 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002051
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002052 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002053 """Returns an upload.RpcServer() to access this review's rietveld instance.
2054 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002055 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002056 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002057 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002058 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002059 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002060
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002061 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002062 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002063 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002064
tandrii5d48c322016-08-18 16:19:37 -07002065 @classmethod
2066 def PatchsetConfigKey(cls):
2067 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002068
tandrii5d48c322016-08-18 16:19:37 -07002069 @classmethod
2070 def CodereviewServerConfigKey(cls):
2071 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002072
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002073 def GetRieveldObjForPresubmit(self):
2074 return self.RpcServer()
2075
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002076 def SetCQState(self, new_state):
2077 props = self.GetIssueProperties()
2078 if props.get('private'):
2079 DieWithError('Cannot set-commit on private issue')
2080
2081 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002082 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002083 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002084 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002085 else:
tandrii4b233bd2016-07-06 03:50:29 -07002086 assert new_state == _CQState.DRY_RUN
2087 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002088
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002089 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2090 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091 # PatchIssue should never be called with a dirty tree. It is up to the
2092 # caller to check this, but just in case we assert here since the
2093 # consequences of the caller not checking this could be dire.
2094 assert(not git_common.is_dirty_git_tree('apply'))
2095 assert(parsed_issue_arg.valid)
2096 self._changelist.issue = parsed_issue_arg.issue
2097 if parsed_issue_arg.hostname:
2098 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2099
skobes6468b902016-10-24 08:45:10 -07002100 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2101 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2102 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 try:
skobes6468b902016-10-24 08:45:10 -07002104 scm_obj.apply_patch(patchset_object)
2105 except Exception as e:
2106 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002107 return 1
2108
2109 # If we had an issue, commit the current state and register the issue.
2110 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002111 self.SetIssue(self.GetIssue())
2112 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2114 'patch from issue %(i)s at patchset '
2115 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2116 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002117 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002118 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002119 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002120 return 0
2121
2122 @staticmethod
2123 def ParseIssueURL(parsed_url):
2124 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2125 return None
wychen3c1c1722016-08-04 11:46:36 -07002126 # Rietveld patch: https://domain/<number>/#ps<patchset>
2127 match = re.match(r'/(\d+)/$', parsed_url.path)
2128 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2129 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002130 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002131 issue=int(match.group(1)),
2132 patchset=int(match2.group(1)),
2133 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002134 # Typical url: https://domain/<issue_number>[/[other]]
2135 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2136 if match:
skobes6468b902016-10-24 08:45:10 -07002137 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002138 issue=int(match.group(1)),
2139 hostname=parsed_url.netloc)
2140 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2141 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2142 if match:
skobes6468b902016-10-24 08:45:10 -07002143 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144 issue=int(match.group(1)),
2145 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002146 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 return None
2148
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002149 def CMDUploadChange(self, options, args, change):
2150 """Upload the patch to Rietveld."""
2151 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2152 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002153 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2154 if options.emulate_svn_auto_props:
2155 upload_args.append('--emulate_svn_auto_props')
2156
2157 change_desc = None
2158
2159 if options.email is not None:
2160 upload_args.extend(['--email', options.email])
2161
2162 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002163 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002164 upload_args.extend(['--title', options.title])
2165 if options.message:
2166 upload_args.extend(['--message', options.message])
2167 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002168 print('This branch is associated with issue %s. '
2169 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002170 else:
nodirca166002016-06-27 10:59:51 -07002171 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002172 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002173 if options.message:
2174 message = options.message
2175 else:
2176 message = CreateDescriptionFromLog(args)
2177 if options.title:
2178 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002179 change_desc = ChangeDescription(message)
2180 if options.reviewers or options.tbr_owners:
2181 change_desc.update_reviewers(options.reviewers,
2182 options.tbr_owners,
2183 change)
2184 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002185 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002186
2187 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002188 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002189 return 1
2190
2191 upload_args.extend(['--message', change_desc.description])
2192 if change_desc.get_reviewers():
2193 upload_args.append('--reviewers=%s' % ','.join(
2194 change_desc.get_reviewers()))
2195 if options.send_mail:
2196 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002197 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002198 upload_args.append('--send_mail')
2199
2200 # We check this before applying rietveld.private assuming that in
2201 # rietveld.cc only addresses which we can send private CLs to are listed
2202 # if rietveld.private is set, and so we should ignore rietveld.cc only
2203 # when --private is specified explicitly on the command line.
2204 if options.private:
2205 logging.warn('rietveld.cc is ignored since private flag is specified. '
2206 'You need to review and add them manually if necessary.')
2207 cc = self.GetCCListWithoutDefault()
2208 else:
2209 cc = self.GetCCList()
2210 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002211 if change_desc.get_cced():
2212 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002213 if cc:
2214 upload_args.extend(['--cc', cc])
2215
2216 if options.private or settings.GetDefaultPrivateFlag() == "True":
2217 upload_args.append('--private')
2218
2219 upload_args.extend(['--git_similarity', str(options.similarity)])
2220 if not options.find_copies:
2221 upload_args.extend(['--git_no_find_copies'])
2222
2223 # Include the upstream repo's URL in the change -- this is useful for
2224 # projects that have their source spread across multiple repos.
2225 remote_url = self.GetGitBaseUrlFromConfig()
2226 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002227 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2228 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2229 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002230 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002231 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002232 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002233 if target_ref:
2234 upload_args.extend(['--target_ref', target_ref])
2235
2236 # Look for dependent patchsets. See crbug.com/480453 for more details.
2237 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2238 upstream_branch = ShortBranchName(upstream_branch)
2239 if remote is '.':
2240 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002241 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002243 print()
2244 print('Skipping dependency patchset upload because git config '
2245 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2246 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002247 else:
2248 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002249 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002250 auth_config=auth_config)
2251 branch_cl_issue_url = branch_cl.GetIssueURL()
2252 branch_cl_issue = branch_cl.GetIssue()
2253 branch_cl_patchset = branch_cl.GetPatchset()
2254 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2255 upload_args.extend(
2256 ['--depends_on_patchset', '%s:%s' % (
2257 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002258 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002259 '\n'
2260 'The current branch (%s) is tracking a local branch (%s) with '
2261 'an associated CL.\n'
2262 'Adding %s/#ps%s as a dependency patchset.\n'
2263 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2264 branch_cl_patchset))
2265
2266 project = settings.GetProject()
2267 if project:
2268 upload_args.extend(['--project', project])
2269
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 try:
2271 upload_args = ['upload'] + upload_args + args
2272 logging.info('upload.RealMain(%s)', upload_args)
2273 issue, patchset = upload.RealMain(upload_args)
2274 issue = int(issue)
2275 patchset = int(patchset)
2276 except KeyboardInterrupt:
2277 sys.exit(1)
2278 except:
2279 # If we got an exception after the user typed a description for their
2280 # change, back up the description before re-raising.
2281 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002282 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 raise
2284
2285 if not self.GetIssue():
2286 self.SetIssue(issue)
2287 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 return 0
2289
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002290
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002291class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002292 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002293 # auth_config is Rietveld thing, kept here to preserve interface only.
2294 super(_GerritChangelistImpl, self).__init__(changelist)
2295 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002296 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002297 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002298 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002299 # Map from change number (issue) to its detail cache.
2300 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002301
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002302 if codereview_host is not None:
2303 assert not codereview_host.startswith('https://'), codereview_host
2304 self._gerrit_host = codereview_host
2305 self._gerrit_server = 'https://%s' % codereview_host
2306
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002307 def _GetGerritHost(self):
2308 # Lazy load of configs.
2309 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002310 if self._gerrit_host and '.' not in self._gerrit_host:
2311 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2312 # This happens for internal stuff http://crbug.com/614312.
2313 parsed = urlparse.urlparse(self.GetRemoteUrl())
2314 if parsed.scheme == 'sso':
2315 print('WARNING: using non https URLs for remote is likely broken\n'
2316 ' Your current remote is: %s' % self.GetRemoteUrl())
2317 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2318 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002319 return self._gerrit_host
2320
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002321 def _GetGitHost(self):
2322 """Returns git host to be used when uploading change to Gerrit."""
2323 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2324
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002325 def GetCodereviewServer(self):
2326 if not self._gerrit_server:
2327 # If we're on a branch then get the server potentially associated
2328 # with that branch.
2329 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002330 self._gerrit_server = self._GitGetBranchConfigValue(
2331 self.CodereviewServerConfigKey())
2332 if self._gerrit_server:
2333 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002334 if not self._gerrit_server:
2335 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2336 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002337 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002338 parts[0] = parts[0] + '-review'
2339 self._gerrit_host = '.'.join(parts)
2340 self._gerrit_server = 'https://%s' % self._gerrit_host
2341 return self._gerrit_server
2342
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002343 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002344 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002345 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346
tandrii5d48c322016-08-18 16:19:37 -07002347 @classmethod
2348 def PatchsetConfigKey(cls):
2349 return 'gerritpatchset'
2350
2351 @classmethod
2352 def CodereviewServerConfigKey(cls):
2353 return 'gerritserver'
2354
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002355 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002356 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002357 if settings.GetGerritSkipEnsureAuthenticated():
2358 # For projects with unusual authentication schemes.
2359 # See http://crbug.com/603378.
2360 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002361 # Lazy-loader to identify Gerrit and Git hosts.
2362 if gerrit_util.GceAuthenticator.is_gce():
2363 return
2364 self.GetCodereviewServer()
2365 git_host = self._GetGitHost()
2366 assert self._gerrit_server and self._gerrit_host
2367 cookie_auth = gerrit_util.CookiesAuthenticator()
2368
2369 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2370 git_auth = cookie_auth.get_auth_header(git_host)
2371 if gerrit_auth and git_auth:
2372 if gerrit_auth == git_auth:
2373 return
2374 print((
2375 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2376 ' Check your %s or %s file for credentials of hosts:\n'
2377 ' %s\n'
2378 ' %s\n'
2379 ' %s') %
2380 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2381 git_host, self._gerrit_host,
2382 cookie_auth.get_new_password_message(git_host)))
2383 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002384 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002385 return
2386 else:
2387 missing = (
2388 [] if gerrit_auth else [self._gerrit_host] +
2389 [] if git_auth else [git_host])
2390 DieWithError('Credentials for the following hosts are required:\n'
2391 ' %s\n'
2392 'These are read from %s (or legacy %s)\n'
2393 '%s' % (
2394 '\n '.join(missing),
2395 cookie_auth.get_gitcookies_path(),
2396 cookie_auth.get_netrc_path(),
2397 cookie_auth.get_new_password_message(git_host)))
2398
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002399 def EnsureCanUploadPatchset(self):
2400 """Best effort check that uploading isn't supposed to fail for predictable
2401 reasons.
2402
2403 This method should raise informative exception if uploading shouldn't
2404 proceed.
2405 """
2406 if not self.GetIssue():
2407 return
2408
2409 # Warm change details cache now to avoid RPCs later, reducing latency for
2410 # developers.
2411 self.FetchDescription()
2412
2413 status = self._GetChangeDetail()['status']
2414 if status in ('MERGED', 'ABANDONED'):
2415 DieWithError('Change %s has been %s, new uploads are not allowed' %
2416 (self.GetIssueURL(),
2417 'submitted' if status == 'MERGED' else 'abandoned'))
2418
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002419 def _PostUnsetIssueProperties(self):
2420 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002421 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002422
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002423 def GetRieveldObjForPresubmit(self):
2424 class ThisIsNotRietveldIssue(object):
2425 def __nonzero__(self):
2426 # This is a hack to make presubmit_support think that rietveld is not
2427 # defined, yet still ensure that calls directly result in a decent
2428 # exception message below.
2429 return False
2430
2431 def __getattr__(self, attr):
2432 print(
2433 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2434 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2435 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2436 'or use Rietveld for codereview.\n'
2437 'See also http://crbug.com/579160.' % attr)
2438 raise NotImplementedError()
2439 return ThisIsNotRietveldIssue()
2440
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002441 def GetGerritObjForPresubmit(self):
2442 return presubmit_support.GerritAccessor(self._GetGerritHost())
2443
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002444 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002445 """Apply a rough heuristic to give a simple summary of an issue's review
2446 or CQ status, assuming adherence to a common workflow.
2447
2448 Returns None if no issue for this branch, or one of the following keywords:
2449 * 'error' - error from review tool (including deleted issues)
2450 * 'unsent' - no reviewers added
2451 * 'waiting' - waiting for review
2452 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002453 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002454 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002455 * 'commit' - in the commit queue
2456 * 'closed' - abandoned
2457 """
2458 if not self.GetIssue():
2459 return None
2460
2461 try:
2462 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002463 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002464 return 'error'
2465
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002466 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002467 return 'closed'
2468
2469 cq_label = data['labels'].get('Commit-Queue', {})
2470 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002471 votes = cq_label.get('all', [])
2472 highest_vote = 0
2473 for v in votes:
2474 highest_vote = max(highest_vote, v.get('value', 0))
2475 vote_value = str(highest_vote)
2476 if vote_value != '0':
2477 # Add a '+' if the value is not 0 to match the values in the label.
2478 # The cq_label does not have negatives.
2479 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002480 vote_text = cq_label.get('values', {}).get(vote_value, '')
2481 if vote_text.lower() == 'commit':
2482 return 'commit'
2483
2484 lgtm_label = data['labels'].get('Code-Review', {})
2485 if lgtm_label:
2486 if 'rejected' in lgtm_label:
2487 return 'not lgtm'
2488 if 'approved' in lgtm_label:
2489 return 'lgtm'
2490
2491 if not data.get('reviewers', {}).get('REVIEWER', []):
2492 return 'unsent'
2493
2494 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002495 owner = data['owner'].get('_account_id')
2496 while messages:
2497 last_message_author = messages.pop().get('author', {})
2498 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2499 # Ignore replies from CQ.
2500 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002501 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002502 # Some reply from non-owner.
2503 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002504 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002505
2506 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002507 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002508 return data['revisions'][data['current_revision']]['_number']
2509
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002510 def FetchDescription(self, force=False):
2511 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2512 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002513 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002514 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002515
dsansomee2d6fd92016-09-08 00:10:47 -07002516 def UpdateDescriptionRemote(self, description, force=False):
2517 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2518 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002519 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002520 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002521 'unpublished edit. Either publish the edit in the Gerrit web UI '
2522 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002523
2524 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2525 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002526 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002527 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002528
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002529 def AddComment(self, message):
2530 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2531 msg=message)
2532
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002533 def GetCommentsSummary(self):
2534 # TODO(tandrii): implement in follow up CL (http://crbug.com/698236).
2535 raise NotImplementedError()
2536
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002537 def CloseIssue(self):
2538 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2539
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002540 def GetApprovingReviewers(self):
2541 """Returns a list of reviewers approving the change.
2542
2543 Note: not necessarily committers.
2544 """
2545 raise NotImplementedError()
2546
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002547 def SubmitIssue(self, wait_for_merge=True):
2548 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2549 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002550
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002551 def _GetChangeDetail(self, options=None, issue=None,
2552 no_cache=False):
2553 """Returns details of the issue by querying Gerrit and caching results.
2554
2555 If fresh data is needed, set no_cache=True which will clear cache and
2556 thus new data will be fetched from Gerrit.
2557 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002558 options = options or []
2559 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002560 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002561
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002562 # Optimization to avoid multiple RPCs:
2563 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2564 'CURRENT_COMMIT' not in options):
2565 options.append('CURRENT_COMMIT')
2566
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002567 # Normalize issue and options for consistent keys in cache.
2568 issue = str(issue)
2569 options = [o.upper() for o in options]
2570
2571 # Check in cache first unless no_cache is True.
2572 if no_cache:
2573 self._detail_cache.pop(issue, None)
2574 else:
2575 options_set = frozenset(options)
2576 for cached_options_set, data in self._detail_cache.get(issue, []):
2577 # Assumption: data fetched before with extra options is suitable
2578 # for return for a smaller set of options.
2579 # For example, if we cached data for
2580 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2581 # and request is for options=[CURRENT_REVISION],
2582 # THEN we can return prior cached data.
2583 if options_set.issubset(cached_options_set):
2584 return data
2585
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002586 try:
2587 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2588 options, ignore_404=False)
2589 except gerrit_util.GerritError as e:
2590 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002591 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002592 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002593
2594 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002595 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002596
agable32978d92016-11-01 12:55:02 -07002597 def _GetChangeCommit(self, issue=None):
2598 issue = issue or self.GetIssue()
2599 assert issue, 'issue is required to query Gerrit'
2600 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2601 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002602 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002603 return data
2604
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002605 def CMDLand(self, force, bypass_hooks, verbose):
2606 if git_common.is_dirty_git_tree('land'):
2607 return 1
tandriid60367b2016-06-22 05:25:12 -07002608 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2609 if u'Commit-Queue' in detail.get('labels', {}):
2610 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002611 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2612 'which can test and land changes for you. '
2613 'Are you sure you wish to bypass it?\n',
2614 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002615
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002616 differs = True
tandriic4344b52016-08-29 06:04:54 -07002617 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002618 # Note: git diff outputs nothing if there is no diff.
2619 if not last_upload or RunGit(['diff', last_upload]).strip():
2620 print('WARNING: some changes from local branch haven\'t been uploaded')
2621 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002622 if detail['current_revision'] == last_upload:
2623 differs = False
2624 else:
2625 print('WARNING: local branch contents differ from latest uploaded '
2626 'patchset')
2627 if differs:
2628 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002629 confirm_or_exit(
2630 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2631 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002632 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2633 elif not bypass_hooks:
2634 hook_results = self.RunHook(
2635 committing=True,
2636 may_prompt=not force,
2637 verbose=verbose,
2638 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2639 if not hook_results.should_continue():
2640 return 1
2641
2642 self.SubmitIssue(wait_for_merge=True)
2643 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002644 links = self._GetChangeCommit().get('web_links', [])
2645 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002646 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002647 print('Landed as %s' % link.get('url'))
2648 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002649 return 0
2650
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002651 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2652 directory):
2653 assert not reject
2654 assert not nocommit
2655 assert not directory
2656 assert parsed_issue_arg.valid
2657
2658 self._changelist.issue = parsed_issue_arg.issue
2659
2660 if parsed_issue_arg.hostname:
2661 self._gerrit_host = parsed_issue_arg.hostname
2662 self._gerrit_server = 'https://%s' % self._gerrit_host
2663
tandriic2405f52016-10-10 08:13:15 -07002664 try:
2665 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002666 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002667 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002668
2669 if not parsed_issue_arg.patchset:
2670 # Use current revision by default.
2671 revision_info = detail['revisions'][detail['current_revision']]
2672 patchset = int(revision_info['_number'])
2673 else:
2674 patchset = parsed_issue_arg.patchset
2675 for revision_info in detail['revisions'].itervalues():
2676 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2677 break
2678 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002679 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002680 (parsed_issue_arg.patchset, self.GetIssue()))
2681
2682 fetch_info = revision_info['fetch']['http']
2683 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002684 self.SetIssue(self.GetIssue())
2685 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002686 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002687 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002688 (self.GetIssue(), self.GetPatchset()))
2689 return 0
2690
2691 @staticmethod
2692 def ParseIssueURL(parsed_url):
2693 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2694 return None
2695 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2696 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2697 # Short urls like https://domain/<issue_number> can be used, but don't allow
2698 # specifying the patchset (you'd 404), but we allow that here.
2699 if parsed_url.path == '/':
2700 part = parsed_url.fragment
2701 else:
2702 part = parsed_url.path
2703 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2704 if match:
2705 return _ParsedIssueNumberArgument(
2706 issue=int(match.group(2)),
2707 patchset=int(match.group(4)) if match.group(4) else None,
2708 hostname=parsed_url.netloc)
2709 return None
2710
tandrii16e0b4e2016-06-07 10:34:28 -07002711 def _GerritCommitMsgHookCheck(self, offer_removal):
2712 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2713 if not os.path.exists(hook):
2714 return
2715 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2716 # custom developer made one.
2717 data = gclient_utils.FileRead(hook)
2718 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2719 return
2720 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002721 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002722 'and may interfere with it in subtle ways.\n'
2723 'We recommend you remove the commit-msg hook.')
2724 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002725 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002726 gclient_utils.rm_file_or_tree(hook)
2727 print('Gerrit commit-msg hook removed.')
2728 else:
2729 print('OK, will keep Gerrit commit-msg hook in place.')
2730
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002731 def CMDUploadChange(self, options, args, change):
2732 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002733 if options.squash and options.no_squash:
2734 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002735
2736 if not options.squash and not options.no_squash:
2737 # Load default for user, repo, squash=true, in this order.
2738 options.squash = settings.GetSquashGerritUploads()
2739 elif options.no_squash:
2740 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002741
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002742 # We assume the remote called "origin" is the one we want.
2743 # It is probably not worthwhile to support different workflows.
2744 gerrit_remote = 'origin'
2745
2746 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002747 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002748
Aaron Gableb56ad332017-01-06 15:24:31 -08002749 # This may be None; default fallback value is determined in logic below.
2750 title = options.title
Aaron Gable856585d2017-01-23 15:32:00 -08002751 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002752
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002753 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002754 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002755 if self.GetIssue():
2756 # Try to get the message from a previous upload.
2757 message = self.GetDescription()
2758 if not message:
2759 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002760 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002762 if not title:
2763 default_title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
2764 title = ask_for_data(
2765 'Title for patchset [%s]: ' % default_title) or default_title
Aaron Gable856585d2017-01-23 15:32:00 -08002766 if title == default_title:
2767 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768 change_id = self._GetChangeDetail()['change_id']
2769 while True:
2770 footer_change_ids = git_footers.get_footer_change_id(message)
2771 if footer_change_ids == [change_id]:
2772 break
2773 if not footer_change_ids:
2774 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002775 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776 continue
2777 # There is already a valid footer but with different or several ids.
2778 # Doing this automatically is non-trivial as we don't want to lose
2779 # existing other footers, yet we want to append just 1 desired
2780 # Change-Id. Thus, just create a new footer, but let user verify the
2781 # new description.
2782 message = '%s\n\nChange-Id: %s' % (message, change_id)
2783 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002784 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002785 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002786 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002787 'Please, check the proposed correction to the description, '
2788 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2789 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2790 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002791 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002792 if not options.force:
2793 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002794 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795 message = change_desc.description
2796 if not message:
2797 DieWithError("Description is empty. Aborting...")
2798 # Continue the while loop.
2799 # Sanity check of this code - we should end up with proper message
2800 # footer.
2801 assert [change_id] == git_footers.get_footer_change_id(message)
2802 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002803 else: # if not self.GetIssue()
2804 if options.message:
2805 message = options.message
2806 else:
2807 message = CreateDescriptionFromLog(args)
2808 if options.title:
2809 message = options.title + '\n\n' + message
2810 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002811 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002812 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002813 # On first upload, patchset title is always this string, while
2814 # --title flag gets converted to first line of message.
2815 title = 'Initial upload'
Aaron Gable856585d2017-01-23 15:32:00 -08002816 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817 if not change_desc.description:
2818 DieWithError("Description is empty. Aborting...")
2819 message = change_desc.description
2820 change_ids = git_footers.get_footer_change_id(message)
2821 if len(change_ids) > 1:
2822 DieWithError('too many Change-Id footers, at most 1 allowed.')
2823 if not change_ids:
2824 # Generate the Change-Id automatically.
2825 message = git_footers.add_footer_change_id(
2826 message, GenerateGerritChangeId(message))
2827 change_desc.set_description(message)
2828 change_ids = git_footers.get_footer_change_id(message)
2829 assert len(change_ids) == 1
2830 change_id = change_ids[0]
2831
2832 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2833 if remote is '.':
2834 # If our upstream branch is local, we base our squashed commit on its
2835 # squashed version.
2836 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2837 # Check the squashed hash of the parent.
2838 parent = RunGit(['config',
2839 'branch.%s.gerritsquashhash' % upstream_branch_name],
2840 error_ok=True).strip()
2841 # Verify that the upstream branch has been uploaded too, otherwise
2842 # Gerrit will create additional CLs when uploading.
2843 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2844 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002845 DieWithError(
Aaron Gable48746652017-01-06 11:49:21 -08002846 '\nUpload upstream branch %s first.\n'
2847 'It is likely that this branch has been rebased since its last '
2848 'upload, so you just need to upload it again.\n'
2849 '(If you uploaded it with --no-squash, then branch dependencies '
2850 'are not supported, and you should reupload with --squash.)'
Christopher Lamf732cd52017-01-24 12:40:11 +11002851 % upstream_branch_name, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002852 else:
2853 parent = self.GetCommonAncestorWithUpstream()
2854
2855 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2856 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2857 '-m', message]).strip()
2858 else:
2859 change_desc = ChangeDescription(
2860 options.message or CreateDescriptionFromLog(args))
2861 if not change_desc.description:
2862 DieWithError("Description is empty. Aborting...")
2863
2864 if not git_footers.get_footer_change_id(change_desc.description):
2865 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002866 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2867 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002868 ref_to_push = 'HEAD'
2869 parent = '%s/%s' % (gerrit_remote, branch)
2870 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2871
2872 assert change_desc
2873 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2874 ref_to_push)]).splitlines()
2875 if len(commits) > 1:
2876 print('WARNING: This will upload %d commits. Run the following command '
2877 'to see which commits will be uploaded: ' % len(commits))
2878 print('git log %s..%s' % (parent, ref_to_push))
2879 print('You can also use `git squash-branch` to squash these into a '
2880 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002881 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002882
2883 if options.reviewers or options.tbr_owners:
2884 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2885 change)
2886
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002887 # Extra options that can be specified at push time. Doc:
2888 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2889 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002890 if change_desc.get_reviewers(tbr_only=True):
2891 print('Adding self-LGTM (Code-Review +1) because of TBRs')
2892 refspec_opts.append('l=Code-Review+1')
2893
Aaron Gable9b713dd2016-12-14 16:04:21 -08002894 if title:
2895 if not re.match(r'^[\w ]+$', title):
2896 title = re.sub(r'[^\w ]', '', title)
Aaron Gable856585d2017-01-23 15:32:00 -08002897 if not automatic_title:
2898 print('WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08002899 'and spaces. You can edit it in the UI. '
2900 'See https://crbug.com/663787.\n'
2901 'Cleaned up title: %s' % title)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002902 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2903 # reverse on its side.
Aaron Gable9b713dd2016-12-14 16:04:21 -08002904 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002905
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002906 if options.send_mail:
2907 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002908 DieWithError('Must specify reviewers to send email.', change_desc)
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002909 refspec_opts.append('notify=ALL')
2910 else:
2911 refspec_opts.append('notify=NONE')
2912
tandrii99a72f22016-08-17 14:33:24 -07002913 reviewers = change_desc.get_reviewers()
2914 if reviewers:
Andrii Shyshkalovaf3a9992017-02-09 14:18:01 +01002915 # TODO(tandrii): remove this horrible hack once (Poly)Gerrit fixes their
2916 # side for real (b/34702620).
2917 def clean_invisible_chars(email):
2918 return email.decode('unicode_escape').encode('ascii', 'ignore')
2919 refspec_opts.extend('r=' + clean_invisible_chars(email).strip()
2920 for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002921
agablec6787972016-09-09 16:13:34 -07002922 if options.private:
2923 refspec_opts.append('draft')
2924
rmistry9eadede2016-09-19 11:22:43 -07002925 if options.topic:
2926 # Documentation on Gerrit topics is here:
2927 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
2928 refspec_opts.append('topic=%s' % options.topic)
2929
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002930 refspec_suffix = ''
2931 if refspec_opts:
2932 refspec_suffix = '%' + ','.join(refspec_opts)
2933 assert ' ' not in refspec_suffix, (
2934 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002935 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002936
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002937 try:
2938 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01002939 ['git', 'push', self.GetRemoteUrl(), refspec],
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002940 print_stdout=True,
2941 # Flush after every line: useful for seeing progress when running as
2942 # recipe.
2943 filter_fn=lambda _: sys.stdout.flush())
2944 except subprocess2.CalledProcessError:
2945 DieWithError('Failed to create a change. Please examine output above '
Christopher Lamf732cd52017-01-24 12:40:11 +11002946 'for the reason of the failure. ', change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002947
2948 if options.squash:
2949 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2950 change_numbers = [m.group(1)
2951 for m in map(regex.match, push_stdout.splitlines())
2952 if m]
2953 if len(change_numbers) != 1:
2954 DieWithError(
2955 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002956 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002957 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002958 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002959
2960 # Add cc's from the CC_LIST and --cc flag (if any).
2961 cc = self.GetCCList().split(',')
2962 if options.cc:
2963 cc.extend(options.cc)
2964 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07002965 if change_desc.get_cced():
2966 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07002967 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08002968 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08002969 self._GetGerritHost(), self.GetIssue(), cc,
2970 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002971 return 0
2972
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002973 def _AddChangeIdToCommitMessage(self, options, args):
2974 """Re-commits using the current message, assumes the commit hook is in
2975 place.
2976 """
2977 log_desc = options.message or CreateDescriptionFromLog(args)
2978 git_command = ['commit', '--amend', '-m', log_desc]
2979 RunGit(git_command)
2980 new_log_desc = CreateDescriptionFromLog(args)
2981 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002982 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002983 return new_log_desc
2984 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002985 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002986
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002987 def SetCQState(self, new_state):
2988 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002989 vote_map = {
2990 _CQState.NONE: 0,
2991 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002992 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002993 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002994 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
2995 if new_state == _CQState.DRY_RUN:
2996 # Don't spam everybody reviewer/owner.
2997 kwargs['notify'] = 'NONE'
2998 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002999
tandriie113dfd2016-10-11 10:20:12 -07003000 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003001 try:
3002 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003003 except GerritChangeNotExists:
3004 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003005
3006 if data['status'] in ('ABANDONED', 'MERGED'):
3007 return 'CL %s is closed' % self.GetIssue()
3008
3009 def GetTryjobProperties(self, patchset=None):
3010 """Returns dictionary of properties to launch tryjob."""
3011 data = self._GetChangeDetail(['ALL_REVISIONS'])
3012 patchset = int(patchset or self.GetPatchset())
3013 assert patchset
3014 revision_data = None # Pylint wants it to be defined.
3015 for revision_data in data['revisions'].itervalues():
3016 if int(revision_data['_number']) == patchset:
3017 break
3018 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003019 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003020 (patchset, self.GetIssue()))
3021 return {
3022 'patch_issue': self.GetIssue(),
3023 'patch_set': patchset or self.GetPatchset(),
3024 'patch_project': data['project'],
3025 'patch_storage': 'gerrit',
3026 'patch_ref': revision_data['fetch']['http']['ref'],
3027 'patch_repository_url': revision_data['fetch']['http']['url'],
3028 'patch_gerrit_url': self.GetCodereviewServer(),
3029 }
tandriie113dfd2016-10-11 10:20:12 -07003030
tandriide281ae2016-10-12 06:02:30 -07003031 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003032 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003033
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003034
3035_CODEREVIEW_IMPLEMENTATIONS = {
3036 'rietveld': _RietveldChangelistImpl,
3037 'gerrit': _GerritChangelistImpl,
3038}
3039
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003040
iannuccie53c9352016-08-17 14:40:40 -07003041def _add_codereview_issue_select_options(parser, extra=""):
3042 _add_codereview_select_options(parser)
3043
3044 text = ('Operate on this issue number instead of the current branch\'s '
3045 'implicit issue.')
3046 if extra:
3047 text += ' '+extra
3048 parser.add_option('-i', '--issue', type=int, help=text)
3049
3050
3051def _process_codereview_issue_select_options(parser, options):
3052 _process_codereview_select_options(parser, options)
3053 if options.issue is not None and not options.forced_codereview:
3054 parser.error('--issue must be specified with either --rietveld or --gerrit')
3055
3056
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003057def _add_codereview_select_options(parser):
3058 """Appends --gerrit and --rietveld options to force specific codereview."""
3059 parser.codereview_group = optparse.OptionGroup(
3060 parser, 'EXPERIMENTAL! Codereview override options')
3061 parser.add_option_group(parser.codereview_group)
3062 parser.codereview_group.add_option(
3063 '--gerrit', action='store_true',
3064 help='Force the use of Gerrit for codereview')
3065 parser.codereview_group.add_option(
3066 '--rietveld', action='store_true',
3067 help='Force the use of Rietveld for codereview')
3068
3069
3070def _process_codereview_select_options(parser, options):
3071 if options.gerrit and options.rietveld:
3072 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3073 options.forced_codereview = None
3074 if options.gerrit:
3075 options.forced_codereview = 'gerrit'
3076 elif options.rietveld:
3077 options.forced_codereview = 'rietveld'
3078
3079
tandriif9aefb72016-07-01 09:06:51 -07003080def _get_bug_line_values(default_project, bugs):
3081 """Given default_project and comma separated list of bugs, yields bug line
3082 values.
3083
3084 Each bug can be either:
3085 * a number, which is combined with default_project
3086 * string, which is left as is.
3087
3088 This function may produce more than one line, because bugdroid expects one
3089 project per line.
3090
3091 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3092 ['v8:123', 'chromium:789']
3093 """
3094 default_bugs = []
3095 others = []
3096 for bug in bugs.split(','):
3097 bug = bug.strip()
3098 if bug:
3099 try:
3100 default_bugs.append(int(bug))
3101 except ValueError:
3102 others.append(bug)
3103
3104 if default_bugs:
3105 default_bugs = ','.join(map(str, default_bugs))
3106 if default_project:
3107 yield '%s:%s' % (default_project, default_bugs)
3108 else:
3109 yield default_bugs
3110 for other in sorted(others):
3111 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3112 yield other
3113
3114
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003115class ChangeDescription(object):
3116 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003117 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003118 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Mark Mentovai600d3092017-03-08 12:58:18 -05003119 BUG_LINE = r'^[ \t]*(BUGS?|Bugs?)[ \t]*[:=][ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003120 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003121
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003122 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003123 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003124
agable@chromium.org42c20792013-09-12 17:34:49 +00003125 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003126 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003127 return '\n'.join(self._description_lines)
3128
3129 def set_description(self, desc):
3130 if isinstance(desc, basestring):
3131 lines = desc.splitlines()
3132 else:
3133 lines = [line.rstrip() for line in desc]
3134 while lines and not lines[0]:
3135 lines.pop(0)
3136 while lines and not lines[-1]:
3137 lines.pop(-1)
3138 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003139
piman@chromium.org336f9122014-09-04 02:16:55 +00003140 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003141 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003142 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003143 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003144 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003145 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003146
agable@chromium.org42c20792013-09-12 17:34:49 +00003147 # Get the set of R= and TBR= lines and remove them from the desciption.
3148 regexp = re.compile(self.R_LINE)
3149 matches = [regexp.match(line) for line in self._description_lines]
3150 new_desc = [l for i, l in enumerate(self._description_lines)
3151 if not matches[i]]
3152 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003153
agable@chromium.org42c20792013-09-12 17:34:49 +00003154 # Construct new unified R= and TBR= lines.
3155 r_names = []
3156 tbr_names = []
3157 for match in matches:
3158 if not match:
3159 continue
3160 people = cleanup_list([match.group(2).strip()])
3161 if match.group(1) == 'TBR':
3162 tbr_names.extend(people)
3163 else:
3164 r_names.extend(people)
3165 for name in r_names:
3166 if name not in reviewers:
3167 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003168 if add_owners_tbr:
3169 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07003170 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003171 all_reviewers = set(tbr_names + reviewers)
3172 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3173 all_reviewers)
3174 tbr_names.extend(owners_db.reviewers_for(missing_files,
3175 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003176 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3177 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3178
3179 # Put the new lines in the description where the old first R= line was.
3180 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3181 if 0 <= line_loc < len(self._description_lines):
3182 if new_tbr_line:
3183 self._description_lines.insert(line_loc, new_tbr_line)
3184 if new_r_line:
3185 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003186 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003187 if new_r_line:
3188 self.append_footer(new_r_line)
3189 if new_tbr_line:
3190 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003191
tandriif9aefb72016-07-01 09:06:51 -07003192 def prompt(self, bug=None):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003193 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003194 self.set_description([
3195 '# Enter a description of the change.',
3196 '# This will be displayed on the codereview site.',
3197 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003198 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003199 '--------------------',
3200 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003201
agable@chromium.org42c20792013-09-12 17:34:49 +00003202 regexp = re.compile(self.BUG_LINE)
3203 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003204 prefix = settings.GetBugPrefix()
3205 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Mark Mentovai57c47212017-03-09 11:14:09 -05003206 bug_line_format = settings.GetBugLineFormat()
tandriif9aefb72016-07-01 09:06:51 -07003207 for value in values:
Mark Mentovai57c47212017-03-09 11:14:09 -05003208 self.append_footer(bug_line_format % value)
tandriif9aefb72016-07-01 09:06:51 -07003209
agable@chromium.org42c20792013-09-12 17:34:49 +00003210 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003211 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003212 if not content:
3213 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003214 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215
3216 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003217 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3218 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003219 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003220 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003221
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003222 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003223 """Adds a footer line to the description.
3224
3225 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3226 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3227 that Gerrit footers are always at the end.
3228 """
3229 parsed_footer_line = git_footers.parse_footer(line)
3230 if parsed_footer_line:
3231 # Line is a gerrit footer in the form: Footer-Key: any value.
3232 # Thus, must be appended observing Gerrit footer rules.
3233 self.set_description(
3234 git_footers.add_footer(self.description,
3235 key=parsed_footer_line[0],
3236 value=parsed_footer_line[1]))
3237 return
3238
3239 if not self._description_lines:
3240 self._description_lines.append(line)
3241 return
3242
3243 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3244 if gerrit_footers:
3245 # git_footers.split_footers ensures that there is an empty line before
3246 # actual (gerrit) footers, if any. We have to keep it that way.
3247 assert top_lines and top_lines[-1] == ''
3248 top_lines, separator = top_lines[:-1], top_lines[-1:]
3249 else:
3250 separator = [] # No need for separator if there are no gerrit_footers.
3251
3252 prev_line = top_lines[-1] if top_lines else ''
3253 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3254 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3255 top_lines.append('')
3256 top_lines.append(line)
3257 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003258
tandrii99a72f22016-08-17 14:33:24 -07003259 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003260 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003261 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003262 reviewers = [match.group(2).strip()
3263 for match in matches
3264 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003265 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003266
bradnelsond975b302016-10-23 12:20:23 -07003267 def get_cced(self):
3268 """Retrieves the list of reviewers."""
3269 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3270 cced = [match.group(2).strip() for match in matches if match]
3271 return cleanup_list(cced)
3272
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003273 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3274 """Updates this commit description given the parent.
3275
3276 This is essentially what Gnumbd used to do.
3277 Consult https://goo.gl/WMmpDe for more details.
3278 """
3279 assert parent_msg # No, orphan branch creation isn't supported.
3280 assert parent_hash
3281 assert dest_ref
3282 parent_footer_map = git_footers.parse_footers(parent_msg)
3283 # This will also happily parse svn-position, which GnumbD is no longer
3284 # supporting. While we'd generate correct footers, the verifier plugin
3285 # installed in Gerrit will block such commit (ie git push below will fail).
3286 parent_position = git_footers.get_position(parent_footer_map)
3287
3288 # Cherry-picks may have last line obscuring their prior footers,
3289 # from git_footers perspective. This is also what Gnumbd did.
3290 cp_line = None
3291 if (self._description_lines and
3292 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3293 cp_line = self._description_lines.pop()
3294
3295 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3296
3297 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3298 # user interference with actual footers we'd insert below.
3299 for i, (k, v) in enumerate(parsed_footers):
3300 if k.startswith('Cr-'):
3301 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3302
3303 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003304 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003305 if parent_position[0] == dest_ref:
3306 # Same branch as parent.
3307 number = int(parent_position[1]) + 1
3308 else:
3309 number = 1 # New branch, and extra lineage.
3310 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3311 int(parent_position[1])))
3312
3313 parsed_footers.append(('Cr-Commit-Position',
3314 '%s@{#%d}' % (dest_ref, number)))
3315 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3316
3317 self._description_lines = top_lines
3318 if cp_line:
3319 self._description_lines.append(cp_line)
3320 if self._description_lines[-1] != '':
3321 self._description_lines.append('') # Ensure footer separator.
3322 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3323
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003324
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003325def get_approving_reviewers(props):
3326 """Retrieves the reviewers that approved a CL from the issue properties with
3327 messages.
3328
3329 Note that the list may contain reviewers that are not committer, thus are not
3330 considered by the CQ.
3331 """
3332 return sorted(
3333 set(
3334 message['sender']
3335 for message in props['messages']
3336 if message['approval'] and message['sender'] in props['reviewers']
3337 )
3338 )
3339
3340
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003341def FindCodereviewSettingsFile(filename='codereview.settings'):
3342 """Finds the given file starting in the cwd and going up.
3343
3344 Only looks up to the top of the repository unless an
3345 'inherit-review-settings-ok' file exists in the root of the repository.
3346 """
3347 inherit_ok_file = 'inherit-review-settings-ok'
3348 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003349 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003350 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3351 root = '/'
3352 while True:
3353 if filename in os.listdir(cwd):
3354 if os.path.isfile(os.path.join(cwd, filename)):
3355 return open(os.path.join(cwd, filename))
3356 if cwd == root:
3357 break
3358 cwd = os.path.dirname(cwd)
3359
3360
3361def LoadCodereviewSettingsFromFile(fileobj):
3362 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003363 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003364
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003365 def SetProperty(name, setting, unset_error_ok=False):
3366 fullname = 'rietveld.' + name
3367 if setting in keyvals:
3368 RunGit(['config', fullname, keyvals[setting]])
3369 else:
3370 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3371
tandrii48df5812016-10-17 03:55:37 -07003372 if not keyvals.get('GERRIT_HOST', False):
3373 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003374 # Only server setting is required. Other settings can be absent.
3375 # In that case, we ignore errors raised during option deletion attempt.
3376 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003377 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003378 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3379 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
Mark Mentovai57c47212017-03-09 11:14:09 -05003380 SetProperty('bug-line-format', 'BUG_LINE_FORMAT', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003381 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003382 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3383 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003384 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003385 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3386 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003387
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003388 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003389 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003390
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003391 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003392 RunGit(['config', 'gerrit.squash-uploads',
3393 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003394
tandrii@chromium.org28253532016-04-14 13:46:56 +00003395 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003396 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003397 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3398
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003399 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003400 # should be of the form
3401 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3402 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3404 keyvals['ORIGIN_URL_CONFIG']])
3405
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003407def urlretrieve(source, destination):
3408 """urllib is broken for SSL connections via a proxy therefore we
3409 can't use urllib.urlretrieve()."""
3410 with open(destination, 'w') as f:
3411 f.write(urllib2.urlopen(source).read())
3412
3413
ukai@chromium.org712d6102013-11-27 00:52:58 +00003414def hasSheBang(fname):
3415 """Checks fname is a #! script."""
3416 with open(fname) as f:
3417 return f.read(2).startswith('#!')
3418
3419
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003420# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3421def DownloadHooks(*args, **kwargs):
3422 pass
3423
3424
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003425def DownloadGerritHook(force):
3426 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003427
3428 Args:
3429 force: True to update hooks. False to install hooks if not present.
3430 """
3431 if not settings.GetIsGerrit():
3432 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003433 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003434 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3435 if not os.access(dst, os.X_OK):
3436 if os.path.exists(dst):
3437 if not force:
3438 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003439 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003440 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003441 if not hasSheBang(dst):
3442 DieWithError('Not a script: %s\n'
3443 'You need to download from\n%s\n'
3444 'into .git/hooks/commit-msg and '
3445 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003446 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3447 except Exception:
3448 if os.path.exists(dst):
3449 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003450 DieWithError('\nFailed to download hooks.\n'
3451 'You need to download from\n%s\n'
3452 'into .git/hooks/commit-msg and '
3453 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003454
3455
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003456def GetRietveldCodereviewSettingsInteractively():
3457 """Prompt the user for settings."""
3458 server = settings.GetDefaultServerUrl(error_ok=True)
3459 prompt = 'Rietveld server (host[:port])'
3460 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3461 newserver = ask_for_data(prompt + ':')
3462 if not server and not newserver:
3463 newserver = DEFAULT_SERVER
3464 if newserver:
3465 newserver = gclient_utils.UpgradeToHttps(newserver)
3466 if newserver != server:
3467 RunGit(['config', 'rietveld.server', newserver])
3468
3469 def SetProperty(initial, caption, name, is_url):
3470 prompt = caption
3471 if initial:
3472 prompt += ' ("x" to clear) [%s]' % initial
3473 new_val = ask_for_data(prompt + ':')
3474 if new_val == 'x':
3475 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3476 elif new_val:
3477 if is_url:
3478 new_val = gclient_utils.UpgradeToHttps(new_val)
3479 if new_val != initial:
3480 RunGit(['config', 'rietveld.' + name, new_val])
3481
3482 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3483 SetProperty(settings.GetDefaultPrivateFlag(),
3484 'Private flag (rietveld only)', 'private', False)
3485 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3486 'tree-status-url', False)
3487 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3488 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3489 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3490 'run-post-upload-hook', False)
3491
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003492
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003493class _GitCookiesChecker(object):
3494 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003495
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003496 _GOOGLESOURCE = 'googlesource.com'
3497
3498 def __init__(self):
3499 # Cached list of [host, identity, source], where source is either
3500 # .gitcookies or .netrc.
3501 self._all_hosts = None
3502
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503 def ensure_configured_gitcookies(self):
3504 """Runs checks and suggests fixes to make git use .gitcookies from default
3505 path."""
3506 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3507 configured_path = RunGitSilent(
3508 ['config', '--global', 'http.cookiefile']).strip()
3509 if configured_path:
3510 self._ensure_default_gitcookies_path(configured_path, default)
3511 else:
3512 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003513
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003514 @staticmethod
3515 def _ensure_default_gitcookies_path(configured_path, default_path):
3516 assert configured_path
3517 if configured_path == default_path:
3518 print('git is already configured to use your .gitcookies from %s' %
3519 configured_path)
3520 return
3521
3522 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3523 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3524 (configured_path, default_path))
3525
3526 if not os.path.exists(configured_path):
3527 print('However, your configured .gitcookies file is missing.')
3528 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3529 action='reconfigure')
3530 RunGit(['config', '--global', 'http.cookiefile', default_path])
3531 return
3532
3533 if os.path.exists(default_path):
3534 print('WARNING: default .gitcookies file already exists %s' %
3535 default_path)
3536 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3537 default_path)
3538
3539 confirm_or_exit('Move existing .gitcookies to default location?',
3540 action='move')
3541 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003542 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003543 print('Moved and reconfigured git to use .gitcookies from %s' %
3544 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003545
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003546 @staticmethod
3547 def _configure_gitcookies_path(default_path):
3548 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3549 if os.path.exists(netrc_path):
3550 print('You seem to be using outdated .netrc for git credentials: %s' %
3551 netrc_path)
3552 print('This tool will guide you through setting up recommended '
3553 '.gitcookies store for git credentials.\n'
3554 '\n'
3555 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3556 ' git config --global --unset http.cookiefile\n'
3557 ' mv %s %s.backup\n\n' % (default_path, default_path))
3558 confirm_or_exit(action='setup .gitcookies')
3559 RunGit(['config', '--global', 'http.cookiefile', default_path])
3560 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003561
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003562 def get_hosts_with_creds(self, include_netrc=False):
3563 if self._all_hosts is None:
3564 a = gerrit_util.CookiesAuthenticator()
3565 self._all_hosts = [
3566 (h, u, s)
3567 for h, u, s in itertools.chain(
3568 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3569 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3570 )
3571 if h.endswith(self._GOOGLESOURCE)
3572 ]
3573
3574 if include_netrc:
3575 return self._all_hosts
3576 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3577
3578 def print_current_creds(self, include_netrc=False):
3579 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3580 if not hosts:
3581 print('No Git/Gerrit credentials found')
3582 return
3583 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3584 header = [('Host', 'User', 'Which file'),
3585 ['=' * l for l in lengths]]
3586 for row in (header + hosts):
3587 print('\t'.join((('%%+%ds' % l) % s)
3588 for l, s in zip(lengths, row)))
3589
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003590 @staticmethod
3591 def _parse_identity(identity):
3592 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3593 username, domain = identity.split('.', 1)
3594 if username.startswith('git-'):
3595 username = username[len('git-'):]
3596 return username, domain
3597
3598 def _get_usernames_of_domain(self, domain):
3599 """Returns list of usernames referenced by .gitcookies in a given domain."""
3600 identities_by_domain = {}
3601 for _, identity, _ in self.get_hosts_with_creds():
3602 username, domain = self._parse_identity(identity)
3603 identities_by_domain.setdefault(domain, []).append(username)
3604 return identities_by_domain.get(domain)
3605
3606 def _canonical_git_googlesource_host(self, host):
3607 """Normalizes Gerrit hosts (with '-review') to Git host."""
3608 assert host.endswith(self._GOOGLESOURCE)
3609 # Prefix doesn't include '.' at the end.
3610 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3611 if prefix.endswith('-review'):
3612 prefix = prefix[:-len('-review')]
3613 return prefix + '.' + self._GOOGLESOURCE
3614
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003615 def _canonical_gerrit_googlesource_host(self, host):
3616 git_host = self._canonical_git_googlesource_host(host)
3617 prefix = git_host.split('.', 1)[0]
3618 return prefix + '-review.' + self._GOOGLESOURCE
3619
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003620 def has_generic_host(self):
3621 """Returns whether generic .googlesource.com has been configured.
3622
3623 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3624 """
3625 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3626 if host == '.' + self._GOOGLESOURCE:
3627 return True
3628 return False
3629
3630 def _get_git_gerrit_identity_pairs(self):
3631 """Returns map from canonic host to pair of identities (Git, Gerrit).
3632
3633 One of identities might be None, meaning not configured.
3634 """
3635 host_to_identity_pairs = {}
3636 for host, identity, _ in self.get_hosts_with_creds():
3637 canonical = self._canonical_git_googlesource_host(host)
3638 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3639 idx = 0 if canonical == host else 1
3640 pair[idx] = identity
3641 return host_to_identity_pairs
3642
3643 def get_partially_configured_hosts(self):
3644 return set(
3645 host for host, identities_pair in
3646 self._get_git_gerrit_identity_pairs().iteritems()
3647 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3648
3649 def get_conflicting_hosts(self):
3650 return set(
3651 host for host, (i1, i2) in
3652 self._get_git_gerrit_identity_pairs().iteritems()
3653 if None not in (i1, i2) and i1 != i2)
3654
3655 def get_duplicated_hosts(self):
3656 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3657 return set(host for host, count in counters.iteritems() if count > 1)
3658
3659 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3660 'chromium.googlesource.com': 'chromium.org',
3661 'chrome-internal.googlesource.com': 'google.com',
3662 }
3663
3664 def get_hosts_with_wrong_identities(self):
3665 """Finds hosts which **likely** reference wrong identities.
3666
3667 Note: skips hosts which have conflicting identities for Git and Gerrit.
3668 """
3669 hosts = set()
3670 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3671 pair = self._get_git_gerrit_identity_pairs().get(host)
3672 if pair and pair[0] == pair[1]:
3673 _, domain = self._parse_identity(pair[0])
3674 if domain != expected:
3675 hosts.add(host)
3676 return hosts
3677
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003678 @staticmethod
3679 def print_hosts(hosts, extra_column_func=None):
3680 hosts = sorted(hosts)
3681 assert hosts
3682 if extra_column_func is None:
3683 extras = [''] * len(hosts)
3684 else:
3685 extras = [extra_column_func(host) for host in hosts]
3686 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3687 for he in zip(hosts, extras):
3688 print(tmpl % he)
3689 print()
3690
3691 def find_and_report_problems(self):
3692 """Returns True if there was at least one problem, else False."""
3693 problems = [False]
3694 def add_problem():
3695 if not problems[0]:
3696 print('.gitcookies problem report:\n')
3697 problems[0] = True
3698
3699 if self.has_generic_host():
3700 add_problem()
3701 print(' .googlesource.com record detected\n'
3702 ' Chrome Infrastructure team recommends to list full host names '
3703 'explicitly.\n')
3704
3705 dups = self.get_duplicated_hosts()
3706 if dups:
3707 add_problem()
3708 print(' The following hosts were defined twice:\n')
3709 self.print_hosts(dups)
3710
3711 partial = self.get_partially_configured_hosts()
3712 if partial:
3713 add_problem()
3714 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3715 'These hosts are missing:')
3716 self.print_hosts(partial)
3717
3718 conflicting = self.get_conflicting_hosts()
3719 if conflicting:
3720 add_problem()
3721 print(' The following Git hosts have differing credentials from their '
3722 'Gerrit counterparts:\n')
3723 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3724 tuple(self._get_git_gerrit_identity_pairs()[host]))
3725
3726 wrong = self.get_hosts_with_wrong_identities()
3727 if wrong:
3728 add_problem()
3729 print(' These hosts likely use wrong identity:\n')
3730 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3731 (self._get_git_gerrit_identity_pairs()[host][0],
3732 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3733 return problems[0]
3734
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003735
3736def CMDcreds_check(parser, args):
3737 """Checks credentials and suggests changes."""
3738 _, _ = parser.parse_args(args)
3739
3740 if gerrit_util.GceAuthenticator.is_gce():
3741 DieWithError('this command is not designed for GCE, are you on a bot?')
3742
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003743 checker = _GitCookiesChecker()
3744 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003745
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003746 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003747 checker.print_current_creds(include_netrc=True)
3748
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003749 if not checker.find_and_report_problems():
3750 print('\nNo problems detected in your .gitcookies')
3751 return 0
3752 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003753
3754
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003755@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003756def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003757 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003758
tandrii5d0a0422016-09-14 06:24:35 -07003759 print('WARNING: git cl config works for Rietveld only')
3760 # TODO(tandrii): remove this once we switch to Gerrit.
3761 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003762 parser.add_option('--activate-update', action='store_true',
3763 help='activate auto-updating [rietveld] section in '
3764 '.git/config')
3765 parser.add_option('--deactivate-update', action='store_true',
3766 help='deactivate auto-updating [rietveld] section in '
3767 '.git/config')
3768 options, args = parser.parse_args(args)
3769
3770 if options.deactivate_update:
3771 RunGit(['config', 'rietveld.autoupdate', 'false'])
3772 return
3773
3774 if options.activate_update:
3775 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3776 return
3777
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003778 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003779 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003780 return 0
3781
3782 url = args[0]
3783 if not url.endswith('codereview.settings'):
3784 url = os.path.join(url, 'codereview.settings')
3785
3786 # Load code review settings and download hooks (if available).
3787 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3788 return 0
3789
3790
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003791def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003792 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003793 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3794 branch = ShortBranchName(branchref)
3795 _, args = parser.parse_args(args)
3796 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003797 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003798 return RunGit(['config', 'branch.%s.base-url' % branch],
3799 error_ok=False).strip()
3800 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003801 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003802 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3803 error_ok=False).strip()
3804
3805
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003806def color_for_status(status):
3807 """Maps a Changelist status to color, for CMDstatus and other tools."""
3808 return {
3809 'unsent': Fore.RED,
3810 'waiting': Fore.BLUE,
3811 'reply': Fore.YELLOW,
3812 'lgtm': Fore.GREEN,
3813 'commit': Fore.MAGENTA,
3814 'closed': Fore.CYAN,
3815 'error': Fore.WHITE,
3816 }.get(status, Fore.WHITE)
3817
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003818
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003819def get_cl_statuses(changes, fine_grained, max_processes=None):
3820 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003821
3822 If fine_grained is true, this will fetch CL statuses from the server.
3823 Otherwise, simply indicate if there's a matching url for the given branches.
3824
3825 If max_processes is specified, it is used as the maximum number of processes
3826 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3827 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003828
3829 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003830 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003831 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003832 upload.verbosity = 0
3833
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003834 if not changes:
3835 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003836
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003837 if not fine_grained:
3838 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003839 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003840 for cl in changes:
3841 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003842 return
3843
3844 # First, sort out authentication issues.
3845 logging.debug('ensuring credentials exist')
3846 for cl in changes:
3847 cl.EnsureAuthenticated(force=False, refresh=True)
3848
3849 def fetch(cl):
3850 try:
3851 return (cl, cl.GetStatus())
3852 except:
3853 # See http://crbug.com/629863.
3854 logging.exception('failed to fetch status for %s:', cl)
3855 raise
3856
3857 threads_count = len(changes)
3858 if max_processes:
3859 threads_count = max(1, min(threads_count, max_processes))
3860 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3861
3862 pool = ThreadPool(threads_count)
3863 fetched_cls = set()
3864 try:
3865 it = pool.imap_unordered(fetch, changes).__iter__()
3866 while True:
3867 try:
3868 cl, status = it.next(timeout=5)
3869 except multiprocessing.TimeoutError:
3870 break
3871 fetched_cls.add(cl)
3872 yield cl, status
3873 finally:
3874 pool.close()
3875
3876 # Add any branches that failed to fetch.
3877 for cl in set(changes) - fetched_cls:
3878 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003879
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880
3881def upload_branch_deps(cl, args):
3882 """Uploads CLs of local branches that are dependents of the current branch.
3883
3884 If the local branch dependency tree looks like:
3885 test1 -> test2.1 -> test3.1
3886 -> test3.2
3887 -> test2.2 -> test3.3
3888
3889 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3890 run on the dependent branches in this order:
3891 test2.1, test3.1, test3.2, test2.2, test3.3
3892
3893 Note: This function does not rebase your local dependent branches. Use it when
3894 you make a change to the parent branch that will not conflict with its
3895 dependent branches, and you would like their dependencies updated in
3896 Rietveld.
3897 """
3898 if git_common.is_dirty_git_tree('upload-branch-deps'):
3899 return 1
3900
3901 root_branch = cl.GetBranch()
3902 if root_branch is None:
3903 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3904 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01003905 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003906 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3907 'patchset dependencies without an uploaded CL.')
3908
3909 branches = RunGit(['for-each-ref',
3910 '--format=%(refname:short) %(upstream:short)',
3911 'refs/heads'])
3912 if not branches:
3913 print('No local branches found.')
3914 return 0
3915
3916 # Create a dictionary of all local branches to the branches that are dependent
3917 # on it.
3918 tracked_to_dependents = collections.defaultdict(list)
3919 for b in branches.splitlines():
3920 tokens = b.split()
3921 if len(tokens) == 2:
3922 branch_name, tracked = tokens
3923 tracked_to_dependents[tracked].append(branch_name)
3924
vapiera7fbd5a2016-06-16 09:17:49 -07003925 print()
3926 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003927 dependents = []
3928 def traverse_dependents_preorder(branch, padding=''):
3929 dependents_to_process = tracked_to_dependents.get(branch, [])
3930 padding += ' '
3931 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003932 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003933 dependents.append(dependent)
3934 traverse_dependents_preorder(dependent, padding)
3935 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003936 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003937
3938 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003939 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003940 return 0
3941
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003942 confirm_or_exit('This command will checkout all dependent branches and run '
3943 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003944
andybons@chromium.org962f9462016-02-03 20:00:42 +00003945 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003946 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003947 args.extend(['-t', 'Updated patchset dependency'])
3948
rmistry@google.com2dd99862015-06-22 12:22:18 +00003949 # Record all dependents that failed to upload.
3950 failures = {}
3951 # Go through all dependents, checkout the branch and upload.
3952 try:
3953 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003954 print()
3955 print('--------------------------------------')
3956 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003957 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003958 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003959 try:
3960 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003961 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003962 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003963 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003964 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003965 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003966 finally:
3967 # Swap back to the original root branch.
3968 RunGit(['checkout', '-q', root_branch])
3969
vapiera7fbd5a2016-06-16 09:17:49 -07003970 print()
3971 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003972 for dependent_branch in dependents:
3973 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003974 print(' %s : %s' % (dependent_branch, upload_status))
3975 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003976
3977 return 0
3978
3979
kmarshall3bff56b2016-06-06 18:31:47 -07003980def CMDarchive(parser, args):
3981 """Archives and deletes branches associated with closed changelists."""
3982 parser.add_option(
3983 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003984 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003985 parser.add_option(
3986 '-f', '--force', action='store_true',
3987 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003988 parser.add_option(
3989 '-d', '--dry-run', action='store_true',
3990 help='Skip the branch tagging and removal steps.')
3991 parser.add_option(
3992 '-t', '--notags', action='store_true',
3993 help='Do not tag archived branches. '
3994 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003995
3996 auth.add_auth_options(parser)
3997 options, args = parser.parse_args(args)
3998 if args:
3999 parser.error('Unsupported args: %s' % ' '.join(args))
4000 auth_config = auth.extract_auth_config_from_options(options)
4001
4002 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4003 if not branches:
4004 return 0
4005
vapiera7fbd5a2016-06-16 09:17:49 -07004006 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004007 changes = [Changelist(branchref=b, auth_config=auth_config)
4008 for b in branches.splitlines()]
4009 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4010 statuses = get_cl_statuses(changes,
4011 fine_grained=True,
4012 max_processes=options.maxjobs)
4013 proposal = [(cl.GetBranch(),
4014 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4015 for cl, status in statuses
4016 if status == 'closed']
4017 proposal.sort()
4018
4019 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004021 return 0
4022
4023 current_branch = GetCurrentBranch()
4024
vapiera7fbd5a2016-06-16 09:17:49 -07004025 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004026 if options.notags:
4027 for next_item in proposal:
4028 print(' ' + next_item[0])
4029 else:
4030 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4031 for next_item in proposal:
4032 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004033
kmarshall9249e012016-08-23 12:02:16 -07004034 # Quit now on precondition failure or if instructed by the user, either
4035 # via an interactive prompt or by command line flags.
4036 if options.dry_run:
4037 print('\nNo changes were made (dry run).\n')
4038 return 0
4039 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004040 print('You are currently on a branch \'%s\' which is associated with a '
4041 'closed codereview issue, so archive cannot proceed. Please '
4042 'checkout another branch and run this command again.' %
4043 current_branch)
4044 return 1
kmarshall9249e012016-08-23 12:02:16 -07004045 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004046 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4047 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004048 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004049 return 1
4050
4051 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004052 if not options.notags:
4053 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004054 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004055
vapiera7fbd5a2016-06-16 09:17:49 -07004056 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004057
4058 return 0
4059
4060
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004062 """Show status of changelists.
4063
4064 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004065 - Red not sent for review or broken
4066 - Blue waiting for review
4067 - Yellow waiting for you to reply to review
4068 - Green LGTM'ed
4069 - Magenta in the commit queue
4070 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004071
4072 Also see 'git cl comments'.
4073 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004075 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004076 parser.add_option('-f', '--fast', action='store_true',
4077 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004078 parser.add_option(
4079 '-j', '--maxjobs', action='store', type=int,
4080 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004081
4082 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004083 _add_codereview_issue_select_options(
4084 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004085 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004086 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004087 if args:
4088 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004089 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090
iannuccie53c9352016-08-17 14:40:40 -07004091 if options.issue is not None and not options.field:
4092 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004093
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004094 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004095 cl = Changelist(auth_config=auth_config, issue=options.issue,
4096 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004097 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004099 elif options.field == 'id':
4100 issueid = cl.GetIssue()
4101 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103 elif options.field == 'patch':
4104 patchset = cl.GetPatchset()
4105 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004106 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004107 elif options.field == 'status':
4108 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004109 elif options.field == 'url':
4110 url = cl.GetIssueURL()
4111 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004112 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004113 return 0
4114
4115 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4116 if not branches:
4117 print('No local branch found.')
4118 return 0
4119
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004120 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004121 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004122 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004124 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004126 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004127
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004128 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004129 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4130 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4131 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004132 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004133 c, status = output.next()
4134 branch_statuses[c.GetBranch()] = status
4135 status = branch_statuses.pop(branch)
4136 url = cl.GetIssueURL()
4137 if url and (not status or status == 'error'):
4138 # The issue probably doesn't exist anymore.
4139 url += ' (broken)'
4140
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004141 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004142 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004143 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004144 color = ''
4145 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004146 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004147 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004148 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004149 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004150
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004151
4152 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004153 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004154 print('Current branch: %s' % branch)
4155 for cl in changes:
4156 if cl.GetBranch() == branch:
4157 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004158 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004160 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004162 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004163 print('Issue description:')
4164 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165 return 0
4166
4167
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004168def colorize_CMDstatus_doc():
4169 """To be called once in main() to add colors to git cl status help."""
4170 colors = [i for i in dir(Fore) if i[0].isupper()]
4171
4172 def colorize_line(line):
4173 for color in colors:
4174 if color in line.upper():
4175 # Extract whitespaces first and the leading '-'.
4176 indent = len(line) - len(line.lstrip(' ')) + 1
4177 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4178 return line
4179
4180 lines = CMDstatus.__doc__.splitlines()
4181 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4182
4183
phajdan.jre328cf92016-08-22 04:12:17 -07004184def write_json(path, contents):
4185 with open(path, 'w') as f:
4186 json.dump(contents, f)
4187
4188
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004189@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004191 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192
4193 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004194 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004195 parser.add_option('-r', '--reverse', action='store_true',
4196 help='Lookup the branch(es) for the specified issues. If '
4197 'no issues are specified, all branches with mapped '
4198 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004199 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004200 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004201 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004202 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004203
dnj@chromium.org406c4402015-03-03 17:22:28 +00004204 if options.reverse:
4205 branches = RunGit(['for-each-ref', 'refs/heads',
4206 '--format=%(refname:short)']).splitlines()
4207
4208 # Reverse issue lookup.
4209 issue_branch_map = {}
4210 for branch in branches:
4211 cl = Changelist(branchref=branch)
4212 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4213 if not args:
4214 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004215 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004216 for issue in args:
4217 if not issue:
4218 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004219 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004220 print('Branch for issue number %s: %s' % (
4221 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004222 if options.json:
4223 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004224 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004225 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004226 if len(args) > 0:
4227 try:
4228 issue = int(args[0])
4229 except ValueError:
4230 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004231 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004232 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004233 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004234 if options.json:
4235 write_json(options.json, {
4236 'issue': cl.GetIssue(),
4237 'issue_url': cl.GetIssueURL(),
4238 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004239 return 0
4240
4241
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004242def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004243 """Shows or posts review comments for any changelist."""
4244 parser.add_option('-a', '--add-comment', dest='comment',
4245 help='comment to add to an issue')
4246 parser.add_option('-i', dest='issue',
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004247 help='review issue id (defaults to current issue)')
smut@google.comc85ac942015-09-15 16:34:43 +00004248 parser.add_option('-j', '--json-file',
4249 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004250 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004251 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004252 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004253 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004254 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004255
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004256 issue = None
4257 if options.issue:
4258 try:
4259 issue = int(options.issue)
4260 except ValueError:
4261 DieWithError('A review issue id is expected to be a number')
4262
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004263 cl = Changelist(issue=issue,
4264 # TODO(tandrii): remove 'rietveld' default.
4265 codereview=options.forced_codereview or 'rietveld',
4266 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004267
4268 if options.comment:
4269 cl.AddComment(options.comment)
4270 return 0
4271
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004272 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4273 for comment in summary:
4274 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004275 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004276 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004277 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004278 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004279 color = Fore.MAGENTA
4280 else:
4281 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004282 print('\n%s%s %s%s\n%s' % (
4283 color,
4284 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4285 comment.sender,
4286 Fore.RESET,
4287 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4288
smut@google.comc85ac942015-09-15 16:34:43 +00004289 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004290 def pre_serialize(c):
4291 dct = c.__dict__.copy()
4292 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4293 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004294 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004295 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004296 return 0
4297
4298
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004299@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004300def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004301 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004302 parser.add_option('-d', '--display', action='store_true',
4303 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004304 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004305 help='New description to set for this issue (- for stdin, '
4306 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004307 parser.add_option('-f', '--force', action='store_true',
4308 help='Delete any unpublished Gerrit edits for this issue '
4309 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004310
4311 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004312 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004313 options, args = parser.parse_args(args)
4314 _process_codereview_select_options(parser, options)
4315
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004316 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004317 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004318 target_issue_arg = ParseIssueNumberArgument(args[0])
4319 if not target_issue_arg.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004320 parser.print_help()
4321 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004322
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004323 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004324
martiniss6eda05f2016-06-30 10:18:35 -07004325 kwargs = {
4326 'auth_config': auth_config,
4327 'codereview': options.forced_codereview,
4328 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004329 if target_issue_arg:
4330 kwargs['issue'] = target_issue_arg.issue
4331 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004332
4333 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004335 if not cl.GetIssue():
4336 DieWithError('This branch has no associated changelist.')
4337 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004338
smut@google.com34fb6b12015-07-13 20:03:26 +00004339 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004340 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004341 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004342
4343 if options.new_description:
4344 text = options.new_description
4345 if text == '-':
4346 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004347 elif text == '+':
4348 base_branch = cl.GetCommonAncestorWithUpstream()
4349 change = cl.GetChange(base_branch, None, local_description=True)
4350 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004351
4352 description.set_description(text)
4353 else:
4354 description.prompt()
4355
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004356 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004357 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004358 return 0
4359
4360
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004361def CreateDescriptionFromLog(args):
4362 """Pulls out the commit log to use as a base for the CL description."""
4363 log_args = []
4364 if len(args) == 1 and not args[0].endswith('.'):
4365 log_args = [args[0] + '..']
4366 elif len(args) == 1 and args[0].endswith('...'):
4367 log_args = [args[0][:-1]]
4368 elif len(args) == 2:
4369 log_args = [args[0] + '..' + args[1]]
4370 else:
4371 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004372 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004373
4374
thestig@chromium.org44202a22014-03-11 19:22:18 +00004375def CMDlint(parser, args):
4376 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004377 parser.add_option('--filter', action='append', metavar='-x,+y',
4378 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004379 auth.add_auth_options(parser)
4380 options, args = parser.parse_args(args)
4381 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004382
4383 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004384 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004385 try:
4386 import cpplint
4387 import cpplint_chromium
4388 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004389 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004390 return 1
4391
4392 # Change the current working directory before calling lint so that it
4393 # shows the correct base.
4394 previous_cwd = os.getcwd()
4395 os.chdir(settings.GetRoot())
4396 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004397 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004398 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4399 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004400 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004401 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004402 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004403
4404 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004405 command = args + files
4406 if options.filter:
4407 command = ['--filter=' + ','.join(options.filter)] + command
4408 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004409
4410 white_regex = re.compile(settings.GetLintRegex())
4411 black_regex = re.compile(settings.GetLintIgnoreRegex())
4412 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4413 for filename in filenames:
4414 if white_regex.match(filename):
4415 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004416 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004417 else:
4418 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4419 extra_check_functions)
4420 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004421 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004422 finally:
4423 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004424 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004425 if cpplint._cpplint_state.error_count != 0:
4426 return 1
4427 return 0
4428
4429
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004430def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004431 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004432 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004433 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004434 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004435 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004436 auth.add_auth_options(parser)
4437 options, args = parser.parse_args(args)
4438 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004439
sbc@chromium.org71437c02015-04-09 19:29:40 +00004440 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004442 return 1
4443
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004444 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004445 if args:
4446 base_branch = args[0]
4447 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004448 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004449 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004450
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004451 cl.RunHook(
4452 committing=not options.upload,
4453 may_prompt=False,
4454 verbose=options.verbose,
4455 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004456 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004457
4458
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004459def GenerateGerritChangeId(message):
4460 """Returns Ixxxxxx...xxx change id.
4461
4462 Works the same way as
4463 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4464 but can be called on demand on all platforms.
4465
4466 The basic idea is to generate git hash of a state of the tree, original commit
4467 message, author/committer info and timestamps.
4468 """
4469 lines = []
4470 tree_hash = RunGitSilent(['write-tree'])
4471 lines.append('tree %s' % tree_hash.strip())
4472 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4473 if code == 0:
4474 lines.append('parent %s' % parent.strip())
4475 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4476 lines.append('author %s' % author.strip())
4477 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4478 lines.append('committer %s' % committer.strip())
4479 lines.append('')
4480 # Note: Gerrit's commit-hook actually cleans message of some lines and
4481 # whitespace. This code is not doing this, but it clearly won't decrease
4482 # entropy.
4483 lines.append(message)
4484 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4485 stdin='\n'.join(lines))
4486 return 'I%s' % change_hash.strip()
4487
4488
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004489def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004490 """Computes the remote branch ref to use for the CL.
4491
4492 Args:
4493 remote (str): The git remote for the CL.
4494 remote_branch (str): The git remote branch for the CL.
4495 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004496 """
4497 if not (remote and remote_branch):
4498 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004499
wittman@chromium.org455dc922015-01-26 20:15:50 +00004500 if target_branch:
4501 # Cannonicalize branch references to the equivalent local full symbolic
4502 # refs, which are then translated into the remote full symbolic refs
4503 # below.
4504 if '/' not in target_branch:
4505 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4506 else:
4507 prefix_replacements = (
4508 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4509 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4510 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4511 )
4512 match = None
4513 for regex, replacement in prefix_replacements:
4514 match = re.search(regex, target_branch)
4515 if match:
4516 remote_branch = target_branch.replace(match.group(0), replacement)
4517 break
4518 if not match:
4519 # This is a branch path but not one we recognize; use as-is.
4520 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004521 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4522 # Handle the refs that need to land in different refs.
4523 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004524
wittman@chromium.org455dc922015-01-26 20:15:50 +00004525 # Create the true path to the remote branch.
4526 # Does the following translation:
4527 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4528 # * refs/remotes/origin/master -> refs/heads/master
4529 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4530 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4531 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4532 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4533 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4534 'refs/heads/')
4535 elif remote_branch.startswith('refs/remotes/branch-heads'):
4536 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004537
wittman@chromium.org455dc922015-01-26 20:15:50 +00004538 return remote_branch
4539
4540
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004541def cleanup_list(l):
4542 """Fixes a list so that comma separated items are put as individual items.
4543
4544 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4545 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4546 """
4547 items = sum((i.split(',') for i in l), [])
4548 stripped_items = (i.strip() for i in items)
4549 return sorted(filter(None, stripped_items))
4550
4551
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004552@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004553def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004554 """Uploads the current changelist to codereview.
4555
4556 Can skip dependency patchset uploads for a branch by running:
4557 git config branch.branch_name.skip-deps-uploads True
4558 To unset run:
4559 git config --unset branch.branch_name.skip-deps-uploads
4560 Can also set the above globally by using the --global flag.
4561 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004562 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4563 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004564 parser.add_option('--bypass-watchlists', action='store_true',
4565 dest='bypass_watchlists',
4566 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004567 parser.add_option('-f', action='store_true', dest='force',
4568 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004569 parser.add_option('--message', '-m', dest='message',
4570 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004571 parser.add_option('-b', '--bug',
4572 help='pre-populate the bug number(s) for this issue. '
4573 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004574 parser.add_option('--message-file', dest='message_file',
4575 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004576 parser.add_option('--title', '-t', dest='title',
4577 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004578 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004579 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004580 help='reviewer email addresses')
4581 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004582 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004583 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004584 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004585 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004586 parser.add_option('--emulate_svn_auto_props',
4587 '--emulate-svn-auto-props',
4588 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004589 dest="emulate_svn_auto_props",
4590 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004591 parser.add_option('-c', '--use-commit-queue', action='store_true',
4592 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004593 parser.add_option('--private', action='store_true',
4594 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004595 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004596 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004597 metavar='TARGET',
4598 help='Apply CL to remote ref TARGET. ' +
4599 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004600 parser.add_option('--squash', action='store_true',
4601 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004602 parser.add_option('--no-squash', action='store_true',
4603 help='Don\'t squash multiple commits into one ' +
4604 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004605 parser.add_option('--topic', default=None,
4606 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004607 parser.add_option('--email', default=None,
4608 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004609 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4610 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004611 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4612 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004613 help='Send the patchset to do a CQ dry run right after '
4614 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004615 parser.add_option('--dependencies', action='store_true',
4616 help='Uploads CLs of all the local branches that depend on '
4617 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004618
rmistry@google.com2dd99862015-06-22 12:22:18 +00004619 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004620 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004621 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004622 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004623 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004624 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004625 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004626
sbc@chromium.org71437c02015-04-09 19:29:40 +00004627 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004628 return 1
4629
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004630 options.reviewers = cleanup_list(options.reviewers)
4631 options.cc = cleanup_list(options.cc)
4632
tandriib80458a2016-06-23 12:20:07 -07004633 if options.message_file:
4634 if options.message:
4635 parser.error('only one of --message and --message-file allowed.')
4636 options.message = gclient_utils.FileRead(options.message_file)
4637 options.message_file = None
4638
tandrii4d0545a2016-07-06 03:56:49 -07004639 if options.cq_dry_run and options.use_commit_queue:
4640 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4641
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004642 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4643 settings.GetIsGerrit()
4644
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004645 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004646 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004647
4648
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004649@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004651 """DEPRECATED: Used to commit the current changelist via git-svn."""
4652 message = ('git-cl no longer supports committing to SVN repositories via '
4653 'git-svn. You probably want to use `git cl land` instead.')
4654 print(message)
4655 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004656
4657
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004658@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004659def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004660 """Commits the current changelist via git.
4661
4662 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4663 upstream and closes the issue automatically and atomically.
4664
4665 Otherwise (in case of Rietveld):
4666 Squashes branch into a single commit.
4667 Updates commit message with metadata (e.g. pointer to review).
4668 Pushes the code upstream.
4669 Updates review and closes.
4670 """
4671 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4672 help='bypass upload presubmit hook')
4673 parser.add_option('-m', dest='message',
4674 help="override review description")
4675 parser.add_option('-f', action='store_true', dest='force',
4676 help="force yes to questions (don't prompt)")
4677 parser.add_option('-c', dest='contributor',
4678 help="external contributor for patch (appended to " +
4679 "description and used as author for git). Should be " +
4680 "formatted as 'First Last <email@example.com>'")
4681 add_git_similarity(parser)
4682 auth.add_auth_options(parser)
4683 (options, args) = parser.parse_args(args)
4684 auth_config = auth.extract_auth_config_from_options(options)
4685
4686 cl = Changelist(auth_config=auth_config)
4687
4688 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4689 if cl.IsGerrit():
4690 if options.message:
4691 # This could be implemented, but it requires sending a new patch to
4692 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4693 # Besides, Gerrit has the ability to change the commit message on submit
4694 # automatically, thus there is no need to support this option (so far?).
4695 parser.error('-m MESSAGE option is not supported for Gerrit.')
4696 if options.contributor:
4697 parser.error(
4698 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4699 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4700 'the contributor\'s "name <email>". If you can\'t upload such a '
4701 'commit for review, contact your repository admin and request'
4702 '"Forge-Author" permission.')
4703 if not cl.GetIssue():
4704 DieWithError('You must upload the change first to Gerrit.\n'
4705 ' If you would rather have `git cl land` upload '
4706 'automatically for you, see http://crbug.com/642759')
4707 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4708 options.verbose)
4709
4710 current = cl.GetBranch()
4711 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4712 if remote == '.':
4713 print()
4714 print('Attempting to push branch %r into another local branch!' % current)
4715 print()
4716 print('Either reparent this branch on top of origin/master:')
4717 print(' git reparent-branch --root')
4718 print()
4719 print('OR run `git rebase-update` if you think the parent branch is ')
4720 print('already committed.')
4721 print()
4722 print(' Current parent: %r' % upstream_branch)
4723 return 1
4724
4725 if not args:
4726 # Default to merging against our best guess of the upstream branch.
4727 args = [cl.GetUpstreamBranch()]
4728
4729 if options.contributor:
4730 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4731 print("Please provide contibutor as 'First Last <email@example.com>'")
4732 return 1
4733
4734 base_branch = args[0]
4735
4736 if git_common.is_dirty_git_tree('land'):
4737 return 1
4738
4739 # This rev-list syntax means "show all commits not in my branch that
4740 # are in base_branch".
4741 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4742 base_branch]).splitlines()
4743 if upstream_commits:
4744 print('Base branch "%s" has %d commits '
4745 'not in this branch.' % (base_branch, len(upstream_commits)))
4746 print('Run "git merge %s" before attempting to land.' % base_branch)
4747 return 1
4748
4749 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4750 if not options.bypass_hooks:
4751 author = None
4752 if options.contributor:
4753 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4754 hook_results = cl.RunHook(
4755 committing=True,
4756 may_prompt=not options.force,
4757 verbose=options.verbose,
4758 change=cl.GetChange(merge_base, author))
4759 if not hook_results.should_continue():
4760 return 1
4761
4762 # Check the tree status if the tree status URL is set.
4763 status = GetTreeStatus()
4764 if 'closed' == status:
4765 print('The tree is closed. Please wait for it to reopen. Use '
4766 '"git cl land --bypass-hooks" to commit on a closed tree.')
4767 return 1
4768 elif 'unknown' == status:
4769 print('Unable to determine tree status. Please verify manually and '
4770 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4771 return 1
4772
4773 change_desc = ChangeDescription(options.message)
4774 if not change_desc.description and cl.GetIssue():
4775 change_desc = ChangeDescription(cl.GetDescription())
4776
4777 if not change_desc.description:
4778 if not cl.GetIssue() and options.bypass_hooks:
4779 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4780 else:
4781 print('No description set.')
4782 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4783 return 1
4784
4785 # Keep a separate copy for the commit message, because the commit message
4786 # contains the link to the Rietveld issue, while the Rietveld message contains
4787 # the commit viewvc url.
4788 if cl.GetIssue():
4789 change_desc.update_reviewers(cl.GetApprovingReviewers())
4790
4791 commit_desc = ChangeDescription(change_desc.description)
4792 if cl.GetIssue():
4793 # Xcode won't linkify this URL unless there is a non-whitespace character
4794 # after it. Add a period on a new line to circumvent this. Also add a space
4795 # before the period to make sure that Gitiles continues to correctly resolve
4796 # the URL.
4797 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4798 if options.contributor:
4799 commit_desc.append_footer('Patch from %s.' % options.contributor)
4800
4801 print('Description:')
4802 print(commit_desc.description)
4803
4804 branches = [merge_base, cl.GetBranchRef()]
4805 if not options.force:
4806 print_stats(options.similarity, options.find_copies, branches)
4807
4808 # We want to squash all this branch's commits into one commit with the proper
4809 # description. We do this by doing a "reset --soft" to the base branch (which
4810 # keeps the working copy the same), then landing that.
4811 MERGE_BRANCH = 'git-cl-commit'
4812 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4813 # Delete the branches if they exist.
4814 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4815 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4816 result = RunGitWithCode(showref_cmd)
4817 if result[0] == 0:
4818 RunGit(['branch', '-D', branch])
4819
4820 # We might be in a directory that's present in this branch but not in the
4821 # trunk. Move up to the top of the tree so that git commands that expect a
4822 # valid CWD won't fail after we check out the merge branch.
4823 rel_base_path = settings.GetRelativeRoot()
4824 if rel_base_path:
4825 os.chdir(rel_base_path)
4826
4827 # Stuff our change into the merge branch.
4828 # We wrap in a try...finally block so if anything goes wrong,
4829 # we clean up the branches.
4830 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004831 revision = None
4832 try:
4833 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4834 RunGit(['reset', '--soft', merge_base])
4835 if options.contributor:
4836 RunGit(
4837 [
4838 'commit', '--author', options.contributor,
4839 '-m', commit_desc.description,
4840 ])
4841 else:
4842 RunGit(['commit', '-m', commit_desc.description])
4843
4844 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4845 mirror = settings.GetGitMirror(remote)
4846 if mirror:
4847 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004848 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004849 else:
4850 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004851 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004852 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4853
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004854 if git_numberer_enabled:
4855 # TODO(tandrii): maybe do autorebase + retry on failure
4856 # http://crbug.com/682934, but better just use Gerrit :)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004857 logging.debug('Adding git number footers')
4858 parent_msg = RunGit(['show', '-s', '--format=%B', merge_base]).strip()
4859 commit_desc.update_with_git_number_footers(merge_base, parent_msg,
4860 branch)
4861 # Ensure timestamps are monotonically increasing.
4862 timestamp = max(1 + _get_committer_timestamp(merge_base),
4863 _get_committer_timestamp('HEAD'))
4864 _git_amend_head(commit_desc.description, timestamp)
4865 change_desc = ChangeDescription(commit_desc.description)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004866
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004867 retcode, output = RunGitWithCode(
4868 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004869 if retcode == 0:
4870 revision = RunGit(['rev-parse', 'HEAD']).strip()
4871 logging.debug(output)
4872 except: # pylint: disable=bare-except
4873 if _IS_BEING_TESTED:
4874 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4875 + '-' * 30 + '8<' + '-' * 30)
4876 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4877 raise
4878 finally:
4879 # And then swap back to the original branch and clean up.
4880 RunGit(['checkout', '-q', cl.GetBranch()])
4881 RunGit(['branch', '-D', MERGE_BRANCH])
4882
4883 if not revision:
4884 print('Failed to push. If this persists, please file a bug.')
4885 return 1
4886
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004887 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004888 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004889 if viewvc_url and revision:
4890 change_desc.append_footer(
4891 'Committed: %s%s' % (viewvc_url, revision))
4892 elif revision:
4893 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004894 print('Closing issue '
4895 '(you may be prompted for your codereview password)...')
4896 cl.UpdateDescription(change_desc.description)
4897 cl.CloseIssue()
4898 props = cl.GetIssueProperties()
4899 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004900 comment = "Committed patchset #%d (id:%d) manually as %s" % (
4901 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004902 if options.bypass_hooks:
4903 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4904 else:
4905 comment += ' (presubmit successful).'
4906 cl.RpcServer().add_comment(cl.GetIssue(), comment)
4907
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004908 if os.path.isfile(POSTUPSTREAM_HOOK):
4909 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
4910
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004911 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004912
4913
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004914@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004915def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004916 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004917 parser.add_option('-b', dest='newbranch',
4918 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004919 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004920 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004921 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4922 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004923 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004924 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004925 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004926 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004927 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004928 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004929
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004930
4931 group = optparse.OptionGroup(
4932 parser,
4933 'Options for continuing work on the current issue uploaded from a '
4934 'different clone (e.g. different machine). Must be used independently '
4935 'from the other options. No issue number should be specified, and the '
4936 'branch must have an issue number associated with it')
4937 group.add_option('--reapply', action='store_true', dest='reapply',
4938 help='Reset the branch and reapply the issue.\n'
4939 'CAUTION: This will undo any local changes in this '
4940 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004941
4942 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004943 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004944 parser.add_option_group(group)
4945
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004946 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004947 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004948 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004949 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004950 auth_config = auth.extract_auth_config_from_options(options)
4951
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004952
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004953 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004954 if options.newbranch:
4955 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004956 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004957 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004958
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004959 cl = Changelist(auth_config=auth_config,
4960 codereview=options.forced_codereview)
4961 if not cl.GetIssue():
4962 parser.error('current branch must have an associated issue')
4963
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004964 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004965 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004966 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004967
4968 RunGit(['reset', '--hard', upstream])
4969 if options.pull:
4970 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004971
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004972 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4973 options.directory)
4974
4975 if len(args) != 1 or not args[0]:
4976 parser.error('Must specify issue number or url')
4977
4978 # We don't want uncommitted changes mixed up with the patch.
4979 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004980 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004981
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004982 if options.newbranch:
4983 if options.force:
4984 RunGit(['branch', '-D', options.newbranch],
4985 stderr=subprocess2.PIPE, error_ok=True)
4986 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07004987 elif not GetCurrentBranch():
4988 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004989
4990 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4991
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004992 if cl.IsGerrit():
4993 if options.reject:
4994 parser.error('--reject is not supported with Gerrit codereview.')
4995 if options.nocommit:
4996 parser.error('--nocommit is not supported with Gerrit codereview.')
4997 if options.directory:
4998 parser.error('--directory is not supported with Gerrit codereview.')
4999
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005000 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005001 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005002
5003
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005004def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005005 """Fetches the tree status and returns either 'open', 'closed',
5006 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005007 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005008 if url:
5009 status = urllib2.urlopen(url).read().lower()
5010 if status.find('closed') != -1 or status == '0':
5011 return 'closed'
5012 elif status.find('open') != -1 or status == '1':
5013 return 'open'
5014 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005015 return 'unset'
5016
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005018def GetTreeStatusReason():
5019 """Fetches the tree status from a json url and returns the message
5020 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005021 url = settings.GetTreeStatusUrl()
5022 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005023 connection = urllib2.urlopen(json_url)
5024 status = json.loads(connection.read())
5025 connection.close()
5026 return status['message']
5027
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005028
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005029def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005030 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005031 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005032 status = GetTreeStatus()
5033 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005034 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005035 return 2
5036
vapiera7fbd5a2016-06-16 09:17:49 -07005037 print('The tree is %s' % status)
5038 print()
5039 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005040 if status != 'open':
5041 return 1
5042 return 0
5043
5044
maruel@chromium.org15192402012-09-06 12:38:29 +00005045def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005046 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005047 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005048 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005049 '-b', '--bot', action='append',
5050 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5051 'times to specify multiple builders. ex: '
5052 '"-b win_rel -b win_layout". See '
5053 'the try server waterfall for the builders name and the tests '
5054 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005055 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005056 '-B', '--bucket', default='',
5057 help=('Buildbucket bucket to send the try requests.'))
5058 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005059 '-m', '--master', default='',
5060 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005061 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005062 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005063 help='Revision to use for the try job; default: the revision will '
5064 'be determined by the try recipe that builder runs, which usually '
5065 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005066 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005067 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005068 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005069 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005070 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005071 '--project',
5072 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005073 'in recipe to determine to which repository or directory to '
5074 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005075 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005076 '-p', '--property', dest='properties', action='append', default=[],
5077 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005078 'key2=value2 etc. The value will be treated as '
5079 'json if decodable, or as string otherwise. '
5080 'NOTE: using this may make your try job not usable for CQ, '
5081 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005082 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005083 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5084 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005085 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005086 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005087 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005088 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005089
machenbach@chromium.org45453142015-09-15 08:45:22 +00005090 # Make sure that all properties are prop=value pairs.
5091 bad_params = [x for x in options.properties if '=' not in x]
5092 if bad_params:
5093 parser.error('Got properties with missing "=": %s' % bad_params)
5094
maruel@chromium.org15192402012-09-06 12:38:29 +00005095 if args:
5096 parser.error('Unknown arguments: %s' % args)
5097
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005098 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005099 if not cl.GetIssue():
5100 parser.error('Need to upload first')
5101
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005102 if cl.IsGerrit():
5103 # HACK: warm up Gerrit change detail cache to save on RPCs.
5104 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5105
tandriie113dfd2016-10-11 10:20:12 -07005106 error_message = cl.CannotTriggerTryJobReason()
5107 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005108 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005109
borenet6c0efe62016-10-19 08:13:29 -07005110 if options.bucket and options.master:
5111 parser.error('Only one of --bucket and --master may be used.')
5112
qyearsley1fdfcb62016-10-24 13:22:03 -07005113 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005114
qyearsleydd49f942016-10-28 11:57:22 -07005115 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5116 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005117 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005118 if options.verbose:
5119 print('git cl try with no bots now defaults to CQ Dry Run.')
5120 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005121
borenet6c0efe62016-10-19 08:13:29 -07005122 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005123 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005124 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005125 'of bot requires an initial job from a parent (usually a builder). '
5126 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005127 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005128 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005129
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005130 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005131 # TODO(tandrii): Checking local patchset against remote patchset is only
5132 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5133 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005134 print('Warning: Codereview server has newer patchsets (%s) than most '
5135 'recent upload from local checkout (%s). Did a previous upload '
5136 'fail?\n'
5137 'By default, git cl try uses the latest patchset from '
5138 'codereview, continuing to use patchset %s.\n' %
5139 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005140
tandrii568043b2016-10-11 07:49:18 -07005141 try:
borenet6c0efe62016-10-19 08:13:29 -07005142 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5143 patchset)
tandrii568043b2016-10-11 07:49:18 -07005144 except BuildbucketResponseException as ex:
5145 print('ERROR: %s' % ex)
5146 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005147 return 0
5148
5149
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005150def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005151 """Prints info about try jobs associated with current CL."""
5152 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005153 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005154 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005155 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005156 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005157 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005158 '--color', action='store_true', default=setup_color.IS_TTY,
5159 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005160 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005161 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5162 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005163 group.add_option(
5164 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005165 parser.add_option_group(group)
5166 auth.add_auth_options(parser)
5167 options, args = parser.parse_args(args)
5168 if args:
5169 parser.error('Unrecognized args: %s' % ' '.join(args))
5170
5171 auth_config = auth.extract_auth_config_from_options(options)
5172 cl = Changelist(auth_config=auth_config)
5173 if not cl.GetIssue():
5174 parser.error('Need to upload first')
5175
tandrii221ab252016-10-06 08:12:04 -07005176 patchset = options.patchset
5177 if not patchset:
5178 patchset = cl.GetMostRecentPatchset()
5179 if not patchset:
5180 parser.error('Codereview doesn\'t know about issue %s. '
5181 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005182 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005183 cl.GetIssue())
5184
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005185 # TODO(tandrii): Checking local patchset against remote patchset is only
5186 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5187 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005188 print('Warning: Codereview server has newer patchsets (%s) than most '
5189 'recent upload from local checkout (%s). Did a previous upload '
5190 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005191 'By default, git cl try-results uses the latest patchset from '
5192 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005193 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005194 try:
tandrii221ab252016-10-06 08:12:04 -07005195 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005196 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005197 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005198 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005199 if options.json:
5200 write_try_results_json(options.json, jobs)
5201 else:
5202 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005203 return 0
5204
5205
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005206@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005208 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005209 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005210 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005211 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005212
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005214 if args:
5215 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005216 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005217 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005218 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005219 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005220
5221 # Clear configured merge-base, if there is one.
5222 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005223 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005224 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005225 return 0
5226
5227
thestig@chromium.org00858c82013-12-02 23:08:03 +00005228def CMDweb(parser, args):
5229 """Opens the current CL in the web browser."""
5230 _, args = parser.parse_args(args)
5231 if args:
5232 parser.error('Unrecognized args: %s' % ' '.join(args))
5233
5234 issue_url = Changelist().GetIssueURL()
5235 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005236 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005237 return 1
5238
5239 webbrowser.open(issue_url)
5240 return 0
5241
5242
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005243def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005244 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005245 parser.add_option('-d', '--dry-run', action='store_true',
5246 help='trigger in dry run mode')
5247 parser.add_option('-c', '--clear', action='store_true',
5248 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005249 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005250 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005251 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005252 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005253 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005254 if args:
5255 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005256 if options.dry_run and options.clear:
5257 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5258
iannuccie53c9352016-08-17 14:40:40 -07005259 cl = Changelist(auth_config=auth_config, issue=options.issue,
5260 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005261 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005262 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005263 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005264 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005265 state = _CQState.DRY_RUN
5266 else:
5267 state = _CQState.COMMIT
5268 if not cl.GetIssue():
5269 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005270 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005271 return 0
5272
5273
groby@chromium.org411034a2013-02-26 15:12:01 +00005274def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005275 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005276 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005277 auth.add_auth_options(parser)
5278 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005279 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005280 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005281 if args:
5282 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005283 cl = Changelist(auth_config=auth_config, issue=options.issue,
5284 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005285 # Ensure there actually is an issue to close.
5286 cl.GetDescription()
5287 cl.CloseIssue()
5288 return 0
5289
5290
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005291def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005292 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005293 parser.add_option(
5294 '--stat',
5295 action='store_true',
5296 dest='stat',
5297 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005298 auth.add_auth_options(parser)
5299 options, args = parser.parse_args(args)
5300 auth_config = auth.extract_auth_config_from_options(options)
5301 if args:
5302 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005303
5304 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005305 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005306 # Staged changes would be committed along with the patch from last
5307 # upload, hence counted toward the "last upload" side in the final
5308 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005309 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005310 return 1
5311
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005312 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005313 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005314 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005315 if not issue:
5316 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005317 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005318 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005319
5320 # Create a new branch based on the merge-base
5321 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005322 # Clear cached branch in cl object, to avoid overwriting original CL branch
5323 # properties.
5324 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005325 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005326 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005327 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005328 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005329 return rtn
5330
wychen@chromium.org06928532015-02-03 02:11:29 +00005331 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005332 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005333 cmd = ['git', 'diff']
5334 if options.stat:
5335 cmd.append('--stat')
5336 cmd.extend([TMP_BRANCH, branch, '--'])
5337 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005338 finally:
5339 RunGit(['checkout', '-q', branch])
5340 RunGit(['branch', '-D', TMP_BRANCH])
5341
5342 return 0
5343
5344
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005345def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005346 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005347 parser.add_option(
5348 '--no-color',
5349 action='store_true',
5350 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005351 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005352 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005353 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005354
5355 author = RunGit(['config', 'user.email']).strip() or None
5356
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005357 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005358
5359 if args:
5360 if len(args) > 1:
5361 parser.error('Unknown args')
5362 base_branch = args[0]
5363 else:
5364 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005365 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005366
5367 change = cl.GetChange(base_branch, None)
5368 return owners_finder.OwnersFinder(
5369 [f.LocalPath() for f in
5370 cl.GetChange(base_branch, None).AffectedFiles()],
5371 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07005372 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005373 disable_color=options.no_color).run()
5374
5375
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005376def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005377 """Generates a diff command."""
5378 # Generate diff for the current branch's changes.
5379 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005380 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005381
5382 if args:
5383 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005384 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005385 diff_cmd.append(arg)
5386 else:
5387 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005388
5389 return diff_cmd
5390
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005391
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005392def MatchingFileType(file_name, extensions):
5393 """Returns true if the file name ends with one of the given extensions."""
5394 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005395
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005396
enne@chromium.org555cfe42014-01-29 18:21:39 +00005397@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005398def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005399 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005400 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005401 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005402 parser.add_option('--full', action='store_true',
5403 help='Reformat the full content of all touched files')
5404 parser.add_option('--dry-run', action='store_true',
5405 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005406 parser.add_option('--python', action='store_true',
5407 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005408 parser.add_option('--js', action='store_true',
5409 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005410 parser.add_option('--diff', action='store_true',
5411 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005412 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005413
Daniel Chengc55eecf2016-12-30 03:11:02 -08005414 # Normalize any remaining args against the current path, so paths relative to
5415 # the current directory are still resolved as expected.
5416 args = [os.path.join(os.getcwd(), arg) for arg in args]
5417
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005418 # git diff generates paths against the root of the repository. Change
5419 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005420 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005421 if rel_base_path:
5422 os.chdir(rel_base_path)
5423
digit@chromium.org29e47272013-05-17 17:01:46 +00005424 # Grab the merge-base commit, i.e. the upstream commit of the current
5425 # branch when it was created or the last time it was rebased. This is
5426 # to cover the case where the user may have called "git fetch origin",
5427 # moving the origin branch to a newer commit, but hasn't rebased yet.
5428 upstream_commit = None
5429 cl = Changelist()
5430 upstream_branch = cl.GetUpstreamBranch()
5431 if upstream_branch:
5432 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5433 upstream_commit = upstream_commit.strip()
5434
5435 if not upstream_commit:
5436 DieWithError('Could not find base commit for this branch. '
5437 'Are you in detached state?')
5438
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005439 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5440 diff_output = RunGit(changed_files_cmd)
5441 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005442 # Filter out files deleted by this CL
5443 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005444
Christopher Lamc5ba6922017-01-24 11:19:14 +11005445 if opts.js:
5446 CLANG_EXTS.append('.js')
5447
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005448 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5449 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5450 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005451 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005452
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005453 top_dir = os.path.normpath(
5454 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5455
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005456 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5457 # formatted. This is used to block during the presubmit.
5458 return_value = 0
5459
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005460 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005461 # Locate the clang-format binary in the checkout
5462 try:
5463 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005464 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005465 DieWithError(e)
5466
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005467 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005468 cmd = [clang_format_tool]
5469 if not opts.dry_run and not opts.diff:
5470 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005471 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005472 if opts.diff:
5473 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005474 else:
5475 env = os.environ.copy()
5476 env['PATH'] = str(os.path.dirname(clang_format_tool))
5477 try:
5478 script = clang_format.FindClangFormatScriptInChromiumTree(
5479 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005480 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005481 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005482
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005483 cmd = [sys.executable, script, '-p0']
5484 if not opts.dry_run and not opts.diff:
5485 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005486
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005487 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5488 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005489
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005490 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5491 if opts.diff:
5492 sys.stdout.write(stdout)
5493 if opts.dry_run and len(stdout) > 0:
5494 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005495
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005496 # Similar code to above, but using yapf on .py files rather than clang-format
5497 # on C/C++ files
5498 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005499 yapf_tool = gclient_utils.FindExecutable('yapf')
5500 if yapf_tool is None:
5501 DieWithError('yapf not found in PATH')
5502
5503 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005504 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005505 cmd = [yapf_tool]
5506 if not opts.dry_run and not opts.diff:
5507 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005508 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005509 if opts.diff:
5510 sys.stdout.write(stdout)
5511 else:
5512 # TODO(sbc): yapf --lines mode still has some issues.
5513 # https://github.com/google/yapf/issues/154
5514 DieWithError('--python currently only works with --full')
5515
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005516 # Dart's formatter does not have the nice property of only operating on
5517 # modified chunks, so hard code full.
5518 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005519 try:
5520 command = [dart_format.FindDartFmtToolInChromiumTree()]
5521 if not opts.dry_run and not opts.diff:
5522 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005523 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005524
ppi@chromium.org6593d932016-03-03 15:41:15 +00005525 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005526 if opts.dry_run and stdout:
5527 return_value = 2
5528 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005529 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5530 'found in this checkout. Files in other languages are still '
5531 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005532
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005533 # Format GN build files. Always run on full build files for canonical form.
5534 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005535 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005536 if opts.dry_run or opts.diff:
5537 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005538 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005539 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5540 shell=sys.platform == 'win32',
5541 cwd=top_dir)
5542 if opts.dry_run and gn_ret == 2:
5543 return_value = 2 # Not formatted.
5544 elif opts.diff and gn_ret == 2:
5545 # TODO this should compute and print the actual diff.
5546 print("This change has GN build file diff for " + gn_diff_file)
5547 elif gn_ret != 0:
5548 # For non-dry run cases (and non-2 return values for dry-run), a
5549 # nonzero error code indicates a failure, probably because the file
5550 # doesn't parse.
5551 DieWithError("gn format failed on " + gn_diff_file +
5552 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005553
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005554 metrics_xml_files = [
5555 'tools/metrics/actions/actions.xml',
5556 'tools/metrics/histograms/histograms.xml',
5557 'tools/metrics/rappor/rappor.xml']
5558 for xml_file in metrics_xml_files:
5559 if xml_file in diff_files:
5560 tool_dir = top_dir + '/' + os.path.dirname(xml_file)
5561 cmd = [tool_dir + '/pretty_print.py', '--non-interactive']
5562 if opts.dry_run or opts.diff:
5563 cmd.append('--diff')
5564 stdout = RunCommand(cmd, cwd=top_dir)
5565 if opts.diff:
5566 sys.stdout.write(stdout)
5567 if opts.dry_run and stdout:
5568 return_value = 2 # Not formatted.
5569
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005570 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005571
5572
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005573@subcommand.usage('<codereview url or issue id>')
5574def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005575 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005576 _, args = parser.parse_args(args)
5577
5578 if len(args) != 1:
5579 parser.print_help()
5580 return 1
5581
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005582 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005583 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005584 parser.print_help()
5585 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005586 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005587
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005588 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005589 output = RunGit(['config', '--local', '--get-regexp',
5590 r'branch\..*\.%s' % issueprefix],
5591 error_ok=True)
5592 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005593 if issue == target_issue:
5594 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005595
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005596 branches = []
5597 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005598 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005599 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005600 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005601 return 1
5602 if len(branches) == 1:
5603 RunGit(['checkout', branches[0]])
5604 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005605 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005606 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005607 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005608 which = raw_input('Choose by index: ')
5609 try:
5610 RunGit(['checkout', branches[int(which)]])
5611 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005612 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005613 return 1
5614
5615 return 0
5616
5617
maruel@chromium.org29404b52014-09-08 22:58:00 +00005618def CMDlol(parser, args):
5619 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005620 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005621 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5622 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5623 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005624 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005625 return 0
5626
5627
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005628class OptionParser(optparse.OptionParser):
5629 """Creates the option parse and add --verbose support."""
5630 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005631 optparse.OptionParser.__init__(
5632 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005633 self.add_option(
5634 '-v', '--verbose', action='count', default=0,
5635 help='Use 2 times for more debugging info')
5636
5637 def parse_args(self, args=None, values=None):
5638 options, args = optparse.OptionParser.parse_args(self, args, values)
5639 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005640 logging.basicConfig(
5641 level=levels[min(options.verbose, len(levels) - 1)],
5642 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5643 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005644 return options, args
5645
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005646
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005647def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005648 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005649 print('\nYour python version %s is unsupported, please upgrade.\n' %
5650 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005651 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005652
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005653 # Reload settings.
5654 global settings
5655 settings = Settings()
5656
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005657 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005658 dispatcher = subcommand.CommandDispatcher(__name__)
5659 try:
5660 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005661 except auth.AuthenticationError as e:
5662 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005663 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005664 if e.code != 500:
5665 raise
5666 DieWithError(
5667 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5668 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005669 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005670
5671
5672if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005673 # These affect sys.stdout so do it outside of main() to simplify mocks in
5674 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005675 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005676 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005677 try:
5678 sys.exit(main(sys.argv[1:]))
5679 except KeyboardInterrupt:
5680 sys.stderr.write('interrupted\n')
5681 sys.exit(1)