blob: 2f485b159d48dbd2cab8b1316616fc3285af33f5 [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
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000843
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844 def GetIsSkipDependencyUpload(self, branch_name):
845 """Returns true if specified branch should skip dep uploads."""
846 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
847 error_ok=True)
848
rmistry@google.com5626a922015-02-26 14:03:30 +0000849 def GetRunPostUploadHook(self):
850 run_post_upload_hook = self._GetRietveldConfig(
851 'run-post-upload-hook', error_ok=True)
852 return run_post_upload_hook == "True"
853
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000856
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000858 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859
ukai@chromium.orge8077812012-02-03 03:41:46 +0000860 def GetIsGerrit(self):
861 """Return true if this repo is assosiated with gerrit code review system."""
862 if self.is_gerrit is None:
863 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
864 return self.is_gerrit
865
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000866 def GetSquashGerritUploads(self):
867 """Return true if uploads to Gerrit should be squashed by default."""
868 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700869 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
870 if self.squash_gerrit_uploads is None:
871 # Default is squash now (http://crbug.com/611892#c23).
872 self.squash_gerrit_uploads = not (
873 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
874 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000875 return self.squash_gerrit_uploads
876
tandriia60502f2016-06-20 02:01:53 -0700877 def GetSquashGerritUploadsOverride(self):
878 """Return True or False if codereview.settings should be overridden.
879
880 Returns None if no override has been defined.
881 """
882 # See also http://crbug.com/611892#c23
883 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
884 error_ok=True).strip()
885 if result == 'true':
886 return True
887 if result == 'false':
888 return False
889 return None
890
tandrii@chromium.org28253532016-04-14 13:46:56 +0000891 def GetGerritSkipEnsureAuthenticated(self):
892 """Return True if EnsureAuthenticated should not be done for Gerrit
893 uploads."""
894 if self.gerrit_skip_ensure_authenticated is None:
895 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000896 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 error_ok=True).strip() == 'true')
898 return self.gerrit_skip_ensure_authenticated
899
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000900 def GetGitEditor(self):
901 """Return the editor specified in the git config, or None if none is."""
902 if self.git_editor is None:
903 self.git_editor = self._GetConfig('core.editor', error_ok=True)
904 return self.git_editor or None
905
thestig@chromium.org44202a22014-03-11 19:22:18 +0000906 def GetLintRegex(self):
907 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
908 DEFAULT_LINT_REGEX)
909
910 def GetLintIgnoreRegex(self):
911 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
912 DEFAULT_LINT_IGNORE_REGEX)
913
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000914 def GetProject(self):
915 if not self.project:
916 self.project = self._GetRietveldConfig('project', error_ok=True)
917 return self.project
918
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000919 def _GetRietveldConfig(self, param, **kwargs):
920 return self._GetConfig('rietveld.' + param, **kwargs)
921
rmistry@google.com78948ed2015-07-08 23:09:57 +0000922 def _GetBranchConfig(self, branch_name, param, **kwargs):
923 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925 def _GetConfig(self, param, **kwargs):
926 self.LazyUpdateIfNeeded()
927 return RunGit(['config', param], **kwargs).strip()
928
929
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100930@contextlib.contextmanager
931def _get_gerrit_project_config_file(remote_url):
932 """Context manager to fetch and store Gerrit's project.config from
933 refs/meta/config branch and store it in temp file.
934
935 Provides a temporary filename or None if there was error.
936 """
937 error, _ = RunGitWithCode([
938 'fetch', remote_url,
939 '+refs/meta/config:refs/git_cl/meta/config'])
940 if error:
941 # Ref doesn't exist or isn't accessible to current user.
942 print('WARNING: failed to fetch project config for %s: %s' %
943 (remote_url, error))
944 yield None
945 return
946
947 error, project_config_data = RunGitWithCode(
948 ['show', 'refs/git_cl/meta/config:project.config'])
949 if error:
950 print('WARNING: project.config file not found')
951 yield None
952 return
953
954 with gclient_utils.temporary_directory() as tempdir:
955 project_config_file = os.path.join(tempdir, 'project.config')
956 gclient_utils.FileWrite(project_config_file, project_config_data)
957 yield project_config_file
958
959
960def _is_git_numberer_enabled(remote_url, remote_ref):
961 """Returns True if Git Numberer is enabled on this ref."""
962 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100963 KNOWN_PROJECTS_WHITELIST = [
964 'chromium/src',
965 'external/webrtc',
966 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100967 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100968 ]
969
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100970 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
971 url_parts = urlparse.urlparse(remote_url)
972 project_name = url_parts.path.lstrip('/').rstrip('git./')
973 for known in KNOWN_PROJECTS_WHITELIST:
974 if project_name.endswith(known):
975 break
976 else:
977 # Early exit to avoid extra fetches for repos that aren't using Git
978 # Numberer.
979 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100980
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100981 with _get_gerrit_project_config_file(remote_url) as project_config_file:
982 if project_config_file is None:
983 # Failed to fetch project.config, which shouldn't happen on open source
984 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100985 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100986 def get_opts(x):
987 code, out = RunGitWithCode(
988 ['config', '-f', project_config_file, '--get-all',
989 'plugin.git-numberer.validate-%s-refglob' % x])
990 if code == 0:
991 return out.strip().splitlines()
992 return []
993 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100994
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100995 logging.info('validator config enabled %s disabled %s refglobs for '
996 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000997
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100999 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001000 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001001 return True
1002 return False
1003
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if match_refglobs(disabled):
1005 return False
1006 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009def ShortBranchName(branch):
1010 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 return branch.replace('refs/heads/', '', 1)
1012
1013
1014def GetCurrentBranchRef():
1015 """Returns branch ref (e.g., refs/heads/master) or None."""
1016 return RunGit(['symbolic-ref', 'HEAD'],
1017 stderr=subprocess2.VOID, error_ok=True).strip() or None
1018
1019
1020def GetCurrentBranch():
1021 """Returns current branch or None.
1022
1023 For refs/heads/* branches, returns just last part. For others, full ref.
1024 """
1025 branchref = GetCurrentBranchRef()
1026 if branchref:
1027 return ShortBranchName(branchref)
1028 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029
1030
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001031class _CQState(object):
1032 """Enum for states of CL with respect to Commit Queue."""
1033 NONE = 'none'
1034 DRY_RUN = 'dry_run'
1035 COMMIT = 'commit'
1036
1037 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1038
1039
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001041 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001042 self.issue = issue
1043 self.patchset = patchset
1044 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 assert codereview in (None, 'rietveld', 'gerrit')
1046 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001047
1048 @property
1049 def valid(self):
1050 return self.issue is not None
1051
1052
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001053def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001054 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1055 fail_result = _ParsedIssueNumberArgument()
1056
1057 if arg.isdigit():
1058 return _ParsedIssueNumberArgument(issue=int(arg))
1059 if not arg.startswith('http'):
1060 return fail_result
1061 url = gclient_utils.UpgradeToHttps(arg)
1062 try:
1063 parsed_url = urlparse.urlparse(url)
1064 except ValueError:
1065 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001066
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001067 if codereview is not None:
1068 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1069 return parsed or fail_result
1070
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001071 results = {}
1072 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1073 parsed = cls.ParseIssueURL(parsed_url)
1074 if parsed is not None:
1075 results[name] = parsed
1076
1077 if not results:
1078 return fail_result
1079 if len(results) == 1:
1080 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001081
1082 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1083 # This is likely Gerrit.
1084 return results['gerrit']
1085 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001086 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001087
1088
Aaron Gablea45ee112016-11-22 15:14:38 -08001089class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001090 def __init__(self, issue, url):
1091 self.issue = issue
1092 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001093 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001094
1095 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001096 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001097 self.issue, self.url)
1098
1099
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001100_CommentSummary = collections.namedtuple(
1101 '_CommentSummary', ['date', 'message', 'sender',
1102 # TODO(tandrii): these two aren't known in Gerrit.
1103 'approval', 'disapproval'])
1104
1105
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107 """Changelist works with one changelist in local branch.
1108
1109 Supports two codereview backends: Rietveld or Gerrit, selected at object
1110 creation.
1111
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001112 Notes:
1113 * Not safe for concurrent multi-{thread,process} use.
1114 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001115 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001116 """
1117
1118 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1119 """Create a new ChangeList instance.
1120
1121 If issue is given, the codereview must be given too.
1122
1123 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1124 Otherwise, it's decided based on current configuration of the local branch,
1125 with default being 'rietveld' for backwards compatibility.
1126 See _load_codereview_impl for more details.
1127
1128 **kwargs will be passed directly to codereview implementation.
1129 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001131 global settings
1132 if not settings:
1133 # Happens when git_cl.py is used as a utility library.
1134 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001135
1136 if issue:
1137 assert codereview, 'codereview must be known, if issue is known'
1138
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 self.branchref = branchref
1140 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001141 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 self.branch = ShortBranchName(self.branchref)
1143 else:
1144 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001146 self.lookedup_issue = False
1147 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001148 self.has_description = False
1149 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001150 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001151 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001152 self.cc = None
1153 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001154 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001155
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001156 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001157 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 assert self._codereview_impl
1160 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161
1162 def _load_codereview_impl(self, codereview=None, **kwargs):
1163 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001164 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1165 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1166 self._codereview = codereview
1167 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001168 return
1169
1170 # Automatic selection based on issue number set for a current branch.
1171 # Rietveld takes precedence over Gerrit.
1172 assert not self.issue
1173 # Whether we find issue or not, we are doing the lookup.
1174 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001175 if self.GetBranch():
1176 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1177 issue = _git_get_branch_config_value(
1178 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1179 if issue:
1180 self._codereview = codereview
1181 self._codereview_impl = cls(self, **kwargs)
1182 self.issue = int(issue)
1183 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001184
1185 # No issue is set for this branch, so decide based on repo-wide settings.
1186 return self._load_codereview_impl(
1187 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1188 **kwargs)
1189
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001190 def IsGerrit(self):
1191 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192
1193 def GetCCList(self):
1194 """Return the users cc'd on this CL.
1195
agable92bec4f2016-08-24 09:27:27 -07001196 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197 """
1198 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001199 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 more_cc = ','.join(self.watchers)
1201 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1202 return self.cc
1203
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001204 def GetCCListWithoutDefault(self):
1205 """Return the users cc'd on this CL excluding default ones."""
1206 if self.cc is None:
1207 self.cc = ','.join(self.watchers)
1208 return self.cc
1209
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001210 def SetWatchers(self, watchers):
1211 """Set the list of email addresses that should be cc'd based on the changed
1212 files in this CL.
1213 """
1214 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215
1216 def GetBranch(self):
1217 """Returns the short branch name, e.g. 'master'."""
1218 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001219 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001220 if not branchref:
1221 return None
1222 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 self.branch = ShortBranchName(self.branchref)
1224 return self.branch
1225
1226 def GetBranchRef(self):
1227 """Returns the full branch name, e.g. 'refs/heads/master'."""
1228 self.GetBranch() # Poke the lazy loader.
1229 return self.branchref
1230
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001231 def ClearBranch(self):
1232 """Clears cached branch data of this object."""
1233 self.branch = self.branchref = None
1234
tandrii5d48c322016-08-18 16:19:37 -07001235 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1236 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1237 kwargs['branch'] = self.GetBranch()
1238 return _git_get_branch_config_value(key, default, **kwargs)
1239
1240 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1241 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1242 assert self.GetBranch(), (
1243 'this CL must have an associated branch to %sset %s%s' %
1244 ('un' if value is None else '',
1245 key,
1246 '' if value is None else ' to %r' % value))
1247 kwargs['branch'] = self.GetBranch()
1248 return _git_set_branch_config_value(key, value, **kwargs)
1249
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001250 @staticmethod
1251 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001252 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 e.g. 'origin', 'refs/heads/master'
1254 """
1255 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001256 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1257
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001259 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001261 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1262 error_ok=True).strip()
1263 if upstream_branch:
1264 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001266 # Else, try to guess the origin remote.
1267 remote_branches = RunGit(['branch', '-r']).split()
1268 if 'origin/master' in remote_branches:
1269 # Fall back on origin/master if it exits.
1270 remote = 'origin'
1271 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001272 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001273 DieWithError(
1274 'Unable to determine default branch to diff against.\n'
1275 'Either pass complete "git diff"-style arguments, like\n'
1276 ' git cl upload origin/master\n'
1277 'or verify this branch is set up to track another \n'
1278 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001279
1280 return remote, upstream_branch
1281
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001282 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001283 upstream_branch = self.GetUpstreamBranch()
1284 if not BranchExists(upstream_branch):
1285 DieWithError('The upstream for the current branch (%s) does not exist '
1286 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001287 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001288 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001289
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 def GetUpstreamBranch(self):
1291 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001292 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001294 upstream_branch = upstream_branch.replace('refs/heads/',
1295 'refs/remotes/%s/' % remote)
1296 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1297 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 self.upstream_branch = upstream_branch
1299 return self.upstream_branch
1300
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001301 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001302 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001303 remote, branch = None, self.GetBranch()
1304 seen_branches = set()
1305 while branch not in seen_branches:
1306 seen_branches.add(branch)
1307 remote, branch = self.FetchUpstreamTuple(branch)
1308 branch = ShortBranchName(branch)
1309 if remote != '.' or branch.startswith('refs/remotes'):
1310 break
1311 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001312 remotes = RunGit(['remote'], error_ok=True).split()
1313 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001314 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001315 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001316 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001317 logging.warn('Could not determine which remote this change is '
1318 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001319 else:
1320 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001321 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 branch = 'HEAD'
1323 if branch.startswith('refs/remotes'):
1324 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001325 elif branch.startswith('refs/branch-heads/'):
1326 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001327 else:
1328 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001329 return self._remote
1330
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001331 def GitSanityChecks(self, upstream_git_obj):
1332 """Checks git repo status and ensures diff is from local commits."""
1333
sbc@chromium.org79706062015-01-14 21:18:12 +00001334 if upstream_git_obj is None:
1335 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001336 print('ERROR: unable to determine current branch (detached HEAD?)',
1337 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001338 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001339 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001340 return False
1341
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001342 # Verify the commit we're diffing against is in our current branch.
1343 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1344 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1345 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001346 print('ERROR: %s is not in the current branch. You may need to rebase '
1347 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001348 return False
1349
1350 # List the commits inside the diff, and verify they are all local.
1351 commits_in_diff = RunGit(
1352 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1353 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1354 remote_branch = remote_branch.strip()
1355 if code != 0:
1356 _, remote_branch = self.GetRemoteBranch()
1357
1358 commits_in_remote = RunGit(
1359 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1360
1361 common_commits = set(commits_in_diff) & set(commits_in_remote)
1362 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001363 print('ERROR: Your diff contains %d commits already in %s.\n'
1364 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1365 'the diff. If you are using a custom git flow, you can override'
1366 ' the reference used for this check with "git config '
1367 'gitcl.remotebranch <git-ref>".' % (
1368 len(common_commits), remote_branch, upstream_git_obj),
1369 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001370 return False
1371 return True
1372
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001373 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001374 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001375
1376 Returns None if it is not set.
1377 """
tandrii5d48c322016-08-18 16:19:37 -07001378 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001379
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001380 def GetRemoteUrl(self):
1381 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1382
1383 Returns None if there is no remote.
1384 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001385 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001386 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1387
1388 # If URL is pointing to a local directory, it is probably a git cache.
1389 if os.path.isdir(url):
1390 url = RunGit(['config', 'remote.%s.url' % remote],
1391 error_ok=True,
1392 cwd=url).strip()
1393 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001395 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001396 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001397 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001398 self.issue = self._GitGetBranchConfigValue(
1399 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001400 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001401 return self.issue
1402
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 def GetIssueURL(self):
1404 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001405 issue = self.GetIssue()
1406 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001407 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001408 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001410 def GetDescription(self, pretty=False, force=False):
1411 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001413 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414 self.has_description = True
1415 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001416 # Set width to 72 columns + 2 space indent.
1417 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001419 lines = self.description.splitlines()
1420 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 return self.description
1422
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001423 def GetDescriptionFooters(self):
1424 """Returns (non_footer_lines, footers) for the commit message.
1425
1426 Returns:
1427 non_footer_lines (list(str)) - Simple list of description lines without
1428 any footer. The lines do not contain newlines, nor does the list contain
1429 the empty line between the message and the footers.
1430 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1431 [("Change-Id", "Ideadbeef...."), ...]
1432 """
1433 raw_description = self.GetDescription()
1434 msg_lines, _, footers = git_footers.split_footers(raw_description)
1435 if footers:
1436 msg_lines = msg_lines[:len(msg_lines)-1]
1437 return msg_lines, footers
1438
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001439 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001440 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001442 self.patchset = self._GitGetBranchConfigValue(
1443 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001444 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001445 return self.patchset
1446
1447 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001448 """Set this branch's patchset. If patchset=0, clears the patchset."""
1449 assert self.GetBranch()
1450 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001451 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001452 else:
1453 self.patchset = int(patchset)
1454 self._GitSetBranchConfigValue(
1455 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001456
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001457 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001458 """Set this branch's issue. If issue isn't given, clears the issue."""
1459 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001461 issue = int(issue)
1462 self._GitSetBranchConfigValue(
1463 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001464 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001465 codereview_server = self._codereview_impl.GetCodereviewServer()
1466 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001467 self._GitSetBranchConfigValue(
1468 self._codereview_impl.CodereviewServerConfigKey(),
1469 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001470 else:
tandrii5d48c322016-08-18 16:19:37 -07001471 # Reset all of these just to be clean.
1472 reset_suffixes = [
1473 'last-upload-hash',
1474 self._codereview_impl.IssueConfigKey(),
1475 self._codereview_impl.PatchsetConfigKey(),
1476 self._codereview_impl.CodereviewServerConfigKey(),
1477 ] + self._PostUnsetIssueProperties()
1478 for prop in reset_suffixes:
1479 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001480 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001481 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001482
dnjba1b0f32016-09-02 12:37:42 -07001483 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001484 if not self.GitSanityChecks(upstream_branch):
1485 DieWithError('\nGit sanity check failure')
1486
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001487 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001488 if not root:
1489 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001490 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491
1492 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001493 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001494 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001495 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001496 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001497 except subprocess2.CalledProcessError:
1498 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001499 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001500 'This branch probably doesn\'t exist anymore. To reset the\n'
1501 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001502 ' git branch --set-upstream-to origin/master %s\n'
1503 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001504 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001505
maruel@chromium.org52424302012-08-29 15:14:30 +00001506 issue = self.GetIssue()
1507 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001508 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001509 description = self.GetDescription()
1510 else:
1511 # If the change was never uploaded, use the log messages of all commits
1512 # up to the branch point, as git cl upload will prefill the description
1513 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001514 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1515 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001516
1517 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001518 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001519 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001520 name,
1521 description,
1522 absroot,
1523 files,
1524 issue,
1525 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001526 author,
1527 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001528
dsansomee2d6fd92016-09-08 00:10:47 -07001529 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001530 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001532 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001533
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001534 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1535 """Sets the description for this CL remotely.
1536
1537 You can get description_lines and footers with GetDescriptionFooters.
1538
1539 Args:
1540 description_lines (list(str)) - List of CL description lines without
1541 newline characters.
1542 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1543 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1544 `List-Of-Tokens`). It will be case-normalized so that each token is
1545 title-cased.
1546 """
1547 new_description = '\n'.join(description_lines)
1548 if footers:
1549 new_description += '\n'
1550 for k, v in footers:
1551 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1552 if not git_footers.FOOTER_PATTERN.match(foot):
1553 raise ValueError('Invalid footer %r' % foot)
1554 new_description += foot + '\n'
1555 self.UpdateDescription(new_description, force)
1556
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001557 def RunHook(self, committing, may_prompt, verbose, change):
1558 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1559 try:
1560 return presubmit_support.DoPresubmitChecks(change, committing,
1561 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1562 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001563 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1564 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001565 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001566 DieWithError(
1567 ('%s\nMaybe your depot_tools is out of date?\n'
1568 'If all fails, contact maruel@') % e)
1569
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001570 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1571 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001572 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1573 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001574 else:
1575 # Assume url.
1576 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1577 urlparse.urlparse(issue_arg))
1578 if not parsed_issue_arg or not parsed_issue_arg.valid:
1579 DieWithError('Failed to parse issue argument "%s". '
1580 'Must be an issue number or a valid URL.' % issue_arg)
1581 return self._codereview_impl.CMDPatchWithParsedIssue(
1582 parsed_issue_arg, reject, nocommit, directory)
1583
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584 def CMDUpload(self, options, git_diff_args, orig_args):
1585 """Uploads a change to codereview."""
1586 if git_diff_args:
1587 # TODO(ukai): is it ok for gerrit case?
1588 base_branch = git_diff_args[0]
1589 else:
1590 if self.GetBranch() is None:
1591 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1592
1593 # Default to diffing against common ancestor of upstream branch
1594 base_branch = self.GetCommonAncestorWithUpstream()
1595 git_diff_args = [base_branch, 'HEAD']
1596
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001597 # Fast best-effort checks to abort before running potentially
1598 # expensive hooks if uploading is likely to fail anyway. Passing these
1599 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001601 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602
1603 # Apply watchlists on upload.
1604 change = self.GetChange(base_branch, None)
1605 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1606 files = [f.LocalPath() for f in change.AffectedFiles()]
1607 if not options.bypass_watchlists:
1608 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1609
1610 if not options.bypass_hooks:
1611 if options.reviewers or options.tbr_owners:
1612 # Set the reviewer list now so that presubmit checks can access it.
1613 change_description = ChangeDescription(change.FullDescriptionText())
1614 change_description.update_reviewers(options.reviewers,
1615 options.tbr_owners,
1616 change)
1617 change.SetDescriptionText(change_description.description)
1618 hook_results = self.RunHook(committing=False,
1619 may_prompt=not options.force,
1620 verbose=options.verbose,
1621 change=change)
1622 if not hook_results.should_continue():
1623 return 1
1624 if not options.reviewers and hook_results.reviewers:
1625 options.reviewers = hook_results.reviewers.split(',')
1626
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001627 # TODO(tandrii): Checking local patchset against remote patchset is only
1628 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1629 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001630 latest_patchset = self.GetMostRecentPatchset()
1631 local_patchset = self.GetPatchset()
1632 if (latest_patchset and local_patchset and
1633 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001634 print('The last upload made from this repository was patchset #%d but '
1635 'the most recent patchset on the server is #%d.'
1636 % (local_patchset, latest_patchset))
1637 print('Uploading will still work, but if you\'ve uploaded to this '
1638 'issue from another machine or branch the patch you\'re '
1639 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001640 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001641
1642 print_stats(options.similarity, options.find_copies, git_diff_args)
1643 ret = self.CMDUploadChange(options, git_diff_args, change)
1644 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001645 if options.use_commit_queue:
1646 self.SetCQState(_CQState.COMMIT)
1647 elif options.cq_dry_run:
1648 self.SetCQState(_CQState.DRY_RUN)
1649
tandrii5d48c322016-08-18 16:19:37 -07001650 _git_set_branch_config_value('last-upload-hash',
1651 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652 # Run post upload hooks, if specified.
1653 if settings.GetRunPostUploadHook():
1654 presubmit_support.DoPostUploadExecuter(
1655 change,
1656 self,
1657 settings.GetRoot(),
1658 options.verbose,
1659 sys.stdout)
1660
1661 # Upload all dependencies if specified.
1662 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001663 print()
1664 print('--dependencies has been specified.')
1665 print('All dependent local branches will be re-uploaded.')
1666 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001667 # Remove the dependencies flag from args so that we do not end up in a
1668 # loop.
1669 orig_args.remove('--dependencies')
1670 ret = upload_branch_deps(self, orig_args)
1671 return ret
1672
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001673 def SetCQState(self, new_state):
1674 """Update the CQ state for latest patchset.
1675
1676 Issue must have been already uploaded and known.
1677 """
1678 assert new_state in _CQState.ALL_STATES
1679 assert self.GetIssue()
1680 return self._codereview_impl.SetCQState(new_state)
1681
qyearsley1fdfcb62016-10-24 13:22:03 -07001682 def TriggerDryRun(self):
1683 """Triggers a dry run and prints a warning on failure."""
1684 # TODO(qyearsley): Either re-use this method in CMDset_commit
1685 # and CMDupload, or change CMDtry to trigger dry runs with
1686 # just SetCQState, and catch keyboard interrupt and other
1687 # errors in that method.
1688 try:
1689 self.SetCQState(_CQState.DRY_RUN)
1690 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1691 return 0
1692 except KeyboardInterrupt:
1693 raise
1694 except:
1695 print('WARNING: failed to trigger CQ Dry Run.\n'
1696 'Either:\n'
1697 ' * your project has no CQ\n'
1698 ' * you don\'t have permission to trigger Dry Run\n'
1699 ' * bug in this code (see stack trace below).\n'
1700 'Consider specifying which bots to trigger manually '
1701 'or asking your project owners for permissions '
1702 'or contacting Chrome Infrastructure team at '
1703 'https://www.chromium.org/infra\n\n')
1704 # Still raise exception so that stack trace is printed.
1705 raise
1706
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001707 # Forward methods to codereview specific implementation.
1708
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001709 def AddComment(self, message):
1710 return self._codereview_impl.AddComment(message)
1711
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001712 def GetCommentsSummary(self):
1713 """Returns list of _CommentSummary for each comment.
1714
1715 Note: comments per file or per line are not included,
1716 only top-level comments are returned.
1717 """
1718 return self._codereview_impl.GetCommentsSummary()
1719
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 def CloseIssue(self):
1721 return self._codereview_impl.CloseIssue()
1722
1723 def GetStatus(self):
1724 return self._codereview_impl.GetStatus()
1725
1726 def GetCodereviewServer(self):
1727 return self._codereview_impl.GetCodereviewServer()
1728
tandriide281ae2016-10-12 06:02:30 -07001729 def GetIssueOwner(self):
1730 """Get owner from codereview, which may differ from this checkout."""
1731 return self._codereview_impl.GetIssueOwner()
1732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 def GetApprovingReviewers(self):
1734 return self._codereview_impl.GetApprovingReviewers()
1735
1736 def GetMostRecentPatchset(self):
1737 return self._codereview_impl.GetMostRecentPatchset()
1738
tandriide281ae2016-10-12 06:02:30 -07001739 def CannotTriggerTryJobReason(self):
1740 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1741 return self._codereview_impl.CannotTriggerTryJobReason()
1742
tandrii8c5a3532016-11-04 07:52:02 -07001743 def GetTryjobProperties(self, patchset=None):
1744 """Returns dictionary of properties to launch tryjob."""
1745 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1746
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001747 def __getattr__(self, attr):
1748 # This is because lots of untested code accesses Rietveld-specific stuff
1749 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001750 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001751 # Note that child method defines __getattr__ as well, and forwards it here,
1752 # because _RietveldChangelistImpl is not cleaned up yet, and given
1753 # deprecation of Rietveld, it should probably be just removed.
1754 # Until that time, avoid infinite recursion by bypassing __getattr__
1755 # of implementation class.
1756 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001757
1758
1759class _ChangelistCodereviewBase(object):
1760 """Abstract base class encapsulating codereview specifics of a changelist."""
1761 def __init__(self, changelist):
1762 self._changelist = changelist # instance of Changelist
1763
1764 def __getattr__(self, attr):
1765 # Forward methods to changelist.
1766 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1767 # _RietveldChangelistImpl to avoid this hack?
1768 return getattr(self._changelist, attr)
1769
1770 def GetStatus(self):
1771 """Apply a rough heuristic to give a simple summary of an issue's review
1772 or CQ status, assuming adherence to a common workflow.
1773
1774 Returns None if no issue for this branch, or specific string keywords.
1775 """
1776 raise NotImplementedError()
1777
1778 def GetCodereviewServer(self):
1779 """Returns server URL without end slash, like "https://codereview.com"."""
1780 raise NotImplementedError()
1781
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001782 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001783 """Fetches and returns description from the codereview server."""
1784 raise NotImplementedError()
1785
tandrii5d48c322016-08-18 16:19:37 -07001786 @classmethod
1787 def IssueConfigKey(cls):
1788 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001789 raise NotImplementedError()
1790
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001791 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001792 def PatchsetConfigKey(cls):
1793 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001794 raise NotImplementedError()
1795
tandrii5d48c322016-08-18 16:19:37 -07001796 @classmethod
1797 def CodereviewServerConfigKey(cls):
1798 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001799 raise NotImplementedError()
1800
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001801 def _PostUnsetIssueProperties(self):
1802 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001803 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001804
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001805 def GetRieveldObjForPresubmit(self):
1806 # This is an unfortunate Rietveld-embeddedness in presubmit.
1807 # For non-Rietveld codereviews, this probably should return a dummy object.
1808 raise NotImplementedError()
1809
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001810 def GetGerritObjForPresubmit(self):
1811 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1812 return None
1813
dsansomee2d6fd92016-09-08 00:10:47 -07001814 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001815 """Update the description on codereview site."""
1816 raise NotImplementedError()
1817
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001818 def AddComment(self, message):
1819 """Posts a comment to the codereview site."""
1820 raise NotImplementedError()
1821
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001822 def GetCommentsSummary(self):
1823 raise NotImplementedError()
1824
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 def CloseIssue(self):
1826 """Closes the issue."""
1827 raise NotImplementedError()
1828
1829 def GetApprovingReviewers(self):
1830 """Returns a list of reviewers approving the change.
1831
1832 Note: not necessarily committers.
1833 """
1834 raise NotImplementedError()
1835
1836 def GetMostRecentPatchset(self):
1837 """Returns the most recent patchset number from the codereview site."""
1838 raise NotImplementedError()
1839
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001840 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1841 directory):
1842 """Fetches and applies the issue.
1843
1844 Arguments:
1845 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1846 reject: if True, reject the failed patch instead of switching to 3-way
1847 merge. Rietveld only.
1848 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1849 only.
1850 directory: switch to directory before applying the patch. Rietveld only.
1851 """
1852 raise NotImplementedError()
1853
1854 @staticmethod
1855 def ParseIssueURL(parsed_url):
1856 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1857 failed."""
1858 raise NotImplementedError()
1859
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001860 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001861 """Best effort check that user is authenticated with codereview server.
1862
1863 Arguments:
1864 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001865 refresh: whether to attempt to refresh credentials. Ignored if not
1866 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001867 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001868 raise NotImplementedError()
1869
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001870 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001871 """Best effort check that uploading isn't supposed to fail for predictable
1872 reasons.
1873
1874 This method should raise informative exception if uploading shouldn't
1875 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001876
1877 Arguments:
1878 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001879 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001880 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001881
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001882 def CMDUploadChange(self, options, args, change):
1883 """Uploads a change to codereview."""
1884 raise NotImplementedError()
1885
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001886 def SetCQState(self, new_state):
1887 """Update the CQ state for latest patchset.
1888
1889 Issue must have been already uploaded and known.
1890 """
1891 raise NotImplementedError()
1892
tandriie113dfd2016-10-11 10:20:12 -07001893 def CannotTriggerTryJobReason(self):
1894 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1895 raise NotImplementedError()
1896
tandriide281ae2016-10-12 06:02:30 -07001897 def GetIssueOwner(self):
1898 raise NotImplementedError()
1899
tandrii8c5a3532016-11-04 07:52:02 -07001900 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001901 raise NotImplementedError()
1902
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
1904class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001905 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001906 super(_RietveldChangelistImpl, self).__init__(changelist)
1907 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001908 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001909 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001910
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001911 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001912 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913 self._props = None
1914 self._rpc_server = None
1915
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001916 def GetCodereviewServer(self):
1917 if not self._rietveld_server:
1918 # If we're on a branch then get the server potentially associated
1919 # with that branch.
1920 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001921 self._rietveld_server = gclient_utils.UpgradeToHttps(
1922 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923 if not self._rietveld_server:
1924 self._rietveld_server = settings.GetDefaultServerUrl()
1925 return self._rietveld_server
1926
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001927 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001928 """Best effort check that user is authenticated with Rietveld server."""
1929 if self._auth_config.use_oauth2:
1930 authenticator = auth.get_authenticator_for_host(
1931 self.GetCodereviewServer(), self._auth_config)
1932 if not authenticator.has_cached_credentials():
1933 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001934 if refresh:
1935 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001936
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001937 def EnsureCanUploadPatchset(self, force):
1938 # No checks for Rietveld because we are deprecating Rietveld.
1939 pass
1940
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001941 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 issue = self.GetIssue()
1943 assert issue
1944 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001945 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001946 except urllib2.HTTPError as e:
1947 if e.code == 404:
1948 DieWithError(
1949 ('\nWhile fetching the description for issue %d, received a '
1950 '404 (not found)\n'
1951 'error. It is likely that you deleted this '
1952 'issue on the server. If this is the\n'
1953 'case, please run\n\n'
1954 ' git cl issue 0\n\n'
1955 'to clear the association with the deleted issue. Then run '
1956 'this command again.') % issue)
1957 else:
1958 DieWithError(
1959 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1960 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001961 print('Warning: Failed to retrieve CL description due to network '
1962 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 return ''
1964
1965 def GetMostRecentPatchset(self):
1966 return self.GetIssueProperties()['patchsets'][-1]
1967
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 def GetIssueProperties(self):
1969 if self._props is None:
1970 issue = self.GetIssue()
1971 if not issue:
1972 self._props = {}
1973 else:
1974 self._props = self.RpcServer().get_issue_properties(issue, True)
1975 return self._props
1976
tandriie113dfd2016-10-11 10:20:12 -07001977 def CannotTriggerTryJobReason(self):
1978 props = self.GetIssueProperties()
1979 if not props:
1980 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1981 if props.get('closed'):
1982 return 'CL %s is closed' % self.GetIssue()
1983 if props.get('private'):
1984 return 'CL %s is private' % self.GetIssue()
1985 return None
1986
tandrii8c5a3532016-11-04 07:52:02 -07001987 def GetTryjobProperties(self, patchset=None):
1988 """Returns dictionary of properties to launch tryjob."""
1989 project = (self.GetIssueProperties() or {}).get('project')
1990 return {
1991 'issue': self.GetIssue(),
1992 'patch_project': project,
1993 'patch_storage': 'rietveld',
1994 'patchset': patchset or self.GetPatchset(),
1995 'rietveld': self.GetCodereviewServer(),
1996 }
1997
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001998 def GetApprovingReviewers(self):
1999 return get_approving_reviewers(self.GetIssueProperties())
2000
tandriide281ae2016-10-12 06:02:30 -07002001 def GetIssueOwner(self):
2002 return (self.GetIssueProperties() or {}).get('owner_email')
2003
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002004 def AddComment(self, message):
2005 return self.RpcServer().add_comment(self.GetIssue(), message)
2006
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002007 def GetCommentsSummary(self):
2008 summary = []
2009 for message in self.GetIssueProperties().get('messages', []):
2010 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2011 summary.append(_CommentSummary(
2012 date=date,
2013 disapproval=bool(message['disapproval']),
2014 approval=bool(message['approval']),
2015 sender=message['sender'],
2016 message=message['text'],
2017 ))
2018 return summary
2019
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002020 def GetStatus(self):
2021 """Apply a rough heuristic to give a simple summary of an issue's review
2022 or CQ status, assuming adherence to a common workflow.
2023
2024 Returns None if no issue for this branch, or one of the following keywords:
2025 * 'error' - error from review tool (including deleted issues)
2026 * 'unsent' - not sent for review
2027 * 'waiting' - waiting for review
2028 * 'reply' - waiting for owner to reply to review
2029 * 'lgtm' - LGTM from at least one approved reviewer
2030 * 'commit' - in the commit queue
2031 * 'closed' - closed
2032 """
2033 if not self.GetIssue():
2034 return None
2035
2036 try:
2037 props = self.GetIssueProperties()
2038 except urllib2.HTTPError:
2039 return 'error'
2040
2041 if props.get('closed'):
2042 # Issue is closed.
2043 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002044 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002045 # Issue is in the commit queue.
2046 return 'commit'
2047
2048 try:
2049 reviewers = self.GetApprovingReviewers()
2050 except urllib2.HTTPError:
2051 return 'error'
2052
2053 if reviewers:
2054 # Was LGTM'ed.
2055 return 'lgtm'
2056
2057 messages = props.get('messages') or []
2058
tandrii9d2c7a32016-06-22 03:42:45 -07002059 # Skip CQ messages that don't require owner's action.
2060 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2061 if 'Dry run:' in messages[-1]['text']:
2062 messages.pop()
2063 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2064 # This message always follows prior messages from CQ,
2065 # so skip this too.
2066 messages.pop()
2067 else:
2068 # This is probably a CQ messages warranting user attention.
2069 break
2070
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002071 if not messages:
2072 # No message was sent.
2073 return 'unsent'
2074 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002075 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002076 return 'reply'
2077 return 'waiting'
2078
dsansomee2d6fd92016-09-08 00:10:47 -07002079 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002080 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002081
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002082 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002083 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002084
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002085 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002086 return self.SetFlags({flag: value})
2087
2088 def SetFlags(self, flags):
2089 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002090 """
phajdan.jr68598232016-08-10 03:28:28 -07002091 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002092 try:
tandrii4b233bd2016-07-06 03:50:29 -07002093 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002094 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002095 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002096 if e.code == 404:
2097 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2098 if e.code == 403:
2099 DieWithError(
2100 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002101 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002102 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002103
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002104 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002105 """Returns an upload.RpcServer() to access this review's rietveld instance.
2106 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002107 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002108 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002109 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002110 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002111 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002112
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002113 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002114 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002115 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002116
tandrii5d48c322016-08-18 16:19:37 -07002117 @classmethod
2118 def PatchsetConfigKey(cls):
2119 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002120
tandrii5d48c322016-08-18 16:19:37 -07002121 @classmethod
2122 def CodereviewServerConfigKey(cls):
2123 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002124
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002125 def GetRieveldObjForPresubmit(self):
2126 return self.RpcServer()
2127
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002128 def SetCQState(self, new_state):
2129 props = self.GetIssueProperties()
2130 if props.get('private'):
2131 DieWithError('Cannot set-commit on private issue')
2132
2133 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002134 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002135 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002136 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002137 else:
tandrii4b233bd2016-07-06 03:50:29 -07002138 assert new_state == _CQState.DRY_RUN
2139 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002140
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2142 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 # PatchIssue should never be called with a dirty tree. It is up to the
2144 # caller to check this, but just in case we assert here since the
2145 # consequences of the caller not checking this could be dire.
2146 assert(not git_common.is_dirty_git_tree('apply'))
2147 assert(parsed_issue_arg.valid)
2148 self._changelist.issue = parsed_issue_arg.issue
2149 if parsed_issue_arg.hostname:
2150 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2151
skobes6468b902016-10-24 08:45:10 -07002152 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2153 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2154 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 try:
skobes6468b902016-10-24 08:45:10 -07002156 scm_obj.apply_patch(patchset_object)
2157 except Exception as e:
2158 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 return 1
2160
2161 # If we had an issue, commit the current state and register the issue.
2162 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002163 self.SetIssue(self.GetIssue())
2164 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2166 'patch from issue %(i)s at patchset '
2167 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2168 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002169 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002171 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 return 0
2173
2174 @staticmethod
2175 def ParseIssueURL(parsed_url):
2176 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2177 return None
wychen3c1c1722016-08-04 11:46:36 -07002178 # Rietveld patch: https://domain/<number>/#ps<patchset>
2179 match = re.match(r'/(\d+)/$', parsed_url.path)
2180 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2181 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002182 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002183 issue=int(match.group(1)),
2184 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002185 hostname=parsed_url.netloc,
2186 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 # Typical url: https://domain/<issue_number>[/[other]]
2188 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2189 if match:
skobes6468b902016-10-24 08:45:10 -07002190 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002192 hostname=parsed_url.netloc,
2193 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2195 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2196 if match:
skobes6468b902016-10-24 08:45:10 -07002197 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002198 issue=int(match.group(1)),
2199 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002200 hostname=parsed_url.netloc,
2201 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 return None
2203
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 def CMDUploadChange(self, options, args, change):
2205 """Upload the patch to Rietveld."""
2206 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2207 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2209 if options.emulate_svn_auto_props:
2210 upload_args.append('--emulate_svn_auto_props')
2211
2212 change_desc = None
2213
2214 if options.email is not None:
2215 upload_args.extend(['--email', options.email])
2216
2217 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002218 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 upload_args.extend(['--title', options.title])
2220 if options.message:
2221 upload_args.extend(['--message', options.message])
2222 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002223 print('This branch is associated with issue %s. '
2224 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225 else:
nodirca166002016-06-27 10:59:51 -07002226 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002227 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002228 if options.message:
2229 message = options.message
2230 else:
2231 message = CreateDescriptionFromLog(args)
2232 if options.title:
2233 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002234 change_desc = ChangeDescription(message)
2235 if options.reviewers or options.tbr_owners:
2236 change_desc.update_reviewers(options.reviewers,
2237 options.tbr_owners,
2238 change)
2239 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002240 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241
2242 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002243 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002244 return 1
2245
2246 upload_args.extend(['--message', change_desc.description])
2247 if change_desc.get_reviewers():
2248 upload_args.append('--reviewers=%s' % ','.join(
2249 change_desc.get_reviewers()))
2250 if options.send_mail:
2251 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002252 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002253 upload_args.append('--send_mail')
2254
2255 # We check this before applying rietveld.private assuming that in
2256 # rietveld.cc only addresses which we can send private CLs to are listed
2257 # if rietveld.private is set, and so we should ignore rietveld.cc only
2258 # when --private is specified explicitly on the command line.
2259 if options.private:
2260 logging.warn('rietveld.cc is ignored since private flag is specified. '
2261 'You need to review and add them manually if necessary.')
2262 cc = self.GetCCListWithoutDefault()
2263 else:
2264 cc = self.GetCCList()
2265 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002266 if change_desc.get_cced():
2267 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002268 if cc:
2269 upload_args.extend(['--cc', cc])
2270
2271 if options.private or settings.GetDefaultPrivateFlag() == "True":
2272 upload_args.append('--private')
2273
2274 upload_args.extend(['--git_similarity', str(options.similarity)])
2275 if not options.find_copies:
2276 upload_args.extend(['--git_no_find_copies'])
2277
2278 # Include the upstream repo's URL in the change -- this is useful for
2279 # projects that have their source spread across multiple repos.
2280 remote_url = self.GetGitBaseUrlFromConfig()
2281 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002282 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2283 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2284 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002287 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 if target_ref:
2289 upload_args.extend(['--target_ref', target_ref])
2290
2291 # Look for dependent patchsets. See crbug.com/480453 for more details.
2292 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2293 upstream_branch = ShortBranchName(upstream_branch)
2294 if remote is '.':
2295 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002296 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002298 print()
2299 print('Skipping dependency patchset upload because git config '
2300 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2301 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302 else:
2303 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002304 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002305 auth_config=auth_config)
2306 branch_cl_issue_url = branch_cl.GetIssueURL()
2307 branch_cl_issue = branch_cl.GetIssue()
2308 branch_cl_patchset = branch_cl.GetPatchset()
2309 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2310 upload_args.extend(
2311 ['--depends_on_patchset', '%s:%s' % (
2312 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002313 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002314 '\n'
2315 'The current branch (%s) is tracking a local branch (%s) with '
2316 'an associated CL.\n'
2317 'Adding %s/#ps%s as a dependency patchset.\n'
2318 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2319 branch_cl_patchset))
2320
2321 project = settings.GetProject()
2322 if project:
2323 upload_args.extend(['--project', project])
2324
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 try:
2326 upload_args = ['upload'] + upload_args + args
2327 logging.info('upload.RealMain(%s)', upload_args)
2328 issue, patchset = upload.RealMain(upload_args)
2329 issue = int(issue)
2330 patchset = int(patchset)
2331 except KeyboardInterrupt:
2332 sys.exit(1)
2333 except:
2334 # If we got an exception after the user typed a description for their
2335 # change, back up the description before re-raising.
2336 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002337 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002338 raise
2339
2340 if not self.GetIssue():
2341 self.SetIssue(issue)
2342 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002343 return 0
2344
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002345
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002347 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002348 # auth_config is Rietveld thing, kept here to preserve interface only.
2349 super(_GerritChangelistImpl, self).__init__(changelist)
2350 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002351 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002352 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002353 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002354 # Map from change number (issue) to its detail cache.
2355 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002356
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002357 if codereview_host is not None:
2358 assert not codereview_host.startswith('https://'), codereview_host
2359 self._gerrit_host = codereview_host
2360 self._gerrit_server = 'https://%s' % codereview_host
2361
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002362 def _GetGerritHost(self):
2363 # Lazy load of configs.
2364 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002365 if self._gerrit_host and '.' not in self._gerrit_host:
2366 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2367 # This happens for internal stuff http://crbug.com/614312.
2368 parsed = urlparse.urlparse(self.GetRemoteUrl())
2369 if parsed.scheme == 'sso':
2370 print('WARNING: using non https URLs for remote is likely broken\n'
2371 ' Your current remote is: %s' % self.GetRemoteUrl())
2372 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2373 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002374 return self._gerrit_host
2375
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002376 def _GetGitHost(self):
2377 """Returns git host to be used when uploading change to Gerrit."""
2378 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2379
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002380 def GetCodereviewServer(self):
2381 if not self._gerrit_server:
2382 # If we're on a branch then get the server potentially associated
2383 # with that branch.
2384 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002385 self._gerrit_server = self._GitGetBranchConfigValue(
2386 self.CodereviewServerConfigKey())
2387 if self._gerrit_server:
2388 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002389 if not self._gerrit_server:
2390 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2391 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002392 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002393 parts[0] = parts[0] + '-review'
2394 self._gerrit_host = '.'.join(parts)
2395 self._gerrit_server = 'https://%s' % self._gerrit_host
2396 return self._gerrit_server
2397
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002398 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002399 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002400 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002401
tandrii5d48c322016-08-18 16:19:37 -07002402 @classmethod
2403 def PatchsetConfigKey(cls):
2404 return 'gerritpatchset'
2405
2406 @classmethod
2407 def CodereviewServerConfigKey(cls):
2408 return 'gerritserver'
2409
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002410 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002411 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002412 if settings.GetGerritSkipEnsureAuthenticated():
2413 # For projects with unusual authentication schemes.
2414 # See http://crbug.com/603378.
2415 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002416 # Lazy-loader to identify Gerrit and Git hosts.
2417 if gerrit_util.GceAuthenticator.is_gce():
2418 return
2419 self.GetCodereviewServer()
2420 git_host = self._GetGitHost()
2421 assert self._gerrit_server and self._gerrit_host
2422 cookie_auth = gerrit_util.CookiesAuthenticator()
2423
2424 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2425 git_auth = cookie_auth.get_auth_header(git_host)
2426 if gerrit_auth and git_auth:
2427 if gerrit_auth == git_auth:
2428 return
2429 print((
2430 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2431 ' Check your %s or %s file for credentials of hosts:\n'
2432 ' %s\n'
2433 ' %s\n'
2434 ' %s') %
2435 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2436 git_host, self._gerrit_host,
2437 cookie_auth.get_new_password_message(git_host)))
2438 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002439 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002440 return
2441 else:
2442 missing = (
2443 [] if gerrit_auth else [self._gerrit_host] +
2444 [] if git_auth else [git_host])
2445 DieWithError('Credentials for the following hosts are required:\n'
2446 ' %s\n'
2447 'These are read from %s (or legacy %s)\n'
2448 '%s' % (
2449 '\n '.join(missing),
2450 cookie_auth.get_gitcookies_path(),
2451 cookie_auth.get_netrc_path(),
2452 cookie_auth.get_new_password_message(git_host)))
2453
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002454 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002455 if not self.GetIssue():
2456 return
2457
2458 # Warm change details cache now to avoid RPCs later, reducing latency for
2459 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002460 self._GetChangeDetail(
2461 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002462
2463 status = self._GetChangeDetail()['status']
2464 if status in ('MERGED', 'ABANDONED'):
2465 DieWithError('Change %s has been %s, new uploads are not allowed' %
2466 (self.GetIssueURL(),
2467 'submitted' if status == 'MERGED' else 'abandoned'))
2468
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002469 if gerrit_util.GceAuthenticator.is_gce():
2470 return
2471 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2472 self._GetGerritHost())
2473 if self.GetIssueOwner() == cookies_user:
2474 return
2475 logging.debug('change %s owner is %s, cookies user is %s',
2476 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2477 # Maybe user has linked accounts or smth like that,
2478 # so ask what Gerrit thinks of this user.
2479 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2480 if details['email'] == self.GetIssueOwner():
2481 return
2482 if not force:
2483 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2484 'as %s.\n'
2485 'Uploading may fail due to lack of permissions.' %
2486 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2487 confirm_or_exit(action='upload')
2488
2489
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002490 def _PostUnsetIssueProperties(self):
2491 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002492 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002493
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002494 def GetRieveldObjForPresubmit(self):
2495 class ThisIsNotRietveldIssue(object):
2496 def __nonzero__(self):
2497 # This is a hack to make presubmit_support think that rietveld is not
2498 # defined, yet still ensure that calls directly result in a decent
2499 # exception message below.
2500 return False
2501
2502 def __getattr__(self, attr):
2503 print(
2504 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2505 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2506 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2507 'or use Rietveld for codereview.\n'
2508 'See also http://crbug.com/579160.' % attr)
2509 raise NotImplementedError()
2510 return ThisIsNotRietveldIssue()
2511
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002512 def GetGerritObjForPresubmit(self):
2513 return presubmit_support.GerritAccessor(self._GetGerritHost())
2514
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002515 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002516 """Apply a rough heuristic to give a simple summary of an issue's review
2517 or CQ status, assuming adherence to a common workflow.
2518
2519 Returns None if no issue for this branch, or one of the following keywords:
2520 * 'error' - error from review tool (including deleted issues)
2521 * 'unsent' - no reviewers added
2522 * 'waiting' - waiting for review
2523 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002524 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002525 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002526 * 'commit' - in the commit queue
2527 * 'closed' - abandoned
2528 """
2529 if not self.GetIssue():
2530 return None
2531
2532 try:
2533 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002534 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002535 return 'error'
2536
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002537 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002538 return 'closed'
2539
2540 cq_label = data['labels'].get('Commit-Queue', {})
2541 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002542 votes = cq_label.get('all', [])
2543 highest_vote = 0
2544 for v in votes:
2545 highest_vote = max(highest_vote, v.get('value', 0))
2546 vote_value = str(highest_vote)
2547 if vote_value != '0':
2548 # Add a '+' if the value is not 0 to match the values in the label.
2549 # The cq_label does not have negatives.
2550 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002551 vote_text = cq_label.get('values', {}).get(vote_value, '')
2552 if vote_text.lower() == 'commit':
2553 return 'commit'
2554
2555 lgtm_label = data['labels'].get('Code-Review', {})
2556 if lgtm_label:
2557 if 'rejected' in lgtm_label:
2558 return 'not lgtm'
2559 if 'approved' in lgtm_label:
2560 return 'lgtm'
2561
2562 if not data.get('reviewers', {}).get('REVIEWER', []):
2563 return 'unsent'
2564
2565 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002566 owner = data['owner'].get('_account_id')
2567 while messages:
2568 last_message_author = messages.pop().get('author', {})
2569 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2570 # Ignore replies from CQ.
2571 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002572 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002573 # Some reply from non-owner.
2574 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002575 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002576
2577 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002578 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002579 return data['revisions'][data['current_revision']]['_number']
2580
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002581 def FetchDescription(self, force=False):
2582 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2583 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002584 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002585 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002586
dsansomee2d6fd92016-09-08 00:10:47 -07002587 def UpdateDescriptionRemote(self, description, force=False):
2588 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2589 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002590 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002591 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002592 'unpublished edit. Either publish the edit in the Gerrit web UI '
2593 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002594
2595 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2596 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002597 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002598 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002599
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002600 def AddComment(self, message):
2601 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2602 msg=message)
2603
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002604 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002605 # DETAILED_ACCOUNTS is to get emails in accounts.
2606 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2607 summary = []
2608 for msg in data.get('messages', []):
2609 # Gerrit spits out nanoseconds.
2610 assert len(msg['date'].split('.')[-1]) == 9
2611 date = datetime.datetime.strptime(msg['date'][:-3],
2612 '%Y-%m-%d %H:%M:%S.%f')
2613 summary.append(_CommentSummary(
2614 date=date,
2615 message=msg['message'],
2616 sender=msg['author']['email'],
2617 # These could be inferred from the text messages and correlated with
2618 # Code-Review label maximum, however this is not reliable.
2619 # Leaving as is until the need arises.
2620 approval=False,
2621 disapproval=False,
2622 ))
2623 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002624
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002625 def CloseIssue(self):
2626 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2627
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002628 def GetApprovingReviewers(self):
2629 """Returns a list of reviewers approving the change.
2630
2631 Note: not necessarily committers.
2632 """
2633 raise NotImplementedError()
2634
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002635 def SubmitIssue(self, wait_for_merge=True):
2636 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2637 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002638
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002639 def _GetChangeDetail(self, options=None, issue=None,
2640 no_cache=False):
2641 """Returns details of the issue by querying Gerrit and caching results.
2642
2643 If fresh data is needed, set no_cache=True which will clear cache and
2644 thus new data will be fetched from Gerrit.
2645 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002646 options = options or []
2647 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002648 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002649
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002650 # Optimization to avoid multiple RPCs:
2651 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2652 'CURRENT_COMMIT' not in options):
2653 options.append('CURRENT_COMMIT')
2654
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002655 # Normalize issue and options for consistent keys in cache.
2656 issue = str(issue)
2657 options = [o.upper() for o in options]
2658
2659 # Check in cache first unless no_cache is True.
2660 if no_cache:
2661 self._detail_cache.pop(issue, None)
2662 else:
2663 options_set = frozenset(options)
2664 for cached_options_set, data in self._detail_cache.get(issue, []):
2665 # Assumption: data fetched before with extra options is suitable
2666 # for return for a smaller set of options.
2667 # For example, if we cached data for
2668 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2669 # and request is for options=[CURRENT_REVISION],
2670 # THEN we can return prior cached data.
2671 if options_set.issubset(cached_options_set):
2672 return data
2673
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002674 try:
2675 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2676 options, ignore_404=False)
2677 except gerrit_util.GerritError as e:
2678 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002679 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002680 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002681
2682 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002683 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002684
agable32978d92016-11-01 12:55:02 -07002685 def _GetChangeCommit(self, issue=None):
2686 issue = issue or self.GetIssue()
2687 assert issue, 'issue is required to query Gerrit'
2688 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2689 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002690 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002691 return data
2692
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002693 def CMDLand(self, force, bypass_hooks, verbose):
2694 if git_common.is_dirty_git_tree('land'):
2695 return 1
tandriid60367b2016-06-22 05:25:12 -07002696 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2697 if u'Commit-Queue' in detail.get('labels', {}):
2698 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002699 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2700 'which can test and land changes for you. '
2701 'Are you sure you wish to bypass it?\n',
2702 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002703
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002704 differs = True
tandriic4344b52016-08-29 06:04:54 -07002705 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002706 # Note: git diff outputs nothing if there is no diff.
2707 if not last_upload or RunGit(['diff', last_upload]).strip():
2708 print('WARNING: some changes from local branch haven\'t been uploaded')
2709 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002710 if detail['current_revision'] == last_upload:
2711 differs = False
2712 else:
2713 print('WARNING: local branch contents differ from latest uploaded '
2714 'patchset')
2715 if differs:
2716 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002717 confirm_or_exit(
2718 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2719 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002720 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2721 elif not bypass_hooks:
2722 hook_results = self.RunHook(
2723 committing=True,
2724 may_prompt=not force,
2725 verbose=verbose,
2726 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2727 if not hook_results.should_continue():
2728 return 1
2729
2730 self.SubmitIssue(wait_for_merge=True)
2731 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002732 links = self._GetChangeCommit().get('web_links', [])
2733 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002734 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002735 print('Landed as %s' % link.get('url'))
2736 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002737 return 0
2738
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002739 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2740 directory):
2741 assert not reject
2742 assert not nocommit
2743 assert not directory
2744 assert parsed_issue_arg.valid
2745
2746 self._changelist.issue = parsed_issue_arg.issue
2747
2748 if parsed_issue_arg.hostname:
2749 self._gerrit_host = parsed_issue_arg.hostname
2750 self._gerrit_server = 'https://%s' % self._gerrit_host
2751
tandriic2405f52016-10-10 08:13:15 -07002752 try:
2753 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002754 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002755 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002756
2757 if not parsed_issue_arg.patchset:
2758 # Use current revision by default.
2759 revision_info = detail['revisions'][detail['current_revision']]
2760 patchset = int(revision_info['_number'])
2761 else:
2762 patchset = parsed_issue_arg.patchset
2763 for revision_info in detail['revisions'].itervalues():
2764 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2765 break
2766 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002767 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002768 (parsed_issue_arg.patchset, self.GetIssue()))
2769
2770 fetch_info = revision_info['fetch']['http']
2771 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002772 self.SetIssue(self.GetIssue())
2773 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002774 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002775 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002776 (self.GetIssue(), self.GetPatchset()))
2777 return 0
2778
2779 @staticmethod
2780 def ParseIssueURL(parsed_url):
2781 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2782 return None
2783 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2784 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2785 # Short urls like https://domain/<issue_number> can be used, but don't allow
2786 # specifying the patchset (you'd 404), but we allow that here.
2787 if parsed_url.path == '/':
2788 part = parsed_url.fragment
2789 else:
2790 part = parsed_url.path
2791 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2792 if match:
2793 return _ParsedIssueNumberArgument(
2794 issue=int(match.group(2)),
2795 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002796 hostname=parsed_url.netloc,
2797 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002798 return None
2799
tandrii16e0b4e2016-06-07 10:34:28 -07002800 def _GerritCommitMsgHookCheck(self, offer_removal):
2801 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2802 if not os.path.exists(hook):
2803 return
2804 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2805 # custom developer made one.
2806 data = gclient_utils.FileRead(hook)
2807 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2808 return
2809 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002810 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002811 'and may interfere with it in subtle ways.\n'
2812 'We recommend you remove the commit-msg hook.')
2813 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002814 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002815 gclient_utils.rm_file_or_tree(hook)
2816 print('Gerrit commit-msg hook removed.')
2817 else:
2818 print('OK, will keep Gerrit commit-msg hook in place.')
2819
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002820 def CMDUploadChange(self, options, args, change):
2821 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002822 if options.squash and options.no_squash:
2823 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002824
2825 if not options.squash and not options.no_squash:
2826 # Load default for user, repo, squash=true, in this order.
2827 options.squash = settings.GetSquashGerritUploads()
2828 elif options.no_squash:
2829 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002830
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002831 # We assume the remote called "origin" is the one we want.
2832 # It is probably not worthwhile to support different workflows.
2833 gerrit_remote = 'origin'
2834
2835 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002836 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002837
Aaron Gableb56ad332017-01-06 15:24:31 -08002838 # This may be None; default fallback value is determined in logic below.
2839 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002840 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002841
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002842 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002843 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002844 if self.GetIssue():
2845 # Try to get the message from a previous upload.
2846 message = self.GetDescription()
2847 if not message:
2848 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002849 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002851 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002852 if options.message:
2853 # For compatibility with Rietveld, if -m|--message is given on
2854 # command line, title should be the first line of that message,
2855 # which shouldn't be confused with CL description.
2856 default_title = options.message.strip().split()[0]
2857 else:
2858 default_title = RunGit(
2859 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002860 if options.force:
2861 title = default_title
2862 else:
2863 title = ask_for_data(
2864 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002865 if title == default_title:
2866 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002867 change_id = self._GetChangeDetail()['change_id']
2868 while True:
2869 footer_change_ids = git_footers.get_footer_change_id(message)
2870 if footer_change_ids == [change_id]:
2871 break
2872 if not footer_change_ids:
2873 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002874 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002875 continue
2876 # There is already a valid footer but with different or several ids.
2877 # Doing this automatically is non-trivial as we don't want to lose
2878 # existing other footers, yet we want to append just 1 desired
2879 # Change-Id. Thus, just create a new footer, but let user verify the
2880 # new description.
2881 message = '%s\n\nChange-Id: %s' % (message, change_id)
2882 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002883 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002884 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002885 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886 'Please, check the proposed correction to the description, '
2887 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2888 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2889 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002890 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002891 if not options.force:
2892 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002893 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002894 message = change_desc.description
2895 if not message:
2896 DieWithError("Description is empty. Aborting...")
2897 # Continue the while loop.
2898 # Sanity check of this code - we should end up with proper message
2899 # footer.
2900 assert [change_id] == git_footers.get_footer_change_id(message)
2901 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002902 else: # if not self.GetIssue()
2903 if options.message:
2904 message = options.message
2905 else:
2906 message = CreateDescriptionFromLog(args)
2907 if options.title:
2908 message = options.title + '\n\n' + message
2909 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002910 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002911 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002912 # On first upload, patchset title is always this string, while
2913 # --title flag gets converted to first line of message.
2914 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002915 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002916 if not change_desc.description:
2917 DieWithError("Description is empty. Aborting...")
2918 message = change_desc.description
2919 change_ids = git_footers.get_footer_change_id(message)
2920 if len(change_ids) > 1:
2921 DieWithError('too many Change-Id footers, at most 1 allowed.')
2922 if not change_ids:
2923 # Generate the Change-Id automatically.
2924 message = git_footers.add_footer_change_id(
2925 message, GenerateGerritChangeId(message))
2926 change_desc.set_description(message)
2927 change_ids = git_footers.get_footer_change_id(message)
2928 assert len(change_ids) == 1
2929 change_id = change_ids[0]
2930
2931 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Aaron Gablef97e33d2017-03-30 15:44:27 -07002932 parent = self._ComputeParent(remote, upstream_branch, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002933 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2934 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2935 '-m', message]).strip()
2936 else:
2937 change_desc = ChangeDescription(
2938 options.message or CreateDescriptionFromLog(args))
2939 if not change_desc.description:
2940 DieWithError("Description is empty. Aborting...")
2941
2942 if not git_footers.get_footer_change_id(change_desc.description):
2943 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002944 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2945 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946 ref_to_push = 'HEAD'
2947 parent = '%s/%s' % (gerrit_remote, branch)
2948 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2949
2950 assert change_desc
2951 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2952 ref_to_push)]).splitlines()
2953 if len(commits) > 1:
2954 print('WARNING: This will upload %d commits. Run the following command '
2955 'to see which commits will be uploaded: ' % len(commits))
2956 print('git log %s..%s' % (parent, ref_to_push))
2957 print('You can also use `git squash-branch` to squash these into a '
2958 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002959 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002960
2961 if options.reviewers or options.tbr_owners:
2962 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2963 change)
2964
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002965 # Extra options that can be specified at push time. Doc:
2966 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002967 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002968 if change_desc.get_reviewers(tbr_only=True):
2969 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002970 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002971
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002972
2973 # TODO(tandrii): options.message should be posted as a comment
2974 # if --send-email is set on non-initial upload as Rietveld used to do it.
2975
Aaron Gable9b713dd2016-12-14 16:04:21 -08002976 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002977 if not re.match(r'^[\w ]+$', title):
2978 title = re.sub(r'[^\w ]', '', title)
2979 if not automatic_title:
2980 print('WARNING: Patchset title may only contain alphanumeric chars '
2981 'and spaces. You can edit it in the UI. '
2982 'See https://crbug.com/663787.\n'
2983 'Cleaned up title: %s' % title)
2984 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2985 # reverse on its side.
2986 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002987
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002988 if options.send_mail:
2989 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002990 DieWithError('Must specify reviewers to send email.', change_desc)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002991 refspec_opts.append('notify=ALL')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002992 else:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002993 refspec_opts.append('notify=NONE')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002994
tandrii99a72f22016-08-17 14:33:24 -07002995 reviewers = change_desc.get_reviewers()
2996 if reviewers:
Andrii Shyshkalovfbee1652017-04-10 14:00:51 +02002997 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002998
agablec6787972016-09-09 16:13:34 -07002999 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003000 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07003001
rmistry9eadede2016-09-19 11:22:43 -07003002 if options.topic:
3003 # Documentation on Gerrit topics is here:
3004 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003005 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003006
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003007 refspec_suffix = ''
3008 if refspec_opts:
3009 refspec_suffix = '%' + ','.join(refspec_opts)
3010 assert ' ' not in refspec_suffix, (
3011 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3012 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3013
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003014 try:
3015 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003016 ['git', 'push', self.GetRemoteUrl(), refspec],
3017 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003018 # Flush after every line: useful for seeing progress when running as
3019 # recipe.
3020 filter_fn=lambda _: sys.stdout.flush())
3021 except subprocess2.CalledProcessError:
3022 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003023 'for the reason of the failure.\n'
3024 'Hint: run command below to diangose common Git/Gerrit '
3025 'credential problems:\n'
3026 ' git cl creds-check\n',
3027 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003028
3029 if options.squash:
3030 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3031 change_numbers = [m.group(1)
3032 for m in map(regex.match, push_stdout.splitlines())
3033 if m]
3034 if len(change_numbers) != 1:
3035 DieWithError(
3036 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003037 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003038 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003039 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003040
3041 # Add cc's from the CC_LIST and --cc flag (if any).
3042 cc = self.GetCCList().split(',')
3043 if options.cc:
3044 cc.extend(options.cc)
3045 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003046 if change_desc.get_cced():
3047 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07003048 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08003049 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08003050 self._GetGerritHost(), self.GetIssue(), cc,
3051 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003052 return 0
3053
Aaron Gablef97e33d2017-03-30 15:44:27 -07003054 def _ComputeParent(self, remote, upstream_branch, change_desc):
3055 if remote != '.':
3056 return self.GetCommonAncestorWithUpstream()
3057
3058 # If our upstream branch is local, we base our squashed commit on its
3059 # squashed version.
3060 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3061
3062 # TODO(tandrii): Remove this master-specific hack
3063 # Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=682104
3064 if upstream_branch_name == 'master':
3065 return RunGitSilent(['rev-parse', 'origin/master']).strip()
3066
3067 # Check the squashed hash of the parent.
3068 parent = RunGit(['config',
3069 'branch.%s.gerritsquashhash' % upstream_branch_name],
3070 error_ok=True).strip()
3071 # Verify that the upstream branch has been uploaded too, otherwise
3072 # Gerrit will create additional CLs when uploading.
3073 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3074 RunGitSilent(['rev-parse', parent + ':'])):
3075 DieWithError(
3076 '\nUpload upstream branch %s first.\n'
3077 'It is likely that this branch has been rebased since its last '
3078 'upload, so you just need to upload it again.\n'
3079 '(If you uploaded it with --no-squash, then branch dependencies '
3080 'are not supported, and you should reupload with --squash.)'
3081 % upstream_branch_name,
3082 change_desc)
3083 return parent
3084
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003085 def _AddChangeIdToCommitMessage(self, options, args):
3086 """Re-commits using the current message, assumes the commit hook is in
3087 place.
3088 """
3089 log_desc = options.message or CreateDescriptionFromLog(args)
3090 git_command = ['commit', '--amend', '-m', log_desc]
3091 RunGit(git_command)
3092 new_log_desc = CreateDescriptionFromLog(args)
3093 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003094 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003095 return new_log_desc
3096 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003097 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003098
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003099 def SetCQState(self, new_state):
3100 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003101 vote_map = {
3102 _CQState.NONE: 0,
3103 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003104 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003105 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003106 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3107 if new_state == _CQState.DRY_RUN:
3108 # Don't spam everybody reviewer/owner.
3109 kwargs['notify'] = 'NONE'
3110 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003111
tandriie113dfd2016-10-11 10:20:12 -07003112 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003113 try:
3114 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003115 except GerritChangeNotExists:
3116 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003117
3118 if data['status'] in ('ABANDONED', 'MERGED'):
3119 return 'CL %s is closed' % self.GetIssue()
3120
3121 def GetTryjobProperties(self, patchset=None):
3122 """Returns dictionary of properties to launch tryjob."""
3123 data = self._GetChangeDetail(['ALL_REVISIONS'])
3124 patchset = int(patchset or self.GetPatchset())
3125 assert patchset
3126 revision_data = None # Pylint wants it to be defined.
3127 for revision_data in data['revisions'].itervalues():
3128 if int(revision_data['_number']) == patchset:
3129 break
3130 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003131 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003132 (patchset, self.GetIssue()))
3133 return {
3134 'patch_issue': self.GetIssue(),
3135 'patch_set': patchset or self.GetPatchset(),
3136 'patch_project': data['project'],
3137 'patch_storage': 'gerrit',
3138 'patch_ref': revision_data['fetch']['http']['ref'],
3139 'patch_repository_url': revision_data['fetch']['http']['url'],
3140 'patch_gerrit_url': self.GetCodereviewServer(),
3141 }
tandriie113dfd2016-10-11 10:20:12 -07003142
tandriide281ae2016-10-12 06:02:30 -07003143 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003144 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003145
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003146
3147_CODEREVIEW_IMPLEMENTATIONS = {
3148 'rietveld': _RietveldChangelistImpl,
3149 'gerrit': _GerritChangelistImpl,
3150}
3151
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003152
iannuccie53c9352016-08-17 14:40:40 -07003153def _add_codereview_issue_select_options(parser, extra=""):
3154 _add_codereview_select_options(parser)
3155
3156 text = ('Operate on this issue number instead of the current branch\'s '
3157 'implicit issue.')
3158 if extra:
3159 text += ' '+extra
3160 parser.add_option('-i', '--issue', type=int, help=text)
3161
3162
3163def _process_codereview_issue_select_options(parser, options):
3164 _process_codereview_select_options(parser, options)
3165 if options.issue is not None and not options.forced_codereview:
3166 parser.error('--issue must be specified with either --rietveld or --gerrit')
3167
3168
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003169def _add_codereview_select_options(parser):
3170 """Appends --gerrit and --rietveld options to force specific codereview."""
3171 parser.codereview_group = optparse.OptionGroup(
3172 parser, 'EXPERIMENTAL! Codereview override options')
3173 parser.add_option_group(parser.codereview_group)
3174 parser.codereview_group.add_option(
3175 '--gerrit', action='store_true',
3176 help='Force the use of Gerrit for codereview')
3177 parser.codereview_group.add_option(
3178 '--rietveld', action='store_true',
3179 help='Force the use of Rietveld for codereview')
3180
3181
3182def _process_codereview_select_options(parser, options):
3183 if options.gerrit and options.rietveld:
3184 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3185 options.forced_codereview = None
3186 if options.gerrit:
3187 options.forced_codereview = 'gerrit'
3188 elif options.rietveld:
3189 options.forced_codereview = 'rietveld'
3190
3191
tandriif9aefb72016-07-01 09:06:51 -07003192def _get_bug_line_values(default_project, bugs):
3193 """Given default_project and comma separated list of bugs, yields bug line
3194 values.
3195
3196 Each bug can be either:
3197 * a number, which is combined with default_project
3198 * string, which is left as is.
3199
3200 This function may produce more than one line, because bugdroid expects one
3201 project per line.
3202
3203 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3204 ['v8:123', 'chromium:789']
3205 """
3206 default_bugs = []
3207 others = []
3208 for bug in bugs.split(','):
3209 bug = bug.strip()
3210 if bug:
3211 try:
3212 default_bugs.append(int(bug))
3213 except ValueError:
3214 others.append(bug)
3215
3216 if default_bugs:
3217 default_bugs = ','.join(map(str, default_bugs))
3218 if default_project:
3219 yield '%s:%s' % (default_project, default_bugs)
3220 else:
3221 yield default_bugs
3222 for other in sorted(others):
3223 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3224 yield other
3225
3226
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003227class ChangeDescription(object):
3228 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003229 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003230 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003231 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003232 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003233
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003235 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003236
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003238 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003239 return '\n'.join(self._description_lines)
3240
3241 def set_description(self, desc):
3242 if isinstance(desc, basestring):
3243 lines = desc.splitlines()
3244 else:
3245 lines = [line.rstrip() for line in desc]
3246 while lines and not lines[0]:
3247 lines.pop(0)
3248 while lines and not lines[-1]:
3249 lines.pop(-1)
3250 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003251
piman@chromium.org336f9122014-09-04 02:16:55 +00003252 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003253 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003254 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003255 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003256 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003257 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003258
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 # Get the set of R= and TBR= lines and remove them from the desciption.
3260 regexp = re.compile(self.R_LINE)
3261 matches = [regexp.match(line) for line in self._description_lines]
3262 new_desc = [l for i, l in enumerate(self._description_lines)
3263 if not matches[i]]
3264 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003265
agable@chromium.org42c20792013-09-12 17:34:49 +00003266 # Construct new unified R= and TBR= lines.
3267 r_names = []
3268 tbr_names = []
3269 for match in matches:
3270 if not match:
3271 continue
3272 people = cleanup_list([match.group(2).strip()])
3273 if match.group(1) == 'TBR':
3274 tbr_names.extend(people)
3275 else:
3276 r_names.extend(people)
3277 for name in r_names:
3278 if name not in reviewers:
3279 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003280 if add_owners_tbr:
3281 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003282 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003283 all_reviewers = set(tbr_names + reviewers)
3284 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3285 all_reviewers)
3286 tbr_names.extend(owners_db.reviewers_for(missing_files,
3287 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003288 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3289 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3290
3291 # Put the new lines in the description where the old first R= line was.
3292 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3293 if 0 <= line_loc < len(self._description_lines):
3294 if new_tbr_line:
3295 self._description_lines.insert(line_loc, new_tbr_line)
3296 if new_r_line:
3297 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003298 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003299 if new_r_line:
3300 self.append_footer(new_r_line)
3301 if new_tbr_line:
3302 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003303
Aaron Gable3a16ed12017-03-23 10:51:55 -07003304 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003305 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 self.set_description([
3307 '# Enter a description of the change.',
3308 '# This will be displayed on the codereview site.',
3309 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003310 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003311 '--------------------',
3312 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003313
agable@chromium.org42c20792013-09-12 17:34:49 +00003314 regexp = re.compile(self.BUG_LINE)
3315 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003316 prefix = settings.GetBugPrefix()
3317 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003318 if git_footer:
3319 self.append_footer('Bug: %s' % ', '.join(values))
3320 else:
3321 for value in values:
3322 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003323
agable@chromium.org42c20792013-09-12 17:34:49 +00003324 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003325 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003326 if not content:
3327 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003328 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003329
3330 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003331 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3332 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003333 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003334 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003335
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003336 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003337 """Adds a footer line to the description.
3338
3339 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3340 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3341 that Gerrit footers are always at the end.
3342 """
3343 parsed_footer_line = git_footers.parse_footer(line)
3344 if parsed_footer_line:
3345 # Line is a gerrit footer in the form: Footer-Key: any value.
3346 # Thus, must be appended observing Gerrit footer rules.
3347 self.set_description(
3348 git_footers.add_footer(self.description,
3349 key=parsed_footer_line[0],
3350 value=parsed_footer_line[1]))
3351 return
3352
3353 if not self._description_lines:
3354 self._description_lines.append(line)
3355 return
3356
3357 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3358 if gerrit_footers:
3359 # git_footers.split_footers ensures that there is an empty line before
3360 # actual (gerrit) footers, if any. We have to keep it that way.
3361 assert top_lines and top_lines[-1] == ''
3362 top_lines, separator = top_lines[:-1], top_lines[-1:]
3363 else:
3364 separator = [] # No need for separator if there are no gerrit_footers.
3365
3366 prev_line = top_lines[-1] if top_lines else ''
3367 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3368 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3369 top_lines.append('')
3370 top_lines.append(line)
3371 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003372
tandrii99a72f22016-08-17 14:33:24 -07003373 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003374 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003375 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003376 reviewers = [match.group(2).strip()
3377 for match in matches
3378 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003379 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003380
bradnelsond975b302016-10-23 12:20:23 -07003381 def get_cced(self):
3382 """Retrieves the list of reviewers."""
3383 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3384 cced = [match.group(2).strip() for match in matches if match]
3385 return cleanup_list(cced)
3386
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003387 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3388 """Updates this commit description given the parent.
3389
3390 This is essentially what Gnumbd used to do.
3391 Consult https://goo.gl/WMmpDe for more details.
3392 """
3393 assert parent_msg # No, orphan branch creation isn't supported.
3394 assert parent_hash
3395 assert dest_ref
3396 parent_footer_map = git_footers.parse_footers(parent_msg)
3397 # This will also happily parse svn-position, which GnumbD is no longer
3398 # supporting. While we'd generate correct footers, the verifier plugin
3399 # installed in Gerrit will block such commit (ie git push below will fail).
3400 parent_position = git_footers.get_position(parent_footer_map)
3401
3402 # Cherry-picks may have last line obscuring their prior footers,
3403 # from git_footers perspective. This is also what Gnumbd did.
3404 cp_line = None
3405 if (self._description_lines and
3406 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3407 cp_line = self._description_lines.pop()
3408
3409 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3410
3411 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3412 # user interference with actual footers we'd insert below.
3413 for i, (k, v) in enumerate(parsed_footers):
3414 if k.startswith('Cr-'):
3415 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3416
3417 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003418 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003419 if parent_position[0] == dest_ref:
3420 # Same branch as parent.
3421 number = int(parent_position[1]) + 1
3422 else:
3423 number = 1 # New branch, and extra lineage.
3424 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3425 int(parent_position[1])))
3426
3427 parsed_footers.append(('Cr-Commit-Position',
3428 '%s@{#%d}' % (dest_ref, number)))
3429 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3430
3431 self._description_lines = top_lines
3432 if cp_line:
3433 self._description_lines.append(cp_line)
3434 if self._description_lines[-1] != '':
3435 self._description_lines.append('') # Ensure footer separator.
3436 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3437
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003438
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003439def get_approving_reviewers(props):
3440 """Retrieves the reviewers that approved a CL from the issue properties with
3441 messages.
3442
3443 Note that the list may contain reviewers that are not committer, thus are not
3444 considered by the CQ.
3445 """
3446 return sorted(
3447 set(
3448 message['sender']
3449 for message in props['messages']
3450 if message['approval'] and message['sender'] in props['reviewers']
3451 )
3452 )
3453
3454
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003455def FindCodereviewSettingsFile(filename='codereview.settings'):
3456 """Finds the given file starting in the cwd and going up.
3457
3458 Only looks up to the top of the repository unless an
3459 'inherit-review-settings-ok' file exists in the root of the repository.
3460 """
3461 inherit_ok_file = 'inherit-review-settings-ok'
3462 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003463 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003464 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3465 root = '/'
3466 while True:
3467 if filename in os.listdir(cwd):
3468 if os.path.isfile(os.path.join(cwd, filename)):
3469 return open(os.path.join(cwd, filename))
3470 if cwd == root:
3471 break
3472 cwd = os.path.dirname(cwd)
3473
3474
3475def LoadCodereviewSettingsFromFile(fileobj):
3476 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003477 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003478
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003479 def SetProperty(name, setting, unset_error_ok=False):
3480 fullname = 'rietveld.' + name
3481 if setting in keyvals:
3482 RunGit(['config', fullname, keyvals[setting]])
3483 else:
3484 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3485
tandrii48df5812016-10-17 03:55:37 -07003486 if not keyvals.get('GERRIT_HOST', False):
3487 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003488 # Only server setting is required. Other settings can be absent.
3489 # In that case, we ignore errors raised during option deletion attempt.
3490 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003491 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003492 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3493 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003494 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003495 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3496 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003497 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003498 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3499 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003500
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003501 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003502 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003503
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003504 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003505 RunGit(['config', 'gerrit.squash-uploads',
3506 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003507
tandrii@chromium.org28253532016-04-14 13:46:56 +00003508 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003509 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003510 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3511
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003512 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003513 # should be of the form
3514 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3515 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003516 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3517 keyvals['ORIGIN_URL_CONFIG']])
3518
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003519
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003520def urlretrieve(source, destination):
3521 """urllib is broken for SSL connections via a proxy therefore we
3522 can't use urllib.urlretrieve()."""
3523 with open(destination, 'w') as f:
3524 f.write(urllib2.urlopen(source).read())
3525
3526
ukai@chromium.org712d6102013-11-27 00:52:58 +00003527def hasSheBang(fname):
3528 """Checks fname is a #! script."""
3529 with open(fname) as f:
3530 return f.read(2).startswith('#!')
3531
3532
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003533# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3534def DownloadHooks(*args, **kwargs):
3535 pass
3536
3537
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003538def DownloadGerritHook(force):
3539 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003540
3541 Args:
3542 force: True to update hooks. False to install hooks if not present.
3543 """
3544 if not settings.GetIsGerrit():
3545 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003546 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003547 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3548 if not os.access(dst, os.X_OK):
3549 if os.path.exists(dst):
3550 if not force:
3551 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003552 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003553 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003554 if not hasSheBang(dst):
3555 DieWithError('Not a script: %s\n'
3556 'You need to download from\n%s\n'
3557 'into .git/hooks/commit-msg and '
3558 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003559 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3560 except Exception:
3561 if os.path.exists(dst):
3562 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003563 DieWithError('\nFailed to download hooks.\n'
3564 'You need to download from\n%s\n'
3565 'into .git/hooks/commit-msg and '
3566 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003567
3568
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003569def GetRietveldCodereviewSettingsInteractively():
3570 """Prompt the user for settings."""
3571 server = settings.GetDefaultServerUrl(error_ok=True)
3572 prompt = 'Rietveld server (host[:port])'
3573 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3574 newserver = ask_for_data(prompt + ':')
3575 if not server and not newserver:
3576 newserver = DEFAULT_SERVER
3577 if newserver:
3578 newserver = gclient_utils.UpgradeToHttps(newserver)
3579 if newserver != server:
3580 RunGit(['config', 'rietveld.server', newserver])
3581
3582 def SetProperty(initial, caption, name, is_url):
3583 prompt = caption
3584 if initial:
3585 prompt += ' ("x" to clear) [%s]' % initial
3586 new_val = ask_for_data(prompt + ':')
3587 if new_val == 'x':
3588 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3589 elif new_val:
3590 if is_url:
3591 new_val = gclient_utils.UpgradeToHttps(new_val)
3592 if new_val != initial:
3593 RunGit(['config', 'rietveld.' + name, new_val])
3594
3595 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3596 SetProperty(settings.GetDefaultPrivateFlag(),
3597 'Private flag (rietveld only)', 'private', False)
3598 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3599 'tree-status-url', False)
3600 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3601 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3602 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3603 'run-post-upload-hook', False)
3604
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003605
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003606class _GitCookiesChecker(object):
3607 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003608
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003609 _GOOGLESOURCE = 'googlesource.com'
3610
3611 def __init__(self):
3612 # Cached list of [host, identity, source], where source is either
3613 # .gitcookies or .netrc.
3614 self._all_hosts = None
3615
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003616 def ensure_configured_gitcookies(self):
3617 """Runs checks and suggests fixes to make git use .gitcookies from default
3618 path."""
3619 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3620 configured_path = RunGitSilent(
3621 ['config', '--global', 'http.cookiefile']).strip()
3622 if configured_path:
3623 self._ensure_default_gitcookies_path(configured_path, default)
3624 else:
3625 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003626
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003627 @staticmethod
3628 def _ensure_default_gitcookies_path(configured_path, default_path):
3629 assert configured_path
3630 if configured_path == default_path:
3631 print('git is already configured to use your .gitcookies from %s' %
3632 configured_path)
3633 return
3634
3635 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3636 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3637 (configured_path, default_path))
3638
3639 if not os.path.exists(configured_path):
3640 print('However, your configured .gitcookies file is missing.')
3641 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3642 action='reconfigure')
3643 RunGit(['config', '--global', 'http.cookiefile', default_path])
3644 return
3645
3646 if os.path.exists(default_path):
3647 print('WARNING: default .gitcookies file already exists %s' %
3648 default_path)
3649 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3650 default_path)
3651
3652 confirm_or_exit('Move existing .gitcookies to default location?',
3653 action='move')
3654 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003655 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003656 print('Moved and reconfigured git to use .gitcookies from %s' %
3657 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003658
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003659 @staticmethod
3660 def _configure_gitcookies_path(default_path):
3661 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3662 if os.path.exists(netrc_path):
3663 print('You seem to be using outdated .netrc for git credentials: %s' %
3664 netrc_path)
3665 print('This tool will guide you through setting up recommended '
3666 '.gitcookies store for git credentials.\n'
3667 '\n'
3668 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3669 ' git config --global --unset http.cookiefile\n'
3670 ' mv %s %s.backup\n\n' % (default_path, default_path))
3671 confirm_or_exit(action='setup .gitcookies')
3672 RunGit(['config', '--global', 'http.cookiefile', default_path])
3673 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003674
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003675 def get_hosts_with_creds(self, include_netrc=False):
3676 if self._all_hosts is None:
3677 a = gerrit_util.CookiesAuthenticator()
3678 self._all_hosts = [
3679 (h, u, s)
3680 for h, u, s in itertools.chain(
3681 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3682 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3683 )
3684 if h.endswith(self._GOOGLESOURCE)
3685 ]
3686
3687 if include_netrc:
3688 return self._all_hosts
3689 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3690
3691 def print_current_creds(self, include_netrc=False):
3692 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3693 if not hosts:
3694 print('No Git/Gerrit credentials found')
3695 return
3696 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3697 header = [('Host', 'User', 'Which file'),
3698 ['=' * l for l in lengths]]
3699 for row in (header + hosts):
3700 print('\t'.join((('%%+%ds' % l) % s)
3701 for l, s in zip(lengths, row)))
3702
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003703 @staticmethod
3704 def _parse_identity(identity):
3705 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3706 username, domain = identity.split('.', 1)
3707 if username.startswith('git-'):
3708 username = username[len('git-'):]
3709 return username, domain
3710
3711 def _get_usernames_of_domain(self, domain):
3712 """Returns list of usernames referenced by .gitcookies in a given domain."""
3713 identities_by_domain = {}
3714 for _, identity, _ in self.get_hosts_with_creds():
3715 username, domain = self._parse_identity(identity)
3716 identities_by_domain.setdefault(domain, []).append(username)
3717 return identities_by_domain.get(domain)
3718
3719 def _canonical_git_googlesource_host(self, host):
3720 """Normalizes Gerrit hosts (with '-review') to Git host."""
3721 assert host.endswith(self._GOOGLESOURCE)
3722 # Prefix doesn't include '.' at the end.
3723 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3724 if prefix.endswith('-review'):
3725 prefix = prefix[:-len('-review')]
3726 return prefix + '.' + self._GOOGLESOURCE
3727
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003728 def _canonical_gerrit_googlesource_host(self, host):
3729 git_host = self._canonical_git_googlesource_host(host)
3730 prefix = git_host.split('.', 1)[0]
3731 return prefix + '-review.' + self._GOOGLESOURCE
3732
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003733 def has_generic_host(self):
3734 """Returns whether generic .googlesource.com has been configured.
3735
3736 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3737 """
3738 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3739 if host == '.' + self._GOOGLESOURCE:
3740 return True
3741 return False
3742
3743 def _get_git_gerrit_identity_pairs(self):
3744 """Returns map from canonic host to pair of identities (Git, Gerrit).
3745
3746 One of identities might be None, meaning not configured.
3747 """
3748 host_to_identity_pairs = {}
3749 for host, identity, _ in self.get_hosts_with_creds():
3750 canonical = self._canonical_git_googlesource_host(host)
3751 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3752 idx = 0 if canonical == host else 1
3753 pair[idx] = identity
3754 return host_to_identity_pairs
3755
3756 def get_partially_configured_hosts(self):
3757 return set(
3758 host for host, identities_pair in
3759 self._get_git_gerrit_identity_pairs().iteritems()
3760 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3761
3762 def get_conflicting_hosts(self):
3763 return set(
3764 host for host, (i1, i2) in
3765 self._get_git_gerrit_identity_pairs().iteritems()
3766 if None not in (i1, i2) and i1 != i2)
3767
3768 def get_duplicated_hosts(self):
3769 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3770 return set(host for host, count in counters.iteritems() if count > 1)
3771
3772 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3773 'chromium.googlesource.com': 'chromium.org',
3774 'chrome-internal.googlesource.com': 'google.com',
3775 }
3776
3777 def get_hosts_with_wrong_identities(self):
3778 """Finds hosts which **likely** reference wrong identities.
3779
3780 Note: skips hosts which have conflicting identities for Git and Gerrit.
3781 """
3782 hosts = set()
3783 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3784 pair = self._get_git_gerrit_identity_pairs().get(host)
3785 if pair and pair[0] == pair[1]:
3786 _, domain = self._parse_identity(pair[0])
3787 if domain != expected:
3788 hosts.add(host)
3789 return hosts
3790
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003791 @staticmethod
3792 def print_hosts(hosts, extra_column_func=None):
3793 hosts = sorted(hosts)
3794 assert hosts
3795 if extra_column_func is None:
3796 extras = [''] * len(hosts)
3797 else:
3798 extras = [extra_column_func(host) for host in hosts]
3799 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3800 for he in zip(hosts, extras):
3801 print(tmpl % he)
3802 print()
3803
3804 def find_and_report_problems(self):
3805 """Returns True if there was at least one problem, else False."""
3806 problems = [False]
3807 def add_problem():
3808 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003809 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003810 problems[0] = True
3811
3812 if self.has_generic_host():
3813 add_problem()
3814 print(' .googlesource.com record detected\n'
3815 ' Chrome Infrastructure team recommends to list full host names '
3816 'explicitly.\n')
3817
3818 dups = self.get_duplicated_hosts()
3819 if dups:
3820 add_problem()
3821 print(' The following hosts were defined twice:\n')
3822 self.print_hosts(dups)
3823
3824 partial = self.get_partially_configured_hosts()
3825 if partial:
3826 add_problem()
3827 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3828 'These hosts are missing:')
3829 self.print_hosts(partial)
3830
3831 conflicting = self.get_conflicting_hosts()
3832 if conflicting:
3833 add_problem()
3834 print(' The following Git hosts have differing credentials from their '
3835 'Gerrit counterparts:\n')
3836 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3837 tuple(self._get_git_gerrit_identity_pairs()[host]))
3838
3839 wrong = self.get_hosts_with_wrong_identities()
3840 if wrong:
3841 add_problem()
3842 print(' These hosts likely use wrong identity:\n')
3843 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3844 (self._get_git_gerrit_identity_pairs()[host][0],
3845 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3846 return problems[0]
3847
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003848
3849def CMDcreds_check(parser, args):
3850 """Checks credentials and suggests changes."""
3851 _, _ = parser.parse_args(args)
3852
3853 if gerrit_util.GceAuthenticator.is_gce():
3854 DieWithError('this command is not designed for GCE, are you on a bot?')
3855
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003856 checker = _GitCookiesChecker()
3857 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003858
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003859 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003860 checker.print_current_creds(include_netrc=True)
3861
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003862 if not checker.find_and_report_problems():
3863 print('\nNo problems detected in your .gitcookies')
3864 return 0
3865 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003866
3867
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003868@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003869def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003870 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871
tandrii5d0a0422016-09-14 06:24:35 -07003872 print('WARNING: git cl config works for Rietveld only')
3873 # TODO(tandrii): remove this once we switch to Gerrit.
3874 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003875 parser.add_option('--activate-update', action='store_true',
3876 help='activate auto-updating [rietveld] section in '
3877 '.git/config')
3878 parser.add_option('--deactivate-update', action='store_true',
3879 help='deactivate auto-updating [rietveld] section in '
3880 '.git/config')
3881 options, args = parser.parse_args(args)
3882
3883 if options.deactivate_update:
3884 RunGit(['config', 'rietveld.autoupdate', 'false'])
3885 return
3886
3887 if options.activate_update:
3888 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3889 return
3890
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003891 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003892 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003893 return 0
3894
3895 url = args[0]
3896 if not url.endswith('codereview.settings'):
3897 url = os.path.join(url, 'codereview.settings')
3898
3899 # Load code review settings and download hooks (if available).
3900 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3901 return 0
3902
3903
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003904def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003905 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003906 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3907 branch = ShortBranchName(branchref)
3908 _, args = parser.parse_args(args)
3909 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003910 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003911 return RunGit(['config', 'branch.%s.base-url' % branch],
3912 error_ok=False).strip()
3913 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003914 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003915 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3916 error_ok=False).strip()
3917
3918
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003919def color_for_status(status):
3920 """Maps a Changelist status to color, for CMDstatus and other tools."""
3921 return {
3922 'unsent': Fore.RED,
3923 'waiting': Fore.BLUE,
3924 'reply': Fore.YELLOW,
3925 'lgtm': Fore.GREEN,
3926 'commit': Fore.MAGENTA,
3927 'closed': Fore.CYAN,
3928 'error': Fore.WHITE,
3929 }.get(status, Fore.WHITE)
3930
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003931
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003932def get_cl_statuses(changes, fine_grained, max_processes=None):
3933 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003934
3935 If fine_grained is true, this will fetch CL statuses from the server.
3936 Otherwise, simply indicate if there's a matching url for the given branches.
3937
3938 If max_processes is specified, it is used as the maximum number of processes
3939 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3940 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003941
3942 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003943 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003944 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003945 upload.verbosity = 0
3946
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003947 if not changes:
3948 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003949
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003950 if not fine_grained:
3951 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003952 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003953 for cl in changes:
3954 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003955 return
3956
3957 # First, sort out authentication issues.
3958 logging.debug('ensuring credentials exist')
3959 for cl in changes:
3960 cl.EnsureAuthenticated(force=False, refresh=True)
3961
3962 def fetch(cl):
3963 try:
3964 return (cl, cl.GetStatus())
3965 except:
3966 # See http://crbug.com/629863.
3967 logging.exception('failed to fetch status for %s:', cl)
3968 raise
3969
3970 threads_count = len(changes)
3971 if max_processes:
3972 threads_count = max(1, min(threads_count, max_processes))
3973 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3974
3975 pool = ThreadPool(threads_count)
3976 fetched_cls = set()
3977 try:
3978 it = pool.imap_unordered(fetch, changes).__iter__()
3979 while True:
3980 try:
3981 cl, status = it.next(timeout=5)
3982 except multiprocessing.TimeoutError:
3983 break
3984 fetched_cls.add(cl)
3985 yield cl, status
3986 finally:
3987 pool.close()
3988
3989 # Add any branches that failed to fetch.
3990 for cl in set(changes) - fetched_cls:
3991 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003992
rmistry@google.com2dd99862015-06-22 12:22:18 +00003993
3994def upload_branch_deps(cl, args):
3995 """Uploads CLs of local branches that are dependents of the current branch.
3996
3997 If the local branch dependency tree looks like:
3998 test1 -> test2.1 -> test3.1
3999 -> test3.2
4000 -> test2.2 -> test3.3
4001
4002 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4003 run on the dependent branches in this order:
4004 test2.1, test3.1, test3.2, test2.2, test3.3
4005
4006 Note: This function does not rebase your local dependent branches. Use it when
4007 you make a change to the parent branch that will not conflict with its
4008 dependent branches, and you would like their dependencies updated in
4009 Rietveld.
4010 """
4011 if git_common.is_dirty_git_tree('upload-branch-deps'):
4012 return 1
4013
4014 root_branch = cl.GetBranch()
4015 if root_branch is None:
4016 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4017 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004018 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004019 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4020 'patchset dependencies without an uploaded CL.')
4021
4022 branches = RunGit(['for-each-ref',
4023 '--format=%(refname:short) %(upstream:short)',
4024 'refs/heads'])
4025 if not branches:
4026 print('No local branches found.')
4027 return 0
4028
4029 # Create a dictionary of all local branches to the branches that are dependent
4030 # on it.
4031 tracked_to_dependents = collections.defaultdict(list)
4032 for b in branches.splitlines():
4033 tokens = b.split()
4034 if len(tokens) == 2:
4035 branch_name, tracked = tokens
4036 tracked_to_dependents[tracked].append(branch_name)
4037
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print()
4039 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004040 dependents = []
4041 def traverse_dependents_preorder(branch, padding=''):
4042 dependents_to_process = tracked_to_dependents.get(branch, [])
4043 padding += ' '
4044 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004045 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004046 dependents.append(dependent)
4047 traverse_dependents_preorder(dependent, padding)
4048 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004050
4051 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004053 return 0
4054
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004055 confirm_or_exit('This command will checkout all dependent branches and run '
4056 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004057
andybons@chromium.org962f9462016-02-03 20:00:42 +00004058 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004059 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004060 args.extend(['-t', 'Updated patchset dependency'])
4061
rmistry@google.com2dd99862015-06-22 12:22:18 +00004062 # Record all dependents that failed to upload.
4063 failures = {}
4064 # Go through all dependents, checkout the branch and upload.
4065 try:
4066 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004067 print()
4068 print('--------------------------------------')
4069 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004070 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004071 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004072 try:
4073 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004075 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004076 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004077 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004078 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004079 finally:
4080 # Swap back to the original root branch.
4081 RunGit(['checkout', '-q', root_branch])
4082
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print()
4084 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004085 for dependent_branch in dependents:
4086 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print(' %s : %s' % (dependent_branch, upload_status))
4088 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004089
4090 return 0
4091
4092
kmarshall3bff56b2016-06-06 18:31:47 -07004093def CMDarchive(parser, args):
4094 """Archives and deletes branches associated with closed changelists."""
4095 parser.add_option(
4096 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004097 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004098 parser.add_option(
4099 '-f', '--force', action='store_true',
4100 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004101 parser.add_option(
4102 '-d', '--dry-run', action='store_true',
4103 help='Skip the branch tagging and removal steps.')
4104 parser.add_option(
4105 '-t', '--notags', action='store_true',
4106 help='Do not tag archived branches. '
4107 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004108
4109 auth.add_auth_options(parser)
4110 options, args = parser.parse_args(args)
4111 if args:
4112 parser.error('Unsupported args: %s' % ' '.join(args))
4113 auth_config = auth.extract_auth_config_from_options(options)
4114
4115 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4116 if not branches:
4117 return 0
4118
vapiera7fbd5a2016-06-16 09:17:49 -07004119 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004120 changes = [Changelist(branchref=b, auth_config=auth_config)
4121 for b in branches.splitlines()]
4122 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4123 statuses = get_cl_statuses(changes,
4124 fine_grained=True,
4125 max_processes=options.maxjobs)
4126 proposal = [(cl.GetBranch(),
4127 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4128 for cl, status in statuses
4129 if status == 'closed']
4130 proposal.sort()
4131
4132 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004133 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004134 return 0
4135
4136 current_branch = GetCurrentBranch()
4137
vapiera7fbd5a2016-06-16 09:17:49 -07004138 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004139 if options.notags:
4140 for next_item in proposal:
4141 print(' ' + next_item[0])
4142 else:
4143 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4144 for next_item in proposal:
4145 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004146
kmarshall9249e012016-08-23 12:02:16 -07004147 # Quit now on precondition failure or if instructed by the user, either
4148 # via an interactive prompt or by command line flags.
4149 if options.dry_run:
4150 print('\nNo changes were made (dry run).\n')
4151 return 0
4152 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004153 print('You are currently on a branch \'%s\' which is associated with a '
4154 'closed codereview issue, so archive cannot proceed. Please '
4155 'checkout another branch and run this command again.' %
4156 current_branch)
4157 return 1
kmarshall9249e012016-08-23 12:02:16 -07004158 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004159 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4160 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004162 return 1
4163
4164 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004165 if not options.notags:
4166 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004167 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004168
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004170
4171 return 0
4172
4173
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004174def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004175 """Show status of changelists.
4176
4177 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004178 - Red not sent for review or broken
4179 - Blue waiting for review
4180 - Yellow waiting for you to reply to review
4181 - Green LGTM'ed
4182 - Magenta in the commit queue
4183 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004184
4185 Also see 'git cl comments'.
4186 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004187 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004188 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004189 parser.add_option('-f', '--fast', action='store_true',
4190 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004191 parser.add_option(
4192 '-j', '--maxjobs', action='store', type=int,
4193 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004194
4195 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004196 _add_codereview_issue_select_options(
4197 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004198 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004199 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004200 if args:
4201 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004202 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004203
iannuccie53c9352016-08-17 14:40:40 -07004204 if options.issue is not None and not options.field:
4205 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004206
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004208 cl = Changelist(auth_config=auth_config, issue=options.issue,
4209 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004210 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212 elif options.field == 'id':
4213 issueid = cl.GetIssue()
4214 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004215 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004216 elif options.field == 'patch':
4217 patchset = cl.GetPatchset()
4218 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004219 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004220 elif options.field == 'status':
4221 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004222 elif options.field == 'url':
4223 url = cl.GetIssueURL()
4224 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004225 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004226 return 0
4227
4228 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4229 if not branches:
4230 print('No local branch found.')
4231 return 0
4232
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004233 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004234 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004235 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004236 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004237 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004238 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004239 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004240
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004241 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004242 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4243 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4244 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004245 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004246 c, status = output.next()
4247 branch_statuses[c.GetBranch()] = status
4248 status = branch_statuses.pop(branch)
4249 url = cl.GetIssueURL()
4250 if url and (not status or status == 'error'):
4251 # The issue probably doesn't exist anymore.
4252 url += ' (broken)'
4253
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004254 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004255 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004256 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004257 color = ''
4258 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004259 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004260 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004261 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004262 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004263
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004264
4265 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004266 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004267 print('Current branch: %s' % branch)
4268 for cl in changes:
4269 if cl.GetBranch() == branch:
4270 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004271 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004272 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004273 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004274 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004275 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004276 print('Issue description:')
4277 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004278 return 0
4279
4280
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004281def colorize_CMDstatus_doc():
4282 """To be called once in main() to add colors to git cl status help."""
4283 colors = [i for i in dir(Fore) if i[0].isupper()]
4284
4285 def colorize_line(line):
4286 for color in colors:
4287 if color in line.upper():
4288 # Extract whitespaces first and the leading '-'.
4289 indent = len(line) - len(line.lstrip(' ')) + 1
4290 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4291 return line
4292
4293 lines = CMDstatus.__doc__.splitlines()
4294 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4295
4296
phajdan.jre328cf92016-08-22 04:12:17 -07004297def write_json(path, contents):
4298 with open(path, 'w') as f:
4299 json.dump(contents, f)
4300
4301
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004302@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004303def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004304 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004305
4306 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004307 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004308 parser.add_option('-r', '--reverse', action='store_true',
4309 help='Lookup the branch(es) for the specified issues. If '
4310 'no issues are specified, all branches with mapped '
4311 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004312 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004313 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004314 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004315 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004316
dnj@chromium.org406c4402015-03-03 17:22:28 +00004317 if options.reverse:
4318 branches = RunGit(['for-each-ref', 'refs/heads',
4319 '--format=%(refname:short)']).splitlines()
4320
4321 # Reverse issue lookup.
4322 issue_branch_map = {}
4323 for branch in branches:
4324 cl = Changelist(branchref=branch)
4325 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4326 if not args:
4327 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004328 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004329 for issue in args:
4330 if not issue:
4331 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004332 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004333 print('Branch for issue number %s: %s' % (
4334 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004335 if options.json:
4336 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004337 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004338 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004339 if len(args) > 0:
4340 try:
4341 issue = int(args[0])
4342 except ValueError:
4343 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004344 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004345 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004346 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004347 if options.json:
4348 write_json(options.json, {
4349 'issue': cl.GetIssue(),
4350 'issue_url': cl.GetIssueURL(),
4351 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352 return 0
4353
4354
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004355def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004356 """Shows or posts review comments for any changelist."""
4357 parser.add_option('-a', '--add-comment', dest='comment',
4358 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004359 parser.add_option('-i', '--issue', dest='issue',
4360 help='review issue id (defaults to current issue). '
4361 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004362 parser.add_option('-j', '--json-file',
4363 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004364 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004365 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004366 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004367 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004368 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004369
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004370 issue = None
4371 if options.issue:
4372 try:
4373 issue = int(options.issue)
4374 except ValueError:
4375 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004376 if not options.forced_codereview:
4377 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004378
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004379 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004380 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004381 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004382
4383 if options.comment:
4384 cl.AddComment(options.comment)
4385 return 0
4386
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004387 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4388 for comment in summary:
4389 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004390 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004391 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004392 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004393 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004394 color = Fore.MAGENTA
4395 else:
4396 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004397 print('\n%s%s %s%s\n%s' % (
4398 color,
4399 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4400 comment.sender,
4401 Fore.RESET,
4402 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4403
smut@google.comc85ac942015-09-15 16:34:43 +00004404 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004405 def pre_serialize(c):
4406 dct = c.__dict__.copy()
4407 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4408 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004409 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004410 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004411 return 0
4412
4413
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004414@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004415def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004416 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004417 parser.add_option('-d', '--display', action='store_true',
4418 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004419 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004420 help='New description to set for this issue (- for stdin, '
4421 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004422 parser.add_option('-f', '--force', action='store_true',
4423 help='Delete any unpublished Gerrit edits for this issue '
4424 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004425
4426 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004427 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004428 options, args = parser.parse_args(args)
4429 _process_codereview_select_options(parser, options)
4430
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004431 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004432 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004433 target_issue_arg = ParseIssueNumberArgument(args[0],
4434 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004435 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004436 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004437
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004438 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004439
martiniss6eda05f2016-06-30 10:18:35 -07004440 kwargs = {
4441 'auth_config': auth_config,
4442 'codereview': options.forced_codereview,
4443 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004444 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004445 if target_issue_arg:
4446 kwargs['issue'] = target_issue_arg.issue
4447 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004448 if target_issue_arg.codereview and not options.forced_codereview:
4449 detected_codereview_from_url = True
4450 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004451
4452 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004453 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004454 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004455 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004456
4457 if detected_codereview_from_url:
4458 logging.info('canonical issue/change URL: %s (type: %s)\n',
4459 cl.GetIssueURL(), target_issue_arg.codereview)
4460
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004461 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004462
smut@google.com34fb6b12015-07-13 20:03:26 +00004463 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004464 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004465 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004466
4467 if options.new_description:
4468 text = options.new_description
4469 if text == '-':
4470 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004471 elif text == '+':
4472 base_branch = cl.GetCommonAncestorWithUpstream()
4473 change = cl.GetChange(base_branch, None, local_description=True)
4474 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004475
4476 description.set_description(text)
4477 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004478 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004479
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004480 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004481 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004482 return 0
4483
4484
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485def CreateDescriptionFromLog(args):
4486 """Pulls out the commit log to use as a base for the CL description."""
4487 log_args = []
4488 if len(args) == 1 and not args[0].endswith('.'):
4489 log_args = [args[0] + '..']
4490 elif len(args) == 1 and args[0].endswith('...'):
4491 log_args = [args[0][:-1]]
4492 elif len(args) == 2:
4493 log_args = [args[0] + '..' + args[1]]
4494 else:
4495 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004496 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004497
4498
thestig@chromium.org44202a22014-03-11 19:22:18 +00004499def CMDlint(parser, args):
4500 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004501 parser.add_option('--filter', action='append', metavar='-x,+y',
4502 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004503 auth.add_auth_options(parser)
4504 options, args = parser.parse_args(args)
4505 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004506
4507 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004508 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004509 try:
4510 import cpplint
4511 import cpplint_chromium
4512 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004513 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004514 return 1
4515
4516 # Change the current working directory before calling lint so that it
4517 # shows the correct base.
4518 previous_cwd = os.getcwd()
4519 os.chdir(settings.GetRoot())
4520 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004521 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004522 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4523 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004524 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004525 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004526 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004527
4528 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004529 command = args + files
4530 if options.filter:
4531 command = ['--filter=' + ','.join(options.filter)] + command
4532 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004533
4534 white_regex = re.compile(settings.GetLintRegex())
4535 black_regex = re.compile(settings.GetLintIgnoreRegex())
4536 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4537 for filename in filenames:
4538 if white_regex.match(filename):
4539 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004540 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004541 else:
4542 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4543 extra_check_functions)
4544 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004545 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004546 finally:
4547 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004548 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004549 if cpplint._cpplint_state.error_count != 0:
4550 return 1
4551 return 0
4552
4553
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004555 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004556 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004557 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004558 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004559 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004560 auth.add_auth_options(parser)
4561 options, args = parser.parse_args(args)
4562 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563
sbc@chromium.org71437c02015-04-09 19:29:40 +00004564 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004565 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004566 return 1
4567
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004568 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 if args:
4570 base_branch = args[0]
4571 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004572 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004573 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004574
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004575 cl.RunHook(
4576 committing=not options.upload,
4577 may_prompt=False,
4578 verbose=options.verbose,
4579 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004580 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581
4582
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004583def GenerateGerritChangeId(message):
4584 """Returns Ixxxxxx...xxx change id.
4585
4586 Works the same way as
4587 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4588 but can be called on demand on all platforms.
4589
4590 The basic idea is to generate git hash of a state of the tree, original commit
4591 message, author/committer info and timestamps.
4592 """
4593 lines = []
4594 tree_hash = RunGitSilent(['write-tree'])
4595 lines.append('tree %s' % tree_hash.strip())
4596 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4597 if code == 0:
4598 lines.append('parent %s' % parent.strip())
4599 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4600 lines.append('author %s' % author.strip())
4601 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4602 lines.append('committer %s' % committer.strip())
4603 lines.append('')
4604 # Note: Gerrit's commit-hook actually cleans message of some lines and
4605 # whitespace. This code is not doing this, but it clearly won't decrease
4606 # entropy.
4607 lines.append(message)
4608 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4609 stdin='\n'.join(lines))
4610 return 'I%s' % change_hash.strip()
4611
4612
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004613def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004614 """Computes the remote branch ref to use for the CL.
4615
4616 Args:
4617 remote (str): The git remote for the CL.
4618 remote_branch (str): The git remote branch for the CL.
4619 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004620 """
4621 if not (remote and remote_branch):
4622 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004623
wittman@chromium.org455dc922015-01-26 20:15:50 +00004624 if target_branch:
4625 # Cannonicalize branch references to the equivalent local full symbolic
4626 # refs, which are then translated into the remote full symbolic refs
4627 # below.
4628 if '/' not in target_branch:
4629 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4630 else:
4631 prefix_replacements = (
4632 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4633 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4634 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4635 )
4636 match = None
4637 for regex, replacement in prefix_replacements:
4638 match = re.search(regex, target_branch)
4639 if match:
4640 remote_branch = target_branch.replace(match.group(0), replacement)
4641 break
4642 if not match:
4643 # This is a branch path but not one we recognize; use as-is.
4644 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004645 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4646 # Handle the refs that need to land in different refs.
4647 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004648
wittman@chromium.org455dc922015-01-26 20:15:50 +00004649 # Create the true path to the remote branch.
4650 # Does the following translation:
4651 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4652 # * refs/remotes/origin/master -> refs/heads/master
4653 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4654 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4655 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4656 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4657 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4658 'refs/heads/')
4659 elif remote_branch.startswith('refs/remotes/branch-heads'):
4660 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004661
wittman@chromium.org455dc922015-01-26 20:15:50 +00004662 return remote_branch
4663
4664
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004665def cleanup_list(l):
4666 """Fixes a list so that comma separated items are put as individual items.
4667
4668 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4669 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4670 """
4671 items = sum((i.split(',') for i in l), [])
4672 stripped_items = (i.strip() for i in items)
4673 return sorted(filter(None, stripped_items))
4674
4675
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004676@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004677def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004678 """Uploads the current changelist to codereview.
4679
4680 Can skip dependency patchset uploads for a branch by running:
4681 git config branch.branch_name.skip-deps-uploads True
4682 To unset run:
4683 git config --unset branch.branch_name.skip-deps-uploads
4684 Can also set the above globally by using the --global flag.
4685 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004686 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4687 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004688 parser.add_option('--bypass-watchlists', action='store_true',
4689 dest='bypass_watchlists',
4690 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004691 parser.add_option('-f', action='store_true', dest='force',
4692 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004693 parser.add_option('--message', '-m', dest='message',
4694 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004695 parser.add_option('-b', '--bug',
4696 help='pre-populate the bug number(s) for this issue. '
4697 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004698 parser.add_option('--message-file', dest='message_file',
4699 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004700 parser.add_option('--title', '-t', dest='title',
4701 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004702 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004703 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004704 help='reviewer email addresses')
4705 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004706 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004707 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004708 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004709 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004710 parser.add_option('--emulate_svn_auto_props',
4711 '--emulate-svn-auto-props',
4712 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004713 dest="emulate_svn_auto_props",
4714 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004715 parser.add_option('-c', '--use-commit-queue', action='store_true',
4716 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004717 parser.add_option('--private', action='store_true',
4718 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004719 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004720 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004721 metavar='TARGET',
4722 help='Apply CL to remote ref TARGET. ' +
4723 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004724 parser.add_option('--squash', action='store_true',
4725 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004726 parser.add_option('--no-squash', action='store_true',
4727 help='Don\'t squash multiple commits into one ' +
4728 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004729 parser.add_option('--topic', default=None,
4730 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004731 parser.add_option('--email', default=None,
4732 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004733 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4734 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004735 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4736 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004737 help='Send the patchset to do a CQ dry run right after '
4738 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004739 parser.add_option('--dependencies', action='store_true',
4740 help='Uploads CLs of all the local branches that depend on '
4741 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004742
rmistry@google.com2dd99862015-06-22 12:22:18 +00004743 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004744 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004745 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004746 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004747 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004748 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004749 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004750
sbc@chromium.org71437c02015-04-09 19:29:40 +00004751 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004752 return 1
4753
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004754 options.reviewers = cleanup_list(options.reviewers)
4755 options.cc = cleanup_list(options.cc)
4756
tandriib80458a2016-06-23 12:20:07 -07004757 if options.message_file:
4758 if options.message:
4759 parser.error('only one of --message and --message-file allowed.')
4760 options.message = gclient_utils.FileRead(options.message_file)
4761 options.message_file = None
4762
tandrii4d0545a2016-07-06 03:56:49 -07004763 if options.cq_dry_run and options.use_commit_queue:
4764 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4765
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004766 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4767 settings.GetIsGerrit()
4768
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004769 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004770 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004771
4772
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004773@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004774def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004775 """DEPRECATED: Used to commit the current changelist via git-svn."""
4776 message = ('git-cl no longer supports committing to SVN repositories via '
4777 'git-svn. You probably want to use `git cl land` instead.')
4778 print(message)
4779 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004780
4781
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004782# Two special branches used by git cl land.
4783MERGE_BRANCH = 'git-cl-commit'
4784CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4785
4786
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004787@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004788def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004789 """Commits the current changelist via git.
4790
4791 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4792 upstream and closes the issue automatically and atomically.
4793
4794 Otherwise (in case of Rietveld):
4795 Squashes branch into a single commit.
4796 Updates commit message with metadata (e.g. pointer to review).
4797 Pushes the code upstream.
4798 Updates review and closes.
4799 """
4800 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4801 help='bypass upload presubmit hook')
4802 parser.add_option('-m', dest='message',
4803 help="override review description")
4804 parser.add_option('-f', action='store_true', dest='force',
4805 help="force yes to questions (don't prompt)")
4806 parser.add_option('-c', dest='contributor',
4807 help="external contributor for patch (appended to " +
4808 "description and used as author for git). Should be " +
4809 "formatted as 'First Last <email@example.com>'")
4810 add_git_similarity(parser)
4811 auth.add_auth_options(parser)
4812 (options, args) = parser.parse_args(args)
4813 auth_config = auth.extract_auth_config_from_options(options)
4814
4815 cl = Changelist(auth_config=auth_config)
4816
4817 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4818 if cl.IsGerrit():
4819 if options.message:
4820 # This could be implemented, but it requires sending a new patch to
4821 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4822 # Besides, Gerrit has the ability to change the commit message on submit
4823 # automatically, thus there is no need to support this option (so far?).
4824 parser.error('-m MESSAGE option is not supported for Gerrit.')
4825 if options.contributor:
4826 parser.error(
4827 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4828 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4829 'the contributor\'s "name <email>". If you can\'t upload such a '
4830 'commit for review, contact your repository admin and request'
4831 '"Forge-Author" permission.')
4832 if not cl.GetIssue():
4833 DieWithError('You must upload the change first to Gerrit.\n'
4834 ' If you would rather have `git cl land` upload '
4835 'automatically for you, see http://crbug.com/642759')
4836 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4837 options.verbose)
4838
4839 current = cl.GetBranch()
4840 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4841 if remote == '.':
4842 print()
4843 print('Attempting to push branch %r into another local branch!' % current)
4844 print()
4845 print('Either reparent this branch on top of origin/master:')
4846 print(' git reparent-branch --root')
4847 print()
4848 print('OR run `git rebase-update` if you think the parent branch is ')
4849 print('already committed.')
4850 print()
4851 print(' Current parent: %r' % upstream_branch)
4852 return 1
4853
4854 if not args:
4855 # Default to merging against our best guess of the upstream branch.
4856 args = [cl.GetUpstreamBranch()]
4857
4858 if options.contributor:
4859 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4860 print("Please provide contibutor as 'First Last <email@example.com>'")
4861 return 1
4862
4863 base_branch = args[0]
4864
4865 if git_common.is_dirty_git_tree('land'):
4866 return 1
4867
4868 # This rev-list syntax means "show all commits not in my branch that
4869 # are in base_branch".
4870 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4871 base_branch]).splitlines()
4872 if upstream_commits:
4873 print('Base branch "%s" has %d commits '
4874 'not in this branch.' % (base_branch, len(upstream_commits)))
4875 print('Run "git merge %s" before attempting to land.' % base_branch)
4876 return 1
4877
4878 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4879 if not options.bypass_hooks:
4880 author = None
4881 if options.contributor:
4882 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4883 hook_results = cl.RunHook(
4884 committing=True,
4885 may_prompt=not options.force,
4886 verbose=options.verbose,
4887 change=cl.GetChange(merge_base, author))
4888 if not hook_results.should_continue():
4889 return 1
4890
4891 # Check the tree status if the tree status URL is set.
4892 status = GetTreeStatus()
4893 if 'closed' == status:
4894 print('The tree is closed. Please wait for it to reopen. Use '
4895 '"git cl land --bypass-hooks" to commit on a closed tree.')
4896 return 1
4897 elif 'unknown' == status:
4898 print('Unable to determine tree status. Please verify manually and '
4899 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4900 return 1
4901
4902 change_desc = ChangeDescription(options.message)
4903 if not change_desc.description and cl.GetIssue():
4904 change_desc = ChangeDescription(cl.GetDescription())
4905
4906 if not change_desc.description:
4907 if not cl.GetIssue() and options.bypass_hooks:
4908 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4909 else:
4910 print('No description set.')
4911 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4912 return 1
4913
4914 # Keep a separate copy for the commit message, because the commit message
4915 # contains the link to the Rietveld issue, while the Rietveld message contains
4916 # the commit viewvc url.
4917 if cl.GetIssue():
4918 change_desc.update_reviewers(cl.GetApprovingReviewers())
4919
4920 commit_desc = ChangeDescription(change_desc.description)
4921 if cl.GetIssue():
4922 # Xcode won't linkify this URL unless there is a non-whitespace character
4923 # after it. Add a period on a new line to circumvent this. Also add a space
4924 # before the period to make sure that Gitiles continues to correctly resolve
4925 # the URL.
4926 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4927 if options.contributor:
4928 commit_desc.append_footer('Patch from %s.' % options.contributor)
4929
4930 print('Description:')
4931 print(commit_desc.description)
4932
4933 branches = [merge_base, cl.GetBranchRef()]
4934 if not options.force:
4935 print_stats(options.similarity, options.find_copies, branches)
4936
4937 # We want to squash all this branch's commits into one commit with the proper
4938 # description. We do this by doing a "reset --soft" to the base branch (which
4939 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004940 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004941 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4942 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4943 result = RunGitWithCode(showref_cmd)
4944 if result[0] == 0:
4945 RunGit(['branch', '-D', branch])
4946
4947 # We might be in a directory that's present in this branch but not in the
4948 # trunk. Move up to the top of the tree so that git commands that expect a
4949 # valid CWD won't fail after we check out the merge branch.
4950 rel_base_path = settings.GetRelativeRoot()
4951 if rel_base_path:
4952 os.chdir(rel_base_path)
4953
4954 # Stuff our change into the merge branch.
4955 # We wrap in a try...finally block so if anything goes wrong,
4956 # we clean up the branches.
4957 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004958 revision = None
4959 try:
4960 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4961 RunGit(['reset', '--soft', merge_base])
4962 if options.contributor:
4963 RunGit(
4964 [
4965 'commit', '--author', options.contributor,
4966 '-m', commit_desc.description,
4967 ])
4968 else:
4969 RunGit(['commit', '-m', commit_desc.description])
4970
4971 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4972 mirror = settings.GetGitMirror(remote)
4973 if mirror:
4974 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004975 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004976 else:
4977 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004978 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004979 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4980
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004981 retcode = PushToGitWithAutoRebase(
4982 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004983 if retcode == 0:
4984 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004985 if git_numberer_enabled:
4986 change_desc = ChangeDescription(
4987 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 except: # pylint: disable=bare-except
4989 if _IS_BEING_TESTED:
4990 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4991 + '-' * 30 + '8<' + '-' * 30)
4992 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4993 raise
4994 finally:
4995 # And then swap back to the original branch and clean up.
4996 RunGit(['checkout', '-q', cl.GetBranch()])
4997 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004998 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004999
5000 if not revision:
5001 print('Failed to push. If this persists, please file a bug.')
5002 return 1
5003
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005004 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005005 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005006 if viewvc_url and revision:
5007 change_desc.append_footer(
5008 'Committed: %s%s' % (viewvc_url, revision))
5009 elif revision:
5010 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005011 print('Closing issue '
5012 '(you may be prompted for your codereview password)...')
5013 cl.UpdateDescription(change_desc.description)
5014 cl.CloseIssue()
5015 props = cl.GetIssueProperties()
5016 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005017 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5018 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005019 if options.bypass_hooks:
5020 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5021 else:
5022 comment += ' (presubmit successful).'
5023 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5024
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005025 if os.path.isfile(POSTUPSTREAM_HOOK):
5026 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5027
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005028 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005029
5030
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005031def PushToGitWithAutoRebase(remote, branch, original_description,
5032 git_numberer_enabled, max_attempts=3):
5033 """Pushes current HEAD commit on top of remote's branch.
5034
5035 Attempts to fetch and autorebase on push failures.
5036 Adds git number footers on the fly.
5037
5038 Returns integer code from last command.
5039 """
5040 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5041 code = 0
5042 attempts_left = max_attempts
5043 while attempts_left:
5044 attempts_left -= 1
5045 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5046
5047 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5048 # If fetch fails, retry.
5049 print('Fetching %s/%s...' % (remote, branch))
5050 code, out = RunGitWithCode(
5051 ['retry', 'fetch', remote,
5052 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5053 if code:
5054 print('Fetch failed with exit code %d.' % code)
5055 print(out.strip())
5056 continue
5057
5058 print('Cherry-picking commit on top of latest %s' % branch)
5059 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5060 suppress_stderr=True)
5061 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5062 code, out = RunGitWithCode(['cherry-pick', cherry])
5063 if code:
5064 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5065 'the following files have merge conflicts:' %
5066 (branch, parent_hash))
5067 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5068 print('Please rebase your patch and try again.')
5069 RunGitWithCode(['cherry-pick', '--abort'])
5070 break
5071
5072 commit_desc = ChangeDescription(original_description)
5073 if git_numberer_enabled:
5074 logging.debug('Adding git number footers')
5075 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5076 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5077 branch)
5078 # Ensure timestamps are monotonically increasing.
5079 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5080 _get_committer_timestamp('HEAD'))
5081 _git_amend_head(commit_desc.description, timestamp)
5082
5083 code, out = RunGitWithCode(
5084 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5085 print(out)
5086 if code == 0:
5087 break
5088 if IsFatalPushFailure(out):
5089 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005090 'user.email are correct and you have push access to the repo.\n'
5091 'Hint: run command below to diangose common Git/Gerrit credential '
5092 'problems:\n'
5093 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005094 break
5095 return code
5096
5097
5098def IsFatalPushFailure(push_stdout):
5099 """True if retrying push won't help."""
5100 return '(prohibited by Gerrit)' in push_stdout
5101
5102
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005103@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005104def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005105 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005106 parser.add_option('-b', dest='newbranch',
5107 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005108 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005109 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005110 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5111 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005112 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005113 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005114 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005115 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005116 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005117 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005118
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005119
5120 group = optparse.OptionGroup(
5121 parser,
5122 'Options for continuing work on the current issue uploaded from a '
5123 'different clone (e.g. different machine). Must be used independently '
5124 'from the other options. No issue number should be specified, and the '
5125 'branch must have an issue number associated with it')
5126 group.add_option('--reapply', action='store_true', dest='reapply',
5127 help='Reset the branch and reapply the issue.\n'
5128 'CAUTION: This will undo any local changes in this '
5129 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005130
5131 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005132 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005133 parser.add_option_group(group)
5134
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005135 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005136 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005137 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005138 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005139 auth_config = auth.extract_auth_config_from_options(options)
5140
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005141 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005142 if options.newbranch:
5143 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005144 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005145 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005146
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005147 cl = Changelist(auth_config=auth_config,
5148 codereview=options.forced_codereview)
5149 if not cl.GetIssue():
5150 parser.error('current branch must have an associated issue')
5151
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005152 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005153 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005154 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005155
5156 RunGit(['reset', '--hard', upstream])
5157 if options.pull:
5158 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005159
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005160 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5161 options.directory)
5162
5163 if len(args) != 1 or not args[0]:
5164 parser.error('Must specify issue number or url')
5165
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005166 target_issue_arg = ParseIssueNumberArgument(args[0],
5167 options.forced_codereview)
5168 if not target_issue_arg.valid:
5169 parser.error('invalid codereview url or CL id')
5170
5171 cl_kwargs = {
5172 'auth_config': auth_config,
5173 'codereview_host': target_issue_arg.hostname,
5174 'codereview': options.forced_codereview,
5175 }
5176 detected_codereview_from_url = False
5177 if target_issue_arg.codereview and not options.forced_codereview:
5178 detected_codereview_from_url = True
5179 cl_kwargs['codereview'] = target_issue_arg.codereview
5180 cl_kwargs['issue'] = target_issue_arg.issue
5181
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005182 # We don't want uncommitted changes mixed up with the patch.
5183 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005184 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005185
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005186 if options.newbranch:
5187 if options.force:
5188 RunGit(['branch', '-D', options.newbranch],
5189 stderr=subprocess2.PIPE, error_ok=True)
5190 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005191 elif not GetCurrentBranch():
5192 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005193
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005194 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005195
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005196 if cl.IsGerrit():
5197 if options.reject:
5198 parser.error('--reject is not supported with Gerrit codereview.')
5199 if options.nocommit:
5200 parser.error('--nocommit is not supported with Gerrit codereview.')
5201 if options.directory:
5202 parser.error('--directory is not supported with Gerrit codereview.')
5203
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005204 if detected_codereview_from_url:
5205 print('canonical issue/change URL: %s (type: %s)\n' %
5206 (cl.GetIssueURL(), target_issue_arg.codereview))
5207
5208 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5209 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005210
5211
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005212def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 """Fetches the tree status and returns either 'open', 'closed',
5214 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005215 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005216 if url:
5217 status = urllib2.urlopen(url).read().lower()
5218 if status.find('closed') != -1 or status == '0':
5219 return 'closed'
5220 elif status.find('open') != -1 or status == '1':
5221 return 'open'
5222 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223 return 'unset'
5224
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005225
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226def GetTreeStatusReason():
5227 """Fetches the tree status from a json url and returns the message
5228 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005229 url = settings.GetTreeStatusUrl()
5230 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005231 connection = urllib2.urlopen(json_url)
5232 status = json.loads(connection.read())
5233 connection.close()
5234 return status['message']
5235
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005236
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005237def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005238 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005239 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005240 status = GetTreeStatus()
5241 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005242 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005243 return 2
5244
vapiera7fbd5a2016-06-16 09:17:49 -07005245 print('The tree is %s' % status)
5246 print()
5247 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005248 if status != 'open':
5249 return 1
5250 return 0
5251
5252
maruel@chromium.org15192402012-09-06 12:38:29 +00005253def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005254 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005255 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005256 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005257 '-b', '--bot', action='append',
5258 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5259 'times to specify multiple builders. ex: '
5260 '"-b win_rel -b win_layout". See '
5261 'the try server waterfall for the builders name and the tests '
5262 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005263 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005264 '-B', '--bucket', default='',
5265 help=('Buildbucket bucket to send the try requests.'))
5266 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005267 '-m', '--master', default='',
5268 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005269 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005270 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005271 help='Revision to use for the try job; default: the revision will '
5272 'be determined by the try recipe that builder runs, which usually '
5273 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005274 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005275 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005276 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005277 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005278 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005279 '--project',
5280 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005281 'in recipe to determine to which repository or directory to '
5282 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005283 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005284 '-p', '--property', dest='properties', action='append', default=[],
5285 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005286 'key2=value2 etc. The value will be treated as '
5287 'json if decodable, or as string otherwise. '
5288 'NOTE: using this may make your try job not usable for CQ, '
5289 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005290 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005291 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5292 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005293 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005294 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005295 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005296 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005297
machenbach@chromium.org45453142015-09-15 08:45:22 +00005298 # Make sure that all properties are prop=value pairs.
5299 bad_params = [x for x in options.properties if '=' not in x]
5300 if bad_params:
5301 parser.error('Got properties with missing "=": %s' % bad_params)
5302
maruel@chromium.org15192402012-09-06 12:38:29 +00005303 if args:
5304 parser.error('Unknown arguments: %s' % args)
5305
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005306 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005307 if not cl.GetIssue():
5308 parser.error('Need to upload first')
5309
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005310 if cl.IsGerrit():
5311 # HACK: warm up Gerrit change detail cache to save on RPCs.
5312 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5313
tandriie113dfd2016-10-11 10:20:12 -07005314 error_message = cl.CannotTriggerTryJobReason()
5315 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005316 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005317
borenet6c0efe62016-10-19 08:13:29 -07005318 if options.bucket and options.master:
5319 parser.error('Only one of --bucket and --master may be used.')
5320
qyearsley1fdfcb62016-10-24 13:22:03 -07005321 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005322
qyearsleydd49f942016-10-28 11:57:22 -07005323 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5324 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005325 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005326 if options.verbose:
5327 print('git cl try with no bots now defaults to CQ Dry Run.')
5328 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005329
borenet6c0efe62016-10-19 08:13:29 -07005330 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005331 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005332 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005333 'of bot requires an initial job from a parent (usually a builder). '
5334 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005335 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005336 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005337
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005338 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005339 # TODO(tandrii): Checking local patchset against remote patchset is only
5340 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5341 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005342 print('Warning: Codereview server has newer patchsets (%s) than most '
5343 'recent upload from local checkout (%s). Did a previous upload '
5344 'fail?\n'
5345 'By default, git cl try uses the latest patchset from '
5346 'codereview, continuing to use patchset %s.\n' %
5347 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005348
tandrii568043b2016-10-11 07:49:18 -07005349 try:
borenet6c0efe62016-10-19 08:13:29 -07005350 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5351 patchset)
tandrii568043b2016-10-11 07:49:18 -07005352 except BuildbucketResponseException as ex:
5353 print('ERROR: %s' % ex)
5354 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005355 return 0
5356
5357
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005358def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005359 """Prints info about try jobs associated with current CL."""
5360 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005363 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005364 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005365 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005366 '--color', action='store_true', default=setup_color.IS_TTY,
5367 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005368 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005369 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5370 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005371 group.add_option(
5372 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005373 parser.add_option_group(group)
5374 auth.add_auth_options(parser)
5375 options, args = parser.parse_args(args)
5376 if args:
5377 parser.error('Unrecognized args: %s' % ' '.join(args))
5378
5379 auth_config = auth.extract_auth_config_from_options(options)
5380 cl = Changelist(auth_config=auth_config)
5381 if not cl.GetIssue():
5382 parser.error('Need to upload first')
5383
tandrii221ab252016-10-06 08:12:04 -07005384 patchset = options.patchset
5385 if not patchset:
5386 patchset = cl.GetMostRecentPatchset()
5387 if not patchset:
5388 parser.error('Codereview doesn\'t know about issue %s. '
5389 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005390 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005391 cl.GetIssue())
5392
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005393 # TODO(tandrii): Checking local patchset against remote patchset is only
5394 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5395 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005396 print('Warning: Codereview server has newer patchsets (%s) than most '
5397 'recent upload from local checkout (%s). Did a previous upload '
5398 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005399 'By default, git cl try-results uses the latest patchset from '
5400 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005401 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005402 try:
tandrii221ab252016-10-06 08:12:04 -07005403 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005404 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005405 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005406 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005407 if options.json:
5408 write_try_results_json(options.json, jobs)
5409 else:
5410 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005411 return 0
5412
5413
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005414@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005415def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005416 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005417 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005418 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005419 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005420
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005421 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005422 if args:
5423 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005424 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005425 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005426 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005427 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005428
5429 # Clear configured merge-base, if there is one.
5430 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005431 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005432 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005433 return 0
5434
5435
thestig@chromium.org00858c82013-12-02 23:08:03 +00005436def CMDweb(parser, args):
5437 """Opens the current CL in the web browser."""
5438 _, args = parser.parse_args(args)
5439 if args:
5440 parser.error('Unrecognized args: %s' % ' '.join(args))
5441
5442 issue_url = Changelist().GetIssueURL()
5443 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005444 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005445 return 1
5446
5447 webbrowser.open(issue_url)
5448 return 0
5449
5450
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005451def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005452 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005453 parser.add_option('-d', '--dry-run', action='store_true',
5454 help='trigger in dry run mode')
5455 parser.add_option('-c', '--clear', action='store_true',
5456 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005457 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005458 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005459 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005460 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005461 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005462 if args:
5463 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005464 if options.dry_run and options.clear:
5465 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5466
iannuccie53c9352016-08-17 14:40:40 -07005467 cl = Changelist(auth_config=auth_config, issue=options.issue,
5468 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005469 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005470 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005471 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005472 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005473 state = _CQState.DRY_RUN
5474 else:
5475 state = _CQState.COMMIT
5476 if not cl.GetIssue():
5477 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005478 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005479 return 0
5480
5481
groby@chromium.org411034a2013-02-26 15:12:01 +00005482def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005483 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005484 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005485 auth.add_auth_options(parser)
5486 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005487 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005488 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005489 if args:
5490 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005491 cl = Changelist(auth_config=auth_config, issue=options.issue,
5492 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005493 # Ensure there actually is an issue to close.
5494 cl.GetDescription()
5495 cl.CloseIssue()
5496 return 0
5497
5498
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005499def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005500 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005501 parser.add_option(
5502 '--stat',
5503 action='store_true',
5504 dest='stat',
5505 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005506 auth.add_auth_options(parser)
5507 options, args = parser.parse_args(args)
5508 auth_config = auth.extract_auth_config_from_options(options)
5509 if args:
5510 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005511
5512 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005513 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005514 # Staged changes would be committed along with the patch from last
5515 # upload, hence counted toward the "last upload" side in the final
5516 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005517 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005518 return 1
5519
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005520 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005521 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005522 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005523 if not issue:
5524 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005525 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005526 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005527
5528 # Create a new branch based on the merge-base
5529 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005530 # Clear cached branch in cl object, to avoid overwriting original CL branch
5531 # properties.
5532 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005533 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005534 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005535 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005536 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005537 return rtn
5538
wychen@chromium.org06928532015-02-03 02:11:29 +00005539 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005540 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005541 cmd = ['git', 'diff']
5542 if options.stat:
5543 cmd.append('--stat')
5544 cmd.extend([TMP_BRANCH, branch, '--'])
5545 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005546 finally:
5547 RunGit(['checkout', '-q', branch])
5548 RunGit(['branch', '-D', TMP_BRANCH])
5549
5550 return 0
5551
5552
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005553def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005554 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005555 parser.add_option(
5556 '--no-color',
5557 action='store_true',
5558 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005559 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005560 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005561 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005562
5563 author = RunGit(['config', 'user.email']).strip() or None
5564
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005565 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005566
5567 if args:
5568 if len(args) > 1:
5569 parser.error('Unknown args')
5570 base_branch = args[0]
5571 else:
5572 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005573 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005574
5575 change = cl.GetChange(base_branch, None)
5576 return owners_finder.OwnersFinder(
5577 [f.LocalPath() for f in
5578 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005579 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005580 author, fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005581 disable_color=options.no_color).run()
5582
5583
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005584def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005585 """Generates a diff command."""
5586 # Generate diff for the current branch's changes.
5587 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005588 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005589
5590 if args:
5591 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005592 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005593 diff_cmd.append(arg)
5594 else:
5595 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005596
5597 return diff_cmd
5598
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005599
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005600def MatchingFileType(file_name, extensions):
5601 """Returns true if the file name ends with one of the given extensions."""
5602 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005603
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005604
enne@chromium.org555cfe42014-01-29 18:21:39 +00005605@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005606def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005607 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005608 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005609 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005610 parser.add_option('--full', action='store_true',
5611 help='Reformat the full content of all touched files')
5612 parser.add_option('--dry-run', action='store_true',
5613 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005614 parser.add_option('--python', action='store_true',
5615 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005616 parser.add_option('--js', action='store_true',
5617 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005618 parser.add_option('--diff', action='store_true',
5619 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005620 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005621
Daniel Chengc55eecf2016-12-30 03:11:02 -08005622 # Normalize any remaining args against the current path, so paths relative to
5623 # the current directory are still resolved as expected.
5624 args = [os.path.join(os.getcwd(), arg) for arg in args]
5625
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005626 # git diff generates paths against the root of the repository. Change
5627 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005628 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005629 if rel_base_path:
5630 os.chdir(rel_base_path)
5631
digit@chromium.org29e47272013-05-17 17:01:46 +00005632 # Grab the merge-base commit, i.e. the upstream commit of the current
5633 # branch when it was created or the last time it was rebased. This is
5634 # to cover the case where the user may have called "git fetch origin",
5635 # moving the origin branch to a newer commit, but hasn't rebased yet.
5636 upstream_commit = None
5637 cl = Changelist()
5638 upstream_branch = cl.GetUpstreamBranch()
5639 if upstream_branch:
5640 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5641 upstream_commit = upstream_commit.strip()
5642
5643 if not upstream_commit:
5644 DieWithError('Could not find base commit for this branch. '
5645 'Are you in detached state?')
5646
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005647 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5648 diff_output = RunGit(changed_files_cmd)
5649 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005650 # Filter out files deleted by this CL
5651 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005652
Christopher Lamc5ba6922017-01-24 11:19:14 +11005653 if opts.js:
5654 CLANG_EXTS.append('.js')
5655
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005656 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5657 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5658 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005659 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005660
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005661 top_dir = os.path.normpath(
5662 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5663
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005664 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5665 # formatted. This is used to block during the presubmit.
5666 return_value = 0
5667
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005668 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005669 # Locate the clang-format binary in the checkout
5670 try:
5671 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005672 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005673 DieWithError(e)
5674
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005675 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005676 cmd = [clang_format_tool]
5677 if not opts.dry_run and not opts.diff:
5678 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005679 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005680 if opts.diff:
5681 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005682 else:
5683 env = os.environ.copy()
5684 env['PATH'] = str(os.path.dirname(clang_format_tool))
5685 try:
5686 script = clang_format.FindClangFormatScriptInChromiumTree(
5687 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005688 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005689 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005690
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005691 cmd = [sys.executable, script, '-p0']
5692 if not opts.dry_run and not opts.diff:
5693 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005694
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005695 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5696 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005697
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005698 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5699 if opts.diff:
5700 sys.stdout.write(stdout)
5701 if opts.dry_run and len(stdout) > 0:
5702 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005703
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005704 # Similar code to above, but using yapf on .py files rather than clang-format
5705 # on C/C++ files
5706 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005707 yapf_tool = gclient_utils.FindExecutable('yapf')
5708 if yapf_tool is None:
5709 DieWithError('yapf not found in PATH')
5710
5711 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005712 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005713 cmd = [yapf_tool]
5714 if not opts.dry_run and not opts.diff:
5715 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005716 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005717 if opts.diff:
5718 sys.stdout.write(stdout)
5719 else:
5720 # TODO(sbc): yapf --lines mode still has some issues.
5721 # https://github.com/google/yapf/issues/154
5722 DieWithError('--python currently only works with --full')
5723
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005724 # Dart's formatter does not have the nice property of only operating on
5725 # modified chunks, so hard code full.
5726 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005727 try:
5728 command = [dart_format.FindDartFmtToolInChromiumTree()]
5729 if not opts.dry_run and not opts.diff:
5730 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005731 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005732
ppi@chromium.org6593d932016-03-03 15:41:15 +00005733 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005734 if opts.dry_run and stdout:
5735 return_value = 2
5736 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005737 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5738 'found in this checkout. Files in other languages are still '
5739 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005740
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005741 # Format GN build files. Always run on full build files for canonical form.
5742 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005743 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005744 if opts.dry_run or opts.diff:
5745 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005746 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005747 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5748 shell=sys.platform == 'win32',
5749 cwd=top_dir)
5750 if opts.dry_run and gn_ret == 2:
5751 return_value = 2 # Not formatted.
5752 elif opts.diff and gn_ret == 2:
5753 # TODO this should compute and print the actual diff.
5754 print("This change has GN build file diff for " + gn_diff_file)
5755 elif gn_ret != 0:
5756 # For non-dry run cases (and non-2 return values for dry-run), a
5757 # nonzero error code indicates a failure, probably because the file
5758 # doesn't parse.
5759 DieWithError("gn format failed on " + gn_diff_file +
5760 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005761
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005762 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005763 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5764 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5765 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005766 for xml_file in metrics_xml_files:
5767 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005768 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5769 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005770 if opts.dry_run or opts.diff:
5771 cmd.append('--diff')
5772 stdout = RunCommand(cmd, cwd=top_dir)
5773 if opts.diff:
5774 sys.stdout.write(stdout)
5775 if opts.dry_run and stdout:
5776 return_value = 2 # Not formatted.
5777
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005778 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005779
5780
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005781@subcommand.usage('<codereview url or issue id>')
5782def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005783 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005784 _, args = parser.parse_args(args)
5785
5786 if len(args) != 1:
5787 parser.print_help()
5788 return 1
5789
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005790 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005791 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005792 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005793
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005794 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005795
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005796 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005797 output = RunGit(['config', '--local', '--get-regexp',
5798 r'branch\..*\.%s' % issueprefix],
5799 error_ok=True)
5800 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005801 if issue == target_issue:
5802 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005803
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005804 branches = []
5805 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005806 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005807 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005808 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005809 return 1
5810 if len(branches) == 1:
5811 RunGit(['checkout', branches[0]])
5812 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005813 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005814 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005815 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005816 which = raw_input('Choose by index: ')
5817 try:
5818 RunGit(['checkout', branches[int(which)]])
5819 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005820 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005821 return 1
5822
5823 return 0
5824
5825
maruel@chromium.org29404b52014-09-08 22:58:00 +00005826def CMDlol(parser, args):
5827 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005828 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005829 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5830 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5831 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005832 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005833 return 0
5834
5835
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005836class OptionParser(optparse.OptionParser):
5837 """Creates the option parse and add --verbose support."""
5838 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005839 optparse.OptionParser.__init__(
5840 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005841 self.add_option(
5842 '-v', '--verbose', action='count', default=0,
5843 help='Use 2 times for more debugging info')
5844
5845 def parse_args(self, args=None, values=None):
5846 options, args = optparse.OptionParser.parse_args(self, args, values)
5847 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005848 logging.basicConfig(
5849 level=levels[min(options.verbose, len(levels) - 1)],
5850 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5851 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005852 return options, args
5853
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005854
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005855def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005856 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005857 print('\nYour python version %s is unsupported, please upgrade.\n' %
5858 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005859 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005860
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005861 # Reload settings.
5862 global settings
5863 settings = Settings()
5864
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005865 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005866 dispatcher = subcommand.CommandDispatcher(__name__)
5867 try:
5868 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005869 except auth.AuthenticationError as e:
5870 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005871 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005872 if e.code != 500:
5873 raise
5874 DieWithError(
5875 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5876 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005877 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005878
5879
5880if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005881 # These affect sys.stdout so do it outside of main() to simplify mocks in
5882 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005883 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005884 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005885 try:
5886 sys.exit(main(sys.argv[1:]))
5887 except KeyboardInterrupt:
5888 sys.stderr.write('interrupted\n')
5889 sys.exit(1)