blob: 78a212c0ae900dbea582b53d4cf127269f38c936 [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."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001586 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001588 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589 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:
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001611 if options.reviewers or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001612 # 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,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001615 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616 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)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001643 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001644 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 GetMostRecentPatchset(self):
1734 return self._codereview_impl.GetMostRecentPatchset()
1735
tandriide281ae2016-10-12 06:02:30 -07001736 def CannotTriggerTryJobReason(self):
1737 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1738 return self._codereview_impl.CannotTriggerTryJobReason()
1739
tandrii8c5a3532016-11-04 07:52:02 -07001740 def GetTryjobProperties(self, patchset=None):
1741 """Returns dictionary of properties to launch tryjob."""
1742 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1743
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001744 def __getattr__(self, attr):
1745 # This is because lots of untested code accesses Rietveld-specific stuff
1746 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001747 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001748 # Note that child method defines __getattr__ as well, and forwards it here,
1749 # because _RietveldChangelistImpl is not cleaned up yet, and given
1750 # deprecation of Rietveld, it should probably be just removed.
1751 # Until that time, avoid infinite recursion by bypassing __getattr__
1752 # of implementation class.
1753 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754
1755
1756class _ChangelistCodereviewBase(object):
1757 """Abstract base class encapsulating codereview specifics of a changelist."""
1758 def __init__(self, changelist):
1759 self._changelist = changelist # instance of Changelist
1760
1761 def __getattr__(self, attr):
1762 # Forward methods to changelist.
1763 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1764 # _RietveldChangelistImpl to avoid this hack?
1765 return getattr(self._changelist, attr)
1766
1767 def GetStatus(self):
1768 """Apply a rough heuristic to give a simple summary of an issue's review
1769 or CQ status, assuming adherence to a common workflow.
1770
1771 Returns None if no issue for this branch, or specific string keywords.
1772 """
1773 raise NotImplementedError()
1774
1775 def GetCodereviewServer(self):
1776 """Returns server URL without end slash, like "https://codereview.com"."""
1777 raise NotImplementedError()
1778
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001779 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001780 """Fetches and returns description from the codereview server."""
1781 raise NotImplementedError()
1782
tandrii5d48c322016-08-18 16:19:37 -07001783 @classmethod
1784 def IssueConfigKey(cls):
1785 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 raise NotImplementedError()
1787
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001788 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001789 def PatchsetConfigKey(cls):
1790 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 raise NotImplementedError()
1792
tandrii5d48c322016-08-18 16:19:37 -07001793 @classmethod
1794 def CodereviewServerConfigKey(cls):
1795 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 raise NotImplementedError()
1797
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001798 def _PostUnsetIssueProperties(self):
1799 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001800 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001801
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001802 def GetRieveldObjForPresubmit(self):
1803 # This is an unfortunate Rietveld-embeddedness in presubmit.
1804 # For non-Rietveld codereviews, this probably should return a dummy object.
1805 raise NotImplementedError()
1806
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001807 def GetGerritObjForPresubmit(self):
1808 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1809 return None
1810
dsansomee2d6fd92016-09-08 00:10:47 -07001811 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812 """Update the description on codereview site."""
1813 raise NotImplementedError()
1814
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001815 def AddComment(self, message):
1816 """Posts a comment to the codereview site."""
1817 raise NotImplementedError()
1818
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001819 def GetCommentsSummary(self):
1820 raise NotImplementedError()
1821
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822 def CloseIssue(self):
1823 """Closes the issue."""
1824 raise NotImplementedError()
1825
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826 def GetMostRecentPatchset(self):
1827 """Returns the most recent patchset number from the codereview site."""
1828 raise NotImplementedError()
1829
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001830 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1831 directory):
1832 """Fetches and applies the issue.
1833
1834 Arguments:
1835 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1836 reject: if True, reject the failed patch instead of switching to 3-way
1837 merge. Rietveld only.
1838 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1839 only.
1840 directory: switch to directory before applying the patch. Rietveld only.
1841 """
1842 raise NotImplementedError()
1843
1844 @staticmethod
1845 def ParseIssueURL(parsed_url):
1846 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1847 failed."""
1848 raise NotImplementedError()
1849
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001850 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001851 """Best effort check that user is authenticated with codereview server.
1852
1853 Arguments:
1854 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001855 refresh: whether to attempt to refresh credentials. Ignored if not
1856 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001857 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 raise NotImplementedError()
1859
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001860 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001861 """Best effort check that uploading isn't supposed to fail for predictable
1862 reasons.
1863
1864 This method should raise informative exception if uploading shouldn't
1865 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001866
1867 Arguments:
1868 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001869 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001870 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001871
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001872 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001873 """Uploads a change to codereview."""
1874 raise NotImplementedError()
1875
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001876 def SetCQState(self, new_state):
1877 """Update the CQ state for latest patchset.
1878
1879 Issue must have been already uploaded and known.
1880 """
1881 raise NotImplementedError()
1882
tandriie113dfd2016-10-11 10:20:12 -07001883 def CannotTriggerTryJobReason(self):
1884 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1885 raise NotImplementedError()
1886
tandriide281ae2016-10-12 06:02:30 -07001887 def GetIssueOwner(self):
1888 raise NotImplementedError()
1889
tandrii8c5a3532016-11-04 07:52:02 -07001890 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001891 raise NotImplementedError()
1892
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001893
1894class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001895 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001896 super(_RietveldChangelistImpl, self).__init__(changelist)
1897 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001898 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001899 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001901 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001902 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903 self._props = None
1904 self._rpc_server = None
1905
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001906 def GetCodereviewServer(self):
1907 if not self._rietveld_server:
1908 # If we're on a branch then get the server potentially associated
1909 # with that branch.
1910 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001911 self._rietveld_server = gclient_utils.UpgradeToHttps(
1912 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913 if not self._rietveld_server:
1914 self._rietveld_server = settings.GetDefaultServerUrl()
1915 return self._rietveld_server
1916
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001917 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001918 """Best effort check that user is authenticated with Rietveld server."""
1919 if self._auth_config.use_oauth2:
1920 authenticator = auth.get_authenticator_for_host(
1921 self.GetCodereviewServer(), self._auth_config)
1922 if not authenticator.has_cached_credentials():
1923 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001924 if refresh:
1925 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001926
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001927 def EnsureCanUploadPatchset(self, force):
1928 # No checks for Rietveld because we are deprecating Rietveld.
1929 pass
1930
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001931 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932 issue = self.GetIssue()
1933 assert issue
1934 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001935 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 except urllib2.HTTPError as e:
1937 if e.code == 404:
1938 DieWithError(
1939 ('\nWhile fetching the description for issue %d, received a '
1940 '404 (not found)\n'
1941 'error. It is likely that you deleted this '
1942 'issue on the server. If this is the\n'
1943 'case, please run\n\n'
1944 ' git cl issue 0\n\n'
1945 'to clear the association with the deleted issue. Then run '
1946 'this command again.') % issue)
1947 else:
1948 DieWithError(
1949 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1950 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001951 print('Warning: Failed to retrieve CL description due to network '
1952 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001953 return ''
1954
1955 def GetMostRecentPatchset(self):
1956 return self.GetIssueProperties()['patchsets'][-1]
1957
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001958 def GetIssueProperties(self):
1959 if self._props is None:
1960 issue = self.GetIssue()
1961 if not issue:
1962 self._props = {}
1963 else:
1964 self._props = self.RpcServer().get_issue_properties(issue, True)
1965 return self._props
1966
tandriie113dfd2016-10-11 10:20:12 -07001967 def CannotTriggerTryJobReason(self):
1968 props = self.GetIssueProperties()
1969 if not props:
1970 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1971 if props.get('closed'):
1972 return 'CL %s is closed' % self.GetIssue()
1973 if props.get('private'):
1974 return 'CL %s is private' % self.GetIssue()
1975 return None
1976
tandrii8c5a3532016-11-04 07:52:02 -07001977 def GetTryjobProperties(self, patchset=None):
1978 """Returns dictionary of properties to launch tryjob."""
1979 project = (self.GetIssueProperties() or {}).get('project')
1980 return {
1981 'issue': self.GetIssue(),
1982 'patch_project': project,
1983 'patch_storage': 'rietveld',
1984 'patchset': patchset or self.GetPatchset(),
1985 'rietveld': self.GetCodereviewServer(),
1986 }
1987
tandriide281ae2016-10-12 06:02:30 -07001988 def GetIssueOwner(self):
1989 return (self.GetIssueProperties() or {}).get('owner_email')
1990
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001991 def AddComment(self, message):
1992 return self.RpcServer().add_comment(self.GetIssue(), message)
1993
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001994 def GetCommentsSummary(self):
1995 summary = []
1996 for message in self.GetIssueProperties().get('messages', []):
1997 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1998 summary.append(_CommentSummary(
1999 date=date,
2000 disapproval=bool(message['disapproval']),
2001 approval=bool(message['approval']),
2002 sender=message['sender'],
2003 message=message['text'],
2004 ))
2005 return summary
2006
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002007 def GetStatus(self):
2008 """Apply a rough heuristic to give a simple summary of an issue's review
2009 or CQ status, assuming adherence to a common workflow.
2010
2011 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002012 * 'error' - error from review tool (including deleted issues)
2013 * 'unsent' - not sent for review
2014 * 'waiting' - waiting for review
2015 * 'reply' - waiting for owner to reply to review
2016 * 'not lgtm' - Code-Review label has been set negatively
2017 * 'lgtm' - LGTM from at least one approved reviewer
2018 * 'commit' - in the commit queue
2019 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002020 """
2021 if not self.GetIssue():
2022 return None
2023
2024 try:
2025 props = self.GetIssueProperties()
2026 except urllib2.HTTPError:
2027 return 'error'
2028
2029 if props.get('closed'):
2030 # Issue is closed.
2031 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002032 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002033 # Issue is in the commit queue.
2034 return 'commit'
2035
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002036 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002037 if not messages:
2038 # No message was sent.
2039 return 'unsent'
2040
2041 if get_approving_reviewers(props):
2042 return 'lgtm'
2043 elif get_approving_reviewers(props, disapproval=True):
2044 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002045
tandrii9d2c7a32016-06-22 03:42:45 -07002046 # Skip CQ messages that don't require owner's action.
2047 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2048 if 'Dry run:' in messages[-1]['text']:
2049 messages.pop()
2050 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2051 # This message always follows prior messages from CQ,
2052 # so skip this too.
2053 messages.pop()
2054 else:
2055 # This is probably a CQ messages warranting user attention.
2056 break
2057
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002058 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002059 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002060 return 'reply'
2061 return 'waiting'
2062
dsansomee2d6fd92016-09-08 00:10:47 -07002063 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002064 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002066 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002067 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002068
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002069 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002070 return self.SetFlags({flag: value})
2071
2072 def SetFlags(self, flags):
2073 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002074 """
phajdan.jr68598232016-08-10 03:28:28 -07002075 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002076 try:
tandrii4b233bd2016-07-06 03:50:29 -07002077 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002078 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002079 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002080 if e.code == 404:
2081 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2082 if e.code == 403:
2083 DieWithError(
2084 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002085 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002086 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002087
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002088 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002089 """Returns an upload.RpcServer() to access this review's rietveld instance.
2090 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002091 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002092 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002093 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002094 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002095 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002096
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002097 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002098 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002099 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002100
tandrii5d48c322016-08-18 16:19:37 -07002101 @classmethod
2102 def PatchsetConfigKey(cls):
2103 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002104
tandrii5d48c322016-08-18 16:19:37 -07002105 @classmethod
2106 def CodereviewServerConfigKey(cls):
2107 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002108
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002109 def GetRieveldObjForPresubmit(self):
2110 return self.RpcServer()
2111
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002112 def SetCQState(self, new_state):
2113 props = self.GetIssueProperties()
2114 if props.get('private'):
2115 DieWithError('Cannot set-commit on private issue')
2116
2117 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002118 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002119 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002120 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002121 else:
tandrii4b233bd2016-07-06 03:50:29 -07002122 assert new_state == _CQState.DRY_RUN
2123 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002124
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2126 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 # PatchIssue should never be called with a dirty tree. It is up to the
2128 # caller to check this, but just in case we assert here since the
2129 # consequences of the caller not checking this could be dire.
2130 assert(not git_common.is_dirty_git_tree('apply'))
2131 assert(parsed_issue_arg.valid)
2132 self._changelist.issue = parsed_issue_arg.issue
2133 if parsed_issue_arg.hostname:
2134 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2135
skobes6468b902016-10-24 08:45:10 -07002136 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2137 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2138 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002139 try:
skobes6468b902016-10-24 08:45:10 -07002140 scm_obj.apply_patch(patchset_object)
2141 except Exception as e:
2142 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 return 1
2144
2145 # If we had an issue, commit the current state and register the issue.
2146 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002147 self.SetIssue(self.GetIssue())
2148 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2150 'patch from issue %(i)s at patchset '
2151 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2152 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002153 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002155 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 return 0
2157
2158 @staticmethod
2159 def ParseIssueURL(parsed_url):
2160 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2161 return None
wychen3c1c1722016-08-04 11:46:36 -07002162 # Rietveld patch: https://domain/<number>/#ps<patchset>
2163 match = re.match(r'/(\d+)/$', parsed_url.path)
2164 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2165 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002166 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002167 issue=int(match.group(1)),
2168 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002169 hostname=parsed_url.netloc,
2170 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 # Typical url: https://domain/<issue_number>[/[other]]
2172 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2173 if match:
skobes6468b902016-10-24 08:45:10 -07002174 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002175 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002176 hostname=parsed_url.netloc,
2177 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2179 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2180 if match:
skobes6468b902016-10-24 08:45:10 -07002181 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002182 issue=int(match.group(1)),
2183 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002184 hostname=parsed_url.netloc,
2185 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 return None
2187
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002188 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002189 """Upload the patch to Rietveld."""
2190 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2191 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002192 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2193 if options.emulate_svn_auto_props:
2194 upload_args.append('--emulate_svn_auto_props')
2195
2196 change_desc = None
2197
2198 if options.email is not None:
2199 upload_args.extend(['--email', options.email])
2200
2201 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002202 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002203 upload_args.extend(['--title', options.title])
2204 if options.message:
2205 upload_args.extend(['--message', options.message])
2206 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002207 print('This branch is associated with issue %s. '
2208 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002209 else:
nodirca166002016-06-27 10:59:51 -07002210 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002211 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002212 if options.message:
2213 message = options.message
2214 else:
2215 message = CreateDescriptionFromLog(args)
2216 if options.title:
2217 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002219 if options.reviewers or options.add_owners_to:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002220 change_desc.update_reviewers(options.reviewers,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002221 options.add_owners_to,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002222 change)
2223 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002224 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225
2226 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002227 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228 return 1
2229
2230 upload_args.extend(['--message', change_desc.description])
2231 if change_desc.get_reviewers():
2232 upload_args.append('--reviewers=%s' % ','.join(
2233 change_desc.get_reviewers()))
2234 if options.send_mail:
2235 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002236 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 upload_args.append('--send_mail')
2238
2239 # We check this before applying rietveld.private assuming that in
2240 # rietveld.cc only addresses which we can send private CLs to are listed
2241 # if rietveld.private is set, and so we should ignore rietveld.cc only
2242 # when --private is specified explicitly on the command line.
2243 if options.private:
2244 logging.warn('rietveld.cc is ignored since private flag is specified. '
2245 'You need to review and add them manually if necessary.')
2246 cc = self.GetCCListWithoutDefault()
2247 else:
2248 cc = self.GetCCList()
2249 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002250 if change_desc.get_cced():
2251 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002252 if cc:
2253 upload_args.extend(['--cc', cc])
2254
2255 if options.private or settings.GetDefaultPrivateFlag() == "True":
2256 upload_args.append('--private')
2257
2258 upload_args.extend(['--git_similarity', str(options.similarity)])
2259 if not options.find_copies:
2260 upload_args.extend(['--git_no_find_copies'])
2261
2262 # Include the upstream repo's URL in the change -- this is useful for
2263 # projects that have their source spread across multiple repos.
2264 remote_url = self.GetGitBaseUrlFromConfig()
2265 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002266 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2267 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2268 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002271 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002272 if target_ref:
2273 upload_args.extend(['--target_ref', target_ref])
2274
2275 # Look for dependent patchsets. See crbug.com/480453 for more details.
2276 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2277 upstream_branch = ShortBranchName(upstream_branch)
2278 if remote is '.':
2279 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002280 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002282 print()
2283 print('Skipping dependency patchset upload because git config '
2284 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2285 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 else:
2287 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002288 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 auth_config=auth_config)
2290 branch_cl_issue_url = branch_cl.GetIssueURL()
2291 branch_cl_issue = branch_cl.GetIssue()
2292 branch_cl_patchset = branch_cl.GetPatchset()
2293 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2294 upload_args.extend(
2295 ['--depends_on_patchset', '%s:%s' % (
2296 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002297 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 '\n'
2299 'The current branch (%s) is tracking a local branch (%s) with '
2300 'an associated CL.\n'
2301 'Adding %s/#ps%s as a dependency patchset.\n'
2302 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2303 branch_cl_patchset))
2304
2305 project = settings.GetProject()
2306 if project:
2307 upload_args.extend(['--project', project])
2308
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002309 try:
2310 upload_args = ['upload'] + upload_args + args
2311 logging.info('upload.RealMain(%s)', upload_args)
2312 issue, patchset = upload.RealMain(upload_args)
2313 issue = int(issue)
2314 patchset = int(patchset)
2315 except KeyboardInterrupt:
2316 sys.exit(1)
2317 except:
2318 # If we got an exception after the user typed a description for their
2319 # change, back up the description before re-raising.
2320 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002321 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002322 raise
2323
2324 if not self.GetIssue():
2325 self.SetIssue(issue)
2326 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327 return 0
2328
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002329
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002330class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002331 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002332 # auth_config is Rietveld thing, kept here to preserve interface only.
2333 super(_GerritChangelistImpl, self).__init__(changelist)
2334 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002335 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002336 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002337 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002338 # Map from change number (issue) to its detail cache.
2339 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002340
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002341 if codereview_host is not None:
2342 assert not codereview_host.startswith('https://'), codereview_host
2343 self._gerrit_host = codereview_host
2344 self._gerrit_server = 'https://%s' % codereview_host
2345
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346 def _GetGerritHost(self):
2347 # Lazy load of configs.
2348 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002349 if self._gerrit_host and '.' not in self._gerrit_host:
2350 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2351 # This happens for internal stuff http://crbug.com/614312.
2352 parsed = urlparse.urlparse(self.GetRemoteUrl())
2353 if parsed.scheme == 'sso':
2354 print('WARNING: using non https URLs for remote is likely broken\n'
2355 ' Your current remote is: %s' % self.GetRemoteUrl())
2356 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2357 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002358 return self._gerrit_host
2359
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002360 def _GetGitHost(self):
2361 """Returns git host to be used when uploading change to Gerrit."""
2362 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2363
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002364 def GetCodereviewServer(self):
2365 if not self._gerrit_server:
2366 # If we're on a branch then get the server potentially associated
2367 # with that branch.
2368 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002369 self._gerrit_server = self._GitGetBranchConfigValue(
2370 self.CodereviewServerConfigKey())
2371 if self._gerrit_server:
2372 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002373 if not self._gerrit_server:
2374 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2375 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002376 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377 parts[0] = parts[0] + '-review'
2378 self._gerrit_host = '.'.join(parts)
2379 self._gerrit_server = 'https://%s' % self._gerrit_host
2380 return self._gerrit_server
2381
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002382 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002383 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002384 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002385
tandrii5d48c322016-08-18 16:19:37 -07002386 @classmethod
2387 def PatchsetConfigKey(cls):
2388 return 'gerritpatchset'
2389
2390 @classmethod
2391 def CodereviewServerConfigKey(cls):
2392 return 'gerritserver'
2393
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002394 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002395 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002396 if settings.GetGerritSkipEnsureAuthenticated():
2397 # For projects with unusual authentication schemes.
2398 # See http://crbug.com/603378.
2399 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002400 # Lazy-loader to identify Gerrit and Git hosts.
2401 if gerrit_util.GceAuthenticator.is_gce():
2402 return
2403 self.GetCodereviewServer()
2404 git_host = self._GetGitHost()
2405 assert self._gerrit_server and self._gerrit_host
2406 cookie_auth = gerrit_util.CookiesAuthenticator()
2407
2408 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2409 git_auth = cookie_auth.get_auth_header(git_host)
2410 if gerrit_auth and git_auth:
2411 if gerrit_auth == git_auth:
2412 return
2413 print((
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002414 'WARNING: you have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002415 ' %s\n'
2416 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002417 ' Consider running the following command:\n'
2418 ' git cl creds-check\n'
2419 ' New credentials can be obtained by visiting %s') %
2420 (git_host, self._gerrit_host,
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002421 cookie_auth.get_new_password_message(git_host)))
2422 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002423 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002424 return
2425 else:
2426 missing = (
2427 [] if gerrit_auth else [self._gerrit_host] +
2428 [] if git_auth else [git_host])
2429 DieWithError('Credentials for the following hosts are required:\n'
2430 ' %s\n'
2431 'These are read from %s (or legacy %s)\n'
2432 '%s' % (
2433 '\n '.join(missing),
2434 cookie_auth.get_gitcookies_path(),
2435 cookie_auth.get_netrc_path(),
2436 cookie_auth.get_new_password_message(git_host)))
2437
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002438 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002439 if not self.GetIssue():
2440 return
2441
2442 # Warm change details cache now to avoid RPCs later, reducing latency for
2443 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002444 self._GetChangeDetail(
2445 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002446
2447 status = self._GetChangeDetail()['status']
2448 if status in ('MERGED', 'ABANDONED'):
2449 DieWithError('Change %s has been %s, new uploads are not allowed' %
2450 (self.GetIssueURL(),
2451 'submitted' if status == 'MERGED' else 'abandoned'))
2452
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002453 if gerrit_util.GceAuthenticator.is_gce():
2454 return
2455 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2456 self._GetGerritHost())
2457 if self.GetIssueOwner() == cookies_user:
2458 return
2459 logging.debug('change %s owner is %s, cookies user is %s',
2460 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2461 # Maybe user has linked accounts or smth like that,
2462 # so ask what Gerrit thinks of this user.
2463 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2464 if details['email'] == self.GetIssueOwner():
2465 return
2466 if not force:
2467 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2468 'as %s.\n'
2469 'Uploading may fail due to lack of permissions.' %
2470 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2471 confirm_or_exit(action='upload')
2472
2473
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002474 def _PostUnsetIssueProperties(self):
2475 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002476 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002477
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002478 def GetRieveldObjForPresubmit(self):
2479 class ThisIsNotRietveldIssue(object):
2480 def __nonzero__(self):
2481 # This is a hack to make presubmit_support think that rietveld is not
2482 # defined, yet still ensure that calls directly result in a decent
2483 # exception message below.
2484 return False
2485
2486 def __getattr__(self, attr):
2487 print(
2488 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2489 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2490 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2491 'or use Rietveld for codereview.\n'
2492 'See also http://crbug.com/579160.' % attr)
2493 raise NotImplementedError()
2494 return ThisIsNotRietveldIssue()
2495
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002496 def GetGerritObjForPresubmit(self):
2497 return presubmit_support.GerritAccessor(self._GetGerritHost())
2498
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002499 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002500 """Apply a rough heuristic to give a simple summary of an issue's review
2501 or CQ status, assuming adherence to a common workflow.
2502
2503 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002504 * 'error' - error from review tool (including deleted issues)
2505 * 'unsent' - no reviewers added
2506 * 'waiting' - waiting for review
2507 * 'reply' - waiting for uploader to reply to review
2508 * 'lgtm' - Code-Review label has been set
2509 * 'commit' - in the commit queue
2510 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002511 """
2512 if not self.GetIssue():
2513 return None
2514
2515 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002516 data = self._GetChangeDetail([
2517 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002518 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002519 return 'error'
2520
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002521 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 return 'closed'
2523
Aaron Gable9ab38c62017-04-06 14:36:33 -07002524 if data['labels'].get('Commit-Queue', {}).get('approved'):
2525 # The section will have an "approved" subsection if anyone has voted
2526 # the maximum value on the label.
2527 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002528
Aaron Gable9ab38c62017-04-06 14:36:33 -07002529 if data['labels'].get('Code-Review', {}).get('approved'):
2530 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531
2532 if not data.get('reviewers', {}).get('REVIEWER', []):
2533 return 'unsent'
2534
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002535 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002536 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2537 last_message_author = messages.pop().get('author', {})
2538 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002539 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2540 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002541 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002542 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002543 if last_message_author.get('_account_id') == owner:
2544 # Most recent message was by owner.
2545 return 'waiting'
2546 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002547 # Some reply from non-owner.
2548 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002549
2550 # Somehow there are no messages even though there are reviewers.
2551 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002552
2553 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002555 return data['revisions'][data['current_revision']]['_number']
2556
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002557 def FetchDescription(self, force=False):
2558 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2559 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002560 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002561 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002562
dsansomee2d6fd92016-09-08 00:10:47 -07002563 def UpdateDescriptionRemote(self, description, force=False):
2564 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2565 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002566 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002567 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002568 'unpublished edit. Either publish the edit in the Gerrit web UI '
2569 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002570
2571 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2572 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002573 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002574 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002575
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002576 def AddComment(self, message):
2577 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2578 msg=message)
2579
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002580 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002581 # DETAILED_ACCOUNTS is to get emails in accounts.
2582 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2583 summary = []
2584 for msg in data.get('messages', []):
2585 # Gerrit spits out nanoseconds.
2586 assert len(msg['date'].split('.')[-1]) == 9
2587 date = datetime.datetime.strptime(msg['date'][:-3],
2588 '%Y-%m-%d %H:%M:%S.%f')
2589 summary.append(_CommentSummary(
2590 date=date,
2591 message=msg['message'],
2592 sender=msg['author']['email'],
2593 # These could be inferred from the text messages and correlated with
2594 # Code-Review label maximum, however this is not reliable.
2595 # Leaving as is until the need arises.
2596 approval=False,
2597 disapproval=False,
2598 ))
2599 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002600
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002601 def CloseIssue(self):
2602 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2603
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002604 def SubmitIssue(self, wait_for_merge=True):
2605 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2606 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002607
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002608 def _GetChangeDetail(self, options=None, issue=None,
2609 no_cache=False):
2610 """Returns details of the issue by querying Gerrit and caching results.
2611
2612 If fresh data is needed, set no_cache=True which will clear cache and
2613 thus new data will be fetched from Gerrit.
2614 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002615 options = options or []
2616 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002617 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002618
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002619 # Optimization to avoid multiple RPCs:
2620 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2621 'CURRENT_COMMIT' not in options):
2622 options.append('CURRENT_COMMIT')
2623
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002624 # Normalize issue and options for consistent keys in cache.
2625 issue = str(issue)
2626 options = [o.upper() for o in options]
2627
2628 # Check in cache first unless no_cache is True.
2629 if no_cache:
2630 self._detail_cache.pop(issue, None)
2631 else:
2632 options_set = frozenset(options)
2633 for cached_options_set, data in self._detail_cache.get(issue, []):
2634 # Assumption: data fetched before with extra options is suitable
2635 # for return for a smaller set of options.
2636 # For example, if we cached data for
2637 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2638 # and request is for options=[CURRENT_REVISION],
2639 # THEN we can return prior cached data.
2640 if options_set.issubset(cached_options_set):
2641 return data
2642
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002643 try:
2644 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2645 options, ignore_404=False)
2646 except gerrit_util.GerritError as e:
2647 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002648 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002649 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002650
2651 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002652 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002653
agable32978d92016-11-01 12:55:02 -07002654 def _GetChangeCommit(self, issue=None):
2655 issue = issue or self.GetIssue()
2656 assert issue, 'issue is required to query Gerrit'
2657 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2658 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002659 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002660 return data
2661
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002662 def CMDLand(self, force, bypass_hooks, verbose):
2663 if git_common.is_dirty_git_tree('land'):
2664 return 1
tandriid60367b2016-06-22 05:25:12 -07002665 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2666 if u'Commit-Queue' in detail.get('labels', {}):
2667 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002668 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2669 'which can test and land changes for you. '
2670 'Are you sure you wish to bypass it?\n',
2671 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002672
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002673 differs = True
tandriic4344b52016-08-29 06:04:54 -07002674 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002675 # Note: git diff outputs nothing if there is no diff.
2676 if not last_upload or RunGit(['diff', last_upload]).strip():
2677 print('WARNING: some changes from local branch haven\'t been uploaded')
2678 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002679 if detail['current_revision'] == last_upload:
2680 differs = False
2681 else:
2682 print('WARNING: local branch contents differ from latest uploaded '
2683 'patchset')
2684 if differs:
2685 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002686 confirm_or_exit(
2687 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2688 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002689 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2690 elif not bypass_hooks:
2691 hook_results = self.RunHook(
2692 committing=True,
2693 may_prompt=not force,
2694 verbose=verbose,
2695 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2696 if not hook_results.should_continue():
2697 return 1
2698
2699 self.SubmitIssue(wait_for_merge=True)
2700 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002701 links = self._GetChangeCommit().get('web_links', [])
2702 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002703 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002704 print('Landed as %s' % link.get('url'))
2705 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002706 return 0
2707
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002708 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2709 directory):
2710 assert not reject
2711 assert not nocommit
2712 assert not directory
2713 assert parsed_issue_arg.valid
2714
2715 self._changelist.issue = parsed_issue_arg.issue
2716
2717 if parsed_issue_arg.hostname:
2718 self._gerrit_host = parsed_issue_arg.hostname
2719 self._gerrit_server = 'https://%s' % self._gerrit_host
2720
tandriic2405f52016-10-10 08:13:15 -07002721 try:
2722 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002723 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002724 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002725
2726 if not parsed_issue_arg.patchset:
2727 # Use current revision by default.
2728 revision_info = detail['revisions'][detail['current_revision']]
2729 patchset = int(revision_info['_number'])
2730 else:
2731 patchset = parsed_issue_arg.patchset
2732 for revision_info in detail['revisions'].itervalues():
2733 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2734 break
2735 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002736 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002737 (parsed_issue_arg.patchset, self.GetIssue()))
2738
2739 fetch_info = revision_info['fetch']['http']
2740 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002741 self.SetIssue(self.GetIssue())
2742 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002743 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002744 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002745 (self.GetIssue(), self.GetPatchset()))
2746 return 0
2747
2748 @staticmethod
2749 def ParseIssueURL(parsed_url):
2750 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2751 return None
2752 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2753 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2754 # Short urls like https://domain/<issue_number> can be used, but don't allow
2755 # specifying the patchset (you'd 404), but we allow that here.
2756 if parsed_url.path == '/':
2757 part = parsed_url.fragment
2758 else:
2759 part = parsed_url.path
2760 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2761 if match:
2762 return _ParsedIssueNumberArgument(
2763 issue=int(match.group(2)),
2764 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002765 hostname=parsed_url.netloc,
2766 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002767 return None
2768
tandrii16e0b4e2016-06-07 10:34:28 -07002769 def _GerritCommitMsgHookCheck(self, offer_removal):
2770 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2771 if not os.path.exists(hook):
2772 return
2773 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2774 # custom developer made one.
2775 data = gclient_utils.FileRead(hook)
2776 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2777 return
2778 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002779 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002780 'and may interfere with it in subtle ways.\n'
2781 'We recommend you remove the commit-msg hook.')
2782 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002783 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002784 gclient_utils.rm_file_or_tree(hook)
2785 print('Gerrit commit-msg hook removed.')
2786 else:
2787 print('OK, will keep Gerrit commit-msg hook in place.')
2788
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002789 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002791 if options.squash and options.no_squash:
2792 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002793
2794 if not options.squash and not options.no_squash:
2795 # Load default for user, repo, squash=true, in this order.
2796 options.squash = settings.GetSquashGerritUploads()
2797 elif options.no_squash:
2798 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002799
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002800 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002801 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002802
Aaron Gableb56ad332017-01-06 15:24:31 -08002803 # This may be None; default fallback value is determined in logic below.
2804 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002805 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002806
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002807 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002808 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002809 if self.GetIssue():
2810 # Try to get the message from a previous upload.
2811 message = self.GetDescription()
2812 if not message:
2813 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002814 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002815 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002816 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002817 if options.message:
2818 # For compatibility with Rietveld, if -m|--message is given on
2819 # command line, title should be the first line of that message,
2820 # which shouldn't be confused with CL description.
2821 default_title = options.message.strip().split()[0]
2822 else:
2823 default_title = RunGit(
2824 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002825 if options.force:
2826 title = default_title
2827 else:
2828 title = ask_for_data(
2829 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002830 if title == default_title:
2831 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002832 change_id = self._GetChangeDetail()['change_id']
2833 while True:
2834 footer_change_ids = git_footers.get_footer_change_id(message)
2835 if footer_change_ids == [change_id]:
2836 break
2837 if not footer_change_ids:
2838 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002839 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002840 continue
2841 # There is already a valid footer but with different or several ids.
2842 # Doing this automatically is non-trivial as we don't want to lose
2843 # existing other footers, yet we want to append just 1 desired
2844 # Change-Id. Thus, just create a new footer, but let user verify the
2845 # new description.
2846 message = '%s\n\nChange-Id: %s' % (message, change_id)
2847 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002848 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002849 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002850 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002851 'Please, check the proposed correction to the description, '
2852 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2853 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2854 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002855 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002856 if not options.force:
2857 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002858 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002859 message = change_desc.description
2860 if not message:
2861 DieWithError("Description is empty. Aborting...")
2862 # Continue the while loop.
2863 # Sanity check of this code - we should end up with proper message
2864 # footer.
2865 assert [change_id] == git_footers.get_footer_change_id(message)
2866 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002867 else: # if not self.GetIssue()
2868 if options.message:
2869 message = options.message
2870 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002871 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002872 if options.title:
2873 message = options.title + '\n\n' + message
2874 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002875 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002876 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002877 # On first upload, patchset title is always this string, while
2878 # --title flag gets converted to first line of message.
2879 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002880 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002881 if not change_desc.description:
2882 DieWithError("Description is empty. Aborting...")
2883 message = change_desc.description
2884 change_ids = git_footers.get_footer_change_id(message)
2885 if len(change_ids) > 1:
2886 DieWithError('too many Change-Id footers, at most 1 allowed.')
2887 if not change_ids:
2888 # Generate the Change-Id automatically.
2889 message = git_footers.add_footer_change_id(
2890 message, GenerateGerritChangeId(message))
2891 change_desc.set_description(message)
2892 change_ids = git_footers.get_footer_change_id(message)
2893 assert len(change_ids) == 1
2894 change_id = change_ids[0]
2895
2896 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002897 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2898 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2900 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2901 '-m', message]).strip()
2902 else:
2903 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002904 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 if not change_desc.description:
2906 DieWithError("Description is empty. Aborting...")
2907
2908 if not git_footers.get_footer_change_id(change_desc.description):
2909 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002910 change_desc.set_description(
2911 self._AddChangeIdToCommitMessage(options, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002913 # For no-squash mode, we assume the remote called "origin" is the one we
2914 # want. It is not worthwhile to support different workflows for
2915 # no-squash mode.
2916 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002917 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2918
2919 assert change_desc
2920 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2921 ref_to_push)]).splitlines()
2922 if len(commits) > 1:
2923 print('WARNING: This will upload %d commits. Run the following command '
2924 'to see which commits will be uploaded: ' % len(commits))
2925 print('git log %s..%s' % (parent, ref_to_push))
2926 print('You can also use `git squash-branch` to squash these into a '
2927 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002928 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002929
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002930 if options.reviewers or options.add_owners_to:
2931 change_desc.update_reviewers(options.reviewers, options.add_owners_to,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002932 change)
2933
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002934 # Extra options that can be specified at push time. Doc:
2935 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002936 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002937 if change_desc.get_reviewers(tbr_only=True):
2938 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002939 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002940
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002941
2942 # TODO(tandrii): options.message should be posted as a comment
2943 # if --send-email is set on non-initial upload as Rietveld used to do it.
2944
Aaron Gable9b713dd2016-12-14 16:04:21 -08002945 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002946 if not re.match(r'^[\w ]+$', title):
2947 title = re.sub(r'[^\w ]', '', title)
2948 if not automatic_title:
2949 print('WARNING: Patchset title may only contain alphanumeric chars '
2950 'and spaces. You can edit it in the UI. '
2951 'See https://crbug.com/663787.\n'
2952 'Cleaned up title: %s' % title)
2953 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2954 # reverse on its side.
2955 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002956
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002957 if options.send_mail:
2958 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002959 DieWithError('Must specify reviewers to send email.', change_desc)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002960 refspec_opts.append('notify=ALL')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002961 else:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002962 refspec_opts.append('notify=NONE')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002963
tandrii99a72f22016-08-17 14:33:24 -07002964 reviewers = change_desc.get_reviewers()
2965 if reviewers:
Andrii Shyshkalovfbee1652017-04-10 14:00:51 +02002966 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002967
agablec6787972016-09-09 16:13:34 -07002968 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002969 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07002970
rmistry9eadede2016-09-19 11:22:43 -07002971 if options.topic:
2972 # Documentation on Gerrit topics is here:
2973 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002974 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002975
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002976 refspec_suffix = ''
2977 if refspec_opts:
2978 refspec_suffix = '%' + ','.join(refspec_opts)
2979 assert ' ' not in refspec_suffix, (
2980 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2981 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2982
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002983 try:
2984 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002985 ['git', 'push', self.GetRemoteUrl(), refspec],
2986 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002987 # Flush after every line: useful for seeing progress when running as
2988 # recipe.
2989 filter_fn=lambda _: sys.stdout.flush())
2990 except subprocess2.CalledProcessError:
2991 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02002992 'for the reason of the failure.\n'
2993 'Hint: run command below to diangose common Git/Gerrit '
2994 'credential problems:\n'
2995 ' git cl creds-check\n',
2996 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002997
2998 if options.squash:
2999 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3000 change_numbers = [m.group(1)
3001 for m in map(regex.match, push_stdout.splitlines())
3002 if m]
3003 if len(change_numbers) != 1:
3004 DieWithError(
3005 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003006 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003007 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003008 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003009
3010 # Add cc's from the CC_LIST and --cc flag (if any).
3011 cc = self.GetCCList().split(',')
3012 if options.cc:
3013 cc.extend(options.cc)
3014 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003015 if change_desc.get_cced():
3016 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07003017 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08003018 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08003019 self._GetGerritHost(), self.GetIssue(), cc,
3020 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003021 return 0
3022
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003023 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3024 change_desc):
3025 """Computes parent of the generated commit to be uploaded to Gerrit.
3026
3027 Returns revision or a ref name.
3028 """
3029 if custom_cl_base:
3030 # Try to avoid creating additional unintended CLs when uploading, unless
3031 # user wants to take this risk.
3032 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3033 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3034 local_ref_of_target_remote])
3035 if code == 1:
3036 print('\nWARNING: manually specified base of this CL `%s` '
3037 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3038 'If you proceed with upload, more than 1 CL may be created by '
3039 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3040 'If you are certain that specified base `%s` has already been '
3041 'uploaded to Gerrit as another CL, you may proceed.\n' %
3042 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3043 if not force:
3044 confirm_or_exit(
3045 'Do you take responsibility for cleaning up potential mess '
3046 'resulting from proceeding with upload?',
3047 action='upload')
3048 return custom_cl_base
3049
Aaron Gablef97e33d2017-03-30 15:44:27 -07003050 if remote != '.':
3051 return self.GetCommonAncestorWithUpstream()
3052
3053 # If our upstream branch is local, we base our squashed commit on its
3054 # squashed version.
3055 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3056
Aaron Gablef97e33d2017-03-30 15:44:27 -07003057 if upstream_branch_name == 'master':
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003058 return 'origin/master'
Aaron Gablef97e33d2017-03-30 15:44:27 -07003059
3060 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003061 # TODO(tandrii): consider checking parent change in Gerrit and using its
3062 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3063 # the tree hash of the parent branch. The upside is less likely bogus
3064 # requests to reupload parent change just because it's uploadhash is
3065 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003066 parent = RunGit(['config',
3067 'branch.%s.gerritsquashhash' % upstream_branch_name],
3068 error_ok=True).strip()
3069 # Verify that the upstream branch has been uploaded too, otherwise
3070 # Gerrit will create additional CLs when uploading.
3071 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3072 RunGitSilent(['rev-parse', parent + ':'])):
3073 DieWithError(
3074 '\nUpload upstream branch %s first.\n'
3075 'It is likely that this branch has been rebased since its last '
3076 'upload, so you just need to upload it again.\n'
3077 '(If you uploaded it with --no-squash, then branch dependencies '
3078 'are not supported, and you should reupload with --squash.)'
3079 % upstream_branch_name,
3080 change_desc)
3081 return parent
3082
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003083 def _AddChangeIdToCommitMessage(self, options, args):
3084 """Re-commits using the current message, assumes the commit hook is in
3085 place.
3086 """
3087 log_desc = options.message or CreateDescriptionFromLog(args)
3088 git_command = ['commit', '--amend', '-m', log_desc]
3089 RunGit(git_command)
3090 new_log_desc = CreateDescriptionFromLog(args)
3091 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003092 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003093 return new_log_desc
3094 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003095 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003096
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003097 def SetCQState(self, new_state):
3098 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003099 vote_map = {
3100 _CQState.NONE: 0,
3101 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003102 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003103 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003104 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3105 if new_state == _CQState.DRY_RUN:
3106 # Don't spam everybody reviewer/owner.
3107 kwargs['notify'] = 'NONE'
3108 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003109
tandriie113dfd2016-10-11 10:20:12 -07003110 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003111 try:
3112 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003113 except GerritChangeNotExists:
3114 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003115
3116 if data['status'] in ('ABANDONED', 'MERGED'):
3117 return 'CL %s is closed' % self.GetIssue()
3118
3119 def GetTryjobProperties(self, patchset=None):
3120 """Returns dictionary of properties to launch tryjob."""
3121 data = self._GetChangeDetail(['ALL_REVISIONS'])
3122 patchset = int(patchset or self.GetPatchset())
3123 assert patchset
3124 revision_data = None # Pylint wants it to be defined.
3125 for revision_data in data['revisions'].itervalues():
3126 if int(revision_data['_number']) == patchset:
3127 break
3128 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003129 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003130 (patchset, self.GetIssue()))
3131 return {
3132 'patch_issue': self.GetIssue(),
3133 'patch_set': patchset or self.GetPatchset(),
3134 'patch_project': data['project'],
3135 'patch_storage': 'gerrit',
3136 'patch_ref': revision_data['fetch']['http']['ref'],
3137 'patch_repository_url': revision_data['fetch']['http']['url'],
3138 'patch_gerrit_url': self.GetCodereviewServer(),
3139 }
tandriie113dfd2016-10-11 10:20:12 -07003140
tandriide281ae2016-10-12 06:02:30 -07003141 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003142 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003143
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003144
3145_CODEREVIEW_IMPLEMENTATIONS = {
3146 'rietveld': _RietveldChangelistImpl,
3147 'gerrit': _GerritChangelistImpl,
3148}
3149
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003150
iannuccie53c9352016-08-17 14:40:40 -07003151def _add_codereview_issue_select_options(parser, extra=""):
3152 _add_codereview_select_options(parser)
3153
3154 text = ('Operate on this issue number instead of the current branch\'s '
3155 'implicit issue.')
3156 if extra:
3157 text += ' '+extra
3158 parser.add_option('-i', '--issue', type=int, help=text)
3159
3160
3161def _process_codereview_issue_select_options(parser, options):
3162 _process_codereview_select_options(parser, options)
3163 if options.issue is not None and not options.forced_codereview:
3164 parser.error('--issue must be specified with either --rietveld or --gerrit')
3165
3166
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003167def _add_codereview_select_options(parser):
3168 """Appends --gerrit and --rietveld options to force specific codereview."""
3169 parser.codereview_group = optparse.OptionGroup(
3170 parser, 'EXPERIMENTAL! Codereview override options')
3171 parser.add_option_group(parser.codereview_group)
3172 parser.codereview_group.add_option(
3173 '--gerrit', action='store_true',
3174 help='Force the use of Gerrit for codereview')
3175 parser.codereview_group.add_option(
3176 '--rietveld', action='store_true',
3177 help='Force the use of Rietveld for codereview')
3178
3179
3180def _process_codereview_select_options(parser, options):
3181 if options.gerrit and options.rietveld:
3182 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3183 options.forced_codereview = None
3184 if options.gerrit:
3185 options.forced_codereview = 'gerrit'
3186 elif options.rietveld:
3187 options.forced_codereview = 'rietveld'
3188
3189
tandriif9aefb72016-07-01 09:06:51 -07003190def _get_bug_line_values(default_project, bugs):
3191 """Given default_project and comma separated list of bugs, yields bug line
3192 values.
3193
3194 Each bug can be either:
3195 * a number, which is combined with default_project
3196 * string, which is left as is.
3197
3198 This function may produce more than one line, because bugdroid expects one
3199 project per line.
3200
3201 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3202 ['v8:123', 'chromium:789']
3203 """
3204 default_bugs = []
3205 others = []
3206 for bug in bugs.split(','):
3207 bug = bug.strip()
3208 if bug:
3209 try:
3210 default_bugs.append(int(bug))
3211 except ValueError:
3212 others.append(bug)
3213
3214 if default_bugs:
3215 default_bugs = ','.join(map(str, default_bugs))
3216 if default_project:
3217 yield '%s:%s' % (default_project, default_bugs)
3218 else:
3219 yield default_bugs
3220 for other in sorted(others):
3221 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3222 yield other
3223
3224
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003225class ChangeDescription(object):
3226 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003227 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003228 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003229 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003230 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003231
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003233 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234
agable@chromium.org42c20792013-09-12 17:34:49 +00003235 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003236 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 return '\n'.join(self._description_lines)
3238
3239 def set_description(self, desc):
3240 if isinstance(desc, basestring):
3241 lines = desc.splitlines()
3242 else:
3243 lines = [line.rstrip() for line in desc]
3244 while lines and not lines[0]:
3245 lines.pop(0)
3246 while lines and not lines[-1]:
3247 lines.pop(-1)
3248 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003249
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003250 def update_reviewers(self, reviewers, add_owners_to=None, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003251 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003252 assert isinstance(reviewers, list), reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003253 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
3254 if not reviewers and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003255 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003256 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003257
agable@chromium.org42c20792013-09-12 17:34:49 +00003258 # Get the set of R= and TBR= lines and remove them from the desciption.
3259 regexp = re.compile(self.R_LINE)
3260 matches = [regexp.match(line) for line in self._description_lines]
3261 new_desc = [l for i, l in enumerate(self._description_lines)
3262 if not matches[i]]
3263 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264
agable@chromium.org42c20792013-09-12 17:34:49 +00003265 # Construct new unified R= and TBR= lines.
3266 r_names = []
3267 tbr_names = []
3268 for match in matches:
3269 if not match:
3270 continue
3271 people = cleanup_list([match.group(2).strip()])
3272 if match.group(1) == 'TBR':
3273 tbr_names.extend(people)
3274 else:
3275 r_names.extend(people)
3276 for name in r_names:
3277 if name not in reviewers:
3278 reviewers.append(name)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003279 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003280 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003281 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003282 all_reviewers = set(tbr_names + reviewers)
3283 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3284 all_reviewers)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003285 names = owners_db.reviewers_for(missing_files, change.author_email)
3286
3287 {
3288 'TBR': tbr_names,
3289 'R': reviewers,
3290 }[add_owners_to].extend(names)
3291
agable@chromium.org42c20792013-09-12 17:34:49 +00003292 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3293 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3294
3295 # Put the new lines in the description where the old first R= line was.
3296 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3297 if 0 <= line_loc < len(self._description_lines):
3298 if new_tbr_line:
3299 self._description_lines.insert(line_loc, new_tbr_line)
3300 if new_r_line:
3301 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003302 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003303 if new_r_line:
3304 self.append_footer(new_r_line)
3305 if new_tbr_line:
3306 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003307
Aaron Gable3a16ed12017-03-23 10:51:55 -07003308 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003309 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003310 self.set_description([
3311 '# Enter a description of the change.',
3312 '# This will be displayed on the codereview site.',
3313 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003314 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003315 '--------------------',
3316 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003317
agable@chromium.org42c20792013-09-12 17:34:49 +00003318 regexp = re.compile(self.BUG_LINE)
3319 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003320 prefix = settings.GetBugPrefix()
3321 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003322 if git_footer:
3323 self.append_footer('Bug: %s' % ', '.join(values))
3324 else:
3325 for value in values:
3326 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003327
agable@chromium.org42c20792013-09-12 17:34:49 +00003328 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003329 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003330 if not content:
3331 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003332 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003333
3334 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003335 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3336 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003337 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003338 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003339
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003340 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003341 """Adds a footer line to the description.
3342
3343 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3344 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3345 that Gerrit footers are always at the end.
3346 """
3347 parsed_footer_line = git_footers.parse_footer(line)
3348 if parsed_footer_line:
3349 # Line is a gerrit footer in the form: Footer-Key: any value.
3350 # Thus, must be appended observing Gerrit footer rules.
3351 self.set_description(
3352 git_footers.add_footer(self.description,
3353 key=parsed_footer_line[0],
3354 value=parsed_footer_line[1]))
3355 return
3356
3357 if not self._description_lines:
3358 self._description_lines.append(line)
3359 return
3360
3361 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3362 if gerrit_footers:
3363 # git_footers.split_footers ensures that there is an empty line before
3364 # actual (gerrit) footers, if any. We have to keep it that way.
3365 assert top_lines and top_lines[-1] == ''
3366 top_lines, separator = top_lines[:-1], top_lines[-1:]
3367 else:
3368 separator = [] # No need for separator if there are no gerrit_footers.
3369
3370 prev_line = top_lines[-1] if top_lines else ''
3371 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3372 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3373 top_lines.append('')
3374 top_lines.append(line)
3375 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003376
tandrii99a72f22016-08-17 14:33:24 -07003377 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003378 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003379 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003380 reviewers = [match.group(2).strip()
3381 for match in matches
3382 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003383 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003384
bradnelsond975b302016-10-23 12:20:23 -07003385 def get_cced(self):
3386 """Retrieves the list of reviewers."""
3387 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3388 cced = [match.group(2).strip() for match in matches if match]
3389 return cleanup_list(cced)
3390
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003391 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3392 """Updates this commit description given the parent.
3393
3394 This is essentially what Gnumbd used to do.
3395 Consult https://goo.gl/WMmpDe for more details.
3396 """
3397 assert parent_msg # No, orphan branch creation isn't supported.
3398 assert parent_hash
3399 assert dest_ref
3400 parent_footer_map = git_footers.parse_footers(parent_msg)
3401 # This will also happily parse svn-position, which GnumbD is no longer
3402 # supporting. While we'd generate correct footers, the verifier plugin
3403 # installed in Gerrit will block such commit (ie git push below will fail).
3404 parent_position = git_footers.get_position(parent_footer_map)
3405
3406 # Cherry-picks may have last line obscuring their prior footers,
3407 # from git_footers perspective. This is also what Gnumbd did.
3408 cp_line = None
3409 if (self._description_lines and
3410 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3411 cp_line = self._description_lines.pop()
3412
3413 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3414
3415 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3416 # user interference with actual footers we'd insert below.
3417 for i, (k, v) in enumerate(parsed_footers):
3418 if k.startswith('Cr-'):
3419 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3420
3421 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003422 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003423 if parent_position[0] == dest_ref:
3424 # Same branch as parent.
3425 number = int(parent_position[1]) + 1
3426 else:
3427 number = 1 # New branch, and extra lineage.
3428 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3429 int(parent_position[1])))
3430
3431 parsed_footers.append(('Cr-Commit-Position',
3432 '%s@{#%d}' % (dest_ref, number)))
3433 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3434
3435 self._description_lines = top_lines
3436 if cp_line:
3437 self._description_lines.append(cp_line)
3438 if self._description_lines[-1] != '':
3439 self._description_lines.append('') # Ensure footer separator.
3440 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3441
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003442
Aaron Gablea1bab272017-04-11 16:38:18 -07003443def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003444 """Retrieves the reviewers that approved a CL from the issue properties with
3445 messages.
3446
3447 Note that the list may contain reviewers that are not committer, thus are not
3448 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003449
3450 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003451 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003452 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003453 return sorted(
3454 set(
3455 message['sender']
3456 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003457 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003458 )
3459 )
3460
3461
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003462def FindCodereviewSettingsFile(filename='codereview.settings'):
3463 """Finds the given file starting in the cwd and going up.
3464
3465 Only looks up to the top of the repository unless an
3466 'inherit-review-settings-ok' file exists in the root of the repository.
3467 """
3468 inherit_ok_file = 'inherit-review-settings-ok'
3469 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003470 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003471 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3472 root = '/'
3473 while True:
3474 if filename in os.listdir(cwd):
3475 if os.path.isfile(os.path.join(cwd, filename)):
3476 return open(os.path.join(cwd, filename))
3477 if cwd == root:
3478 break
3479 cwd = os.path.dirname(cwd)
3480
3481
3482def LoadCodereviewSettingsFromFile(fileobj):
3483 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003484 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003485
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003486 def SetProperty(name, setting, unset_error_ok=False):
3487 fullname = 'rietveld.' + name
3488 if setting in keyvals:
3489 RunGit(['config', fullname, keyvals[setting]])
3490 else:
3491 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3492
tandrii48df5812016-10-17 03:55:37 -07003493 if not keyvals.get('GERRIT_HOST', False):
3494 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003495 # Only server setting is required. Other settings can be absent.
3496 # In that case, we ignore errors raised during option deletion attempt.
3497 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003498 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003499 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3500 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003501 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003502 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3503 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003504 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003505 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3506 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003507
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003508 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003509 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003510
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003511 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003512 RunGit(['config', 'gerrit.squash-uploads',
3513 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003514
tandrii@chromium.org28253532016-04-14 13:46:56 +00003515 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003516 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003517 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3518
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003519 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003520 # should be of the form
3521 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3522 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003523 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3524 keyvals['ORIGIN_URL_CONFIG']])
3525
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003526
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003527def urlretrieve(source, destination):
3528 """urllib is broken for SSL connections via a proxy therefore we
3529 can't use urllib.urlretrieve()."""
3530 with open(destination, 'w') as f:
3531 f.write(urllib2.urlopen(source).read())
3532
3533
ukai@chromium.org712d6102013-11-27 00:52:58 +00003534def hasSheBang(fname):
3535 """Checks fname is a #! script."""
3536 with open(fname) as f:
3537 return f.read(2).startswith('#!')
3538
3539
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003540# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3541def DownloadHooks(*args, **kwargs):
3542 pass
3543
3544
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003545def DownloadGerritHook(force):
3546 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003547
3548 Args:
3549 force: True to update hooks. False to install hooks if not present.
3550 """
3551 if not settings.GetIsGerrit():
3552 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003553 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003554 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3555 if not os.access(dst, os.X_OK):
3556 if os.path.exists(dst):
3557 if not force:
3558 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003559 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003560 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003561 if not hasSheBang(dst):
3562 DieWithError('Not a script: %s\n'
3563 'You need to download from\n%s\n'
3564 'into .git/hooks/commit-msg and '
3565 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003566 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3567 except Exception:
3568 if os.path.exists(dst):
3569 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003570 DieWithError('\nFailed to download hooks.\n'
3571 'You need to download from\n%s\n'
3572 'into .git/hooks/commit-msg and '
3573 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003574
3575
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003576def GetRietveldCodereviewSettingsInteractively():
3577 """Prompt the user for settings."""
3578 server = settings.GetDefaultServerUrl(error_ok=True)
3579 prompt = 'Rietveld server (host[:port])'
3580 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3581 newserver = ask_for_data(prompt + ':')
3582 if not server and not newserver:
3583 newserver = DEFAULT_SERVER
3584 if newserver:
3585 newserver = gclient_utils.UpgradeToHttps(newserver)
3586 if newserver != server:
3587 RunGit(['config', 'rietveld.server', newserver])
3588
3589 def SetProperty(initial, caption, name, is_url):
3590 prompt = caption
3591 if initial:
3592 prompt += ' ("x" to clear) [%s]' % initial
3593 new_val = ask_for_data(prompt + ':')
3594 if new_val == 'x':
3595 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3596 elif new_val:
3597 if is_url:
3598 new_val = gclient_utils.UpgradeToHttps(new_val)
3599 if new_val != initial:
3600 RunGit(['config', 'rietveld.' + name, new_val])
3601
3602 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3603 SetProperty(settings.GetDefaultPrivateFlag(),
3604 'Private flag (rietveld only)', 'private', False)
3605 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3606 'tree-status-url', False)
3607 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3608 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3609 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3610 'run-post-upload-hook', False)
3611
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003612
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003613class _GitCookiesChecker(object):
3614 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003615
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003616 _GOOGLESOURCE = 'googlesource.com'
3617
3618 def __init__(self):
3619 # Cached list of [host, identity, source], where source is either
3620 # .gitcookies or .netrc.
3621 self._all_hosts = None
3622
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003623 def ensure_configured_gitcookies(self):
3624 """Runs checks and suggests fixes to make git use .gitcookies from default
3625 path."""
3626 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3627 configured_path = RunGitSilent(
3628 ['config', '--global', 'http.cookiefile']).strip()
3629 if configured_path:
3630 self._ensure_default_gitcookies_path(configured_path, default)
3631 else:
3632 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003633
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003634 @staticmethod
3635 def _ensure_default_gitcookies_path(configured_path, default_path):
3636 assert configured_path
3637 if configured_path == default_path:
3638 print('git is already configured to use your .gitcookies from %s' %
3639 configured_path)
3640 return
3641
3642 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3643 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3644 (configured_path, default_path))
3645
3646 if not os.path.exists(configured_path):
3647 print('However, your configured .gitcookies file is missing.')
3648 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3649 action='reconfigure')
3650 RunGit(['config', '--global', 'http.cookiefile', default_path])
3651 return
3652
3653 if os.path.exists(default_path):
3654 print('WARNING: default .gitcookies file already exists %s' %
3655 default_path)
3656 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3657 default_path)
3658
3659 confirm_or_exit('Move existing .gitcookies to default location?',
3660 action='move')
3661 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003662 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003663 print('Moved and reconfigured git to use .gitcookies from %s' %
3664 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003665
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003666 @staticmethod
3667 def _configure_gitcookies_path(default_path):
3668 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3669 if os.path.exists(netrc_path):
3670 print('You seem to be using outdated .netrc for git credentials: %s' %
3671 netrc_path)
3672 print('This tool will guide you through setting up recommended '
3673 '.gitcookies store for git credentials.\n'
3674 '\n'
3675 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3676 ' git config --global --unset http.cookiefile\n'
3677 ' mv %s %s.backup\n\n' % (default_path, default_path))
3678 confirm_or_exit(action='setup .gitcookies')
3679 RunGit(['config', '--global', 'http.cookiefile', default_path])
3680 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003681
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003682 def get_hosts_with_creds(self, include_netrc=False):
3683 if self._all_hosts is None:
3684 a = gerrit_util.CookiesAuthenticator()
3685 self._all_hosts = [
3686 (h, u, s)
3687 for h, u, s in itertools.chain(
3688 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3689 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3690 )
3691 if h.endswith(self._GOOGLESOURCE)
3692 ]
3693
3694 if include_netrc:
3695 return self._all_hosts
3696 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3697
3698 def print_current_creds(self, include_netrc=False):
3699 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3700 if not hosts:
3701 print('No Git/Gerrit credentials found')
3702 return
3703 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3704 header = [('Host', 'User', 'Which file'),
3705 ['=' * l for l in lengths]]
3706 for row in (header + hosts):
3707 print('\t'.join((('%%+%ds' % l) % s)
3708 for l, s in zip(lengths, row)))
3709
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003710 @staticmethod
3711 def _parse_identity(identity):
3712 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3713 username, domain = identity.split('.', 1)
3714 if username.startswith('git-'):
3715 username = username[len('git-'):]
3716 return username, domain
3717
3718 def _get_usernames_of_domain(self, domain):
3719 """Returns list of usernames referenced by .gitcookies in a given domain."""
3720 identities_by_domain = {}
3721 for _, identity, _ in self.get_hosts_with_creds():
3722 username, domain = self._parse_identity(identity)
3723 identities_by_domain.setdefault(domain, []).append(username)
3724 return identities_by_domain.get(domain)
3725
3726 def _canonical_git_googlesource_host(self, host):
3727 """Normalizes Gerrit hosts (with '-review') to Git host."""
3728 assert host.endswith(self._GOOGLESOURCE)
3729 # Prefix doesn't include '.' at the end.
3730 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3731 if prefix.endswith('-review'):
3732 prefix = prefix[:-len('-review')]
3733 return prefix + '.' + self._GOOGLESOURCE
3734
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003735 def _canonical_gerrit_googlesource_host(self, host):
3736 git_host = self._canonical_git_googlesource_host(host)
3737 prefix = git_host.split('.', 1)[0]
3738 return prefix + '-review.' + self._GOOGLESOURCE
3739
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003740 def has_generic_host(self):
3741 """Returns whether generic .googlesource.com has been configured.
3742
3743 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3744 """
3745 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3746 if host == '.' + self._GOOGLESOURCE:
3747 return True
3748 return False
3749
3750 def _get_git_gerrit_identity_pairs(self):
3751 """Returns map from canonic host to pair of identities (Git, Gerrit).
3752
3753 One of identities might be None, meaning not configured.
3754 """
3755 host_to_identity_pairs = {}
3756 for host, identity, _ in self.get_hosts_with_creds():
3757 canonical = self._canonical_git_googlesource_host(host)
3758 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3759 idx = 0 if canonical == host else 1
3760 pair[idx] = identity
3761 return host_to_identity_pairs
3762
3763 def get_partially_configured_hosts(self):
3764 return set(
3765 host for host, identities_pair in
3766 self._get_git_gerrit_identity_pairs().iteritems()
3767 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3768
3769 def get_conflicting_hosts(self):
3770 return set(
3771 host for host, (i1, i2) in
3772 self._get_git_gerrit_identity_pairs().iteritems()
3773 if None not in (i1, i2) and i1 != i2)
3774
3775 def get_duplicated_hosts(self):
3776 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3777 return set(host for host, count in counters.iteritems() if count > 1)
3778
3779 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3780 'chromium.googlesource.com': 'chromium.org',
3781 'chrome-internal.googlesource.com': 'google.com',
3782 }
3783
3784 def get_hosts_with_wrong_identities(self):
3785 """Finds hosts which **likely** reference wrong identities.
3786
3787 Note: skips hosts which have conflicting identities for Git and Gerrit.
3788 """
3789 hosts = set()
3790 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3791 pair = self._get_git_gerrit_identity_pairs().get(host)
3792 if pair and pair[0] == pair[1]:
3793 _, domain = self._parse_identity(pair[0])
3794 if domain != expected:
3795 hosts.add(host)
3796 return hosts
3797
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003798 @staticmethod
3799 def print_hosts(hosts, extra_column_func=None):
3800 hosts = sorted(hosts)
3801 assert hosts
3802 if extra_column_func is None:
3803 extras = [''] * len(hosts)
3804 else:
3805 extras = [extra_column_func(host) for host in hosts]
3806 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3807 for he in zip(hosts, extras):
3808 print(tmpl % he)
3809 print()
3810
3811 def find_and_report_problems(self):
3812 """Returns True if there was at least one problem, else False."""
3813 problems = [False]
3814 def add_problem():
3815 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003816 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003817 problems[0] = True
3818
3819 if self.has_generic_host():
3820 add_problem()
3821 print(' .googlesource.com record detected\n'
3822 ' Chrome Infrastructure team recommends to list full host names '
3823 'explicitly.\n')
3824
3825 dups = self.get_duplicated_hosts()
3826 if dups:
3827 add_problem()
3828 print(' The following hosts were defined twice:\n')
3829 self.print_hosts(dups)
3830
3831 partial = self.get_partially_configured_hosts()
3832 if partial:
3833 add_problem()
3834 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3835 'These hosts are missing:')
3836 self.print_hosts(partial)
3837
3838 conflicting = self.get_conflicting_hosts()
3839 if conflicting:
3840 add_problem()
3841 print(' The following Git hosts have differing credentials from their '
3842 'Gerrit counterparts:\n')
3843 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3844 tuple(self._get_git_gerrit_identity_pairs()[host]))
3845
3846 wrong = self.get_hosts_with_wrong_identities()
3847 if wrong:
3848 add_problem()
3849 print(' These hosts likely use wrong identity:\n')
3850 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3851 (self._get_git_gerrit_identity_pairs()[host][0],
3852 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3853 return problems[0]
3854
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003855
3856def CMDcreds_check(parser, args):
3857 """Checks credentials and suggests changes."""
3858 _, _ = parser.parse_args(args)
3859
3860 if gerrit_util.GceAuthenticator.is_gce():
3861 DieWithError('this command is not designed for GCE, are you on a bot?')
3862
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003863 checker = _GitCookiesChecker()
3864 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003865
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003866 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003867 checker.print_current_creds(include_netrc=True)
3868
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003869 if not checker.find_and_report_problems():
3870 print('\nNo problems detected in your .gitcookies')
3871 return 0
3872 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003873
3874
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003875@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003876def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003877 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003878
tandrii5d0a0422016-09-14 06:24:35 -07003879 print('WARNING: git cl config works for Rietveld only')
3880 # TODO(tandrii): remove this once we switch to Gerrit.
3881 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003882 parser.add_option('--activate-update', action='store_true',
3883 help='activate auto-updating [rietveld] section in '
3884 '.git/config')
3885 parser.add_option('--deactivate-update', action='store_true',
3886 help='deactivate auto-updating [rietveld] section in '
3887 '.git/config')
3888 options, args = parser.parse_args(args)
3889
3890 if options.deactivate_update:
3891 RunGit(['config', 'rietveld.autoupdate', 'false'])
3892 return
3893
3894 if options.activate_update:
3895 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3896 return
3897
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003898 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003899 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003900 return 0
3901
3902 url = args[0]
3903 if not url.endswith('codereview.settings'):
3904 url = os.path.join(url, 'codereview.settings')
3905
3906 # Load code review settings and download hooks (if available).
3907 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3908 return 0
3909
3910
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003911def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003912 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003913 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3914 branch = ShortBranchName(branchref)
3915 _, args = parser.parse_args(args)
3916 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003917 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003918 return RunGit(['config', 'branch.%s.base-url' % branch],
3919 error_ok=False).strip()
3920 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003921 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003922 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3923 error_ok=False).strip()
3924
3925
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003926def color_for_status(status):
3927 """Maps a Changelist status to color, for CMDstatus and other tools."""
3928 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003929 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003930 'waiting': Fore.BLUE,
3931 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003932 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003933 'lgtm': Fore.GREEN,
3934 'commit': Fore.MAGENTA,
3935 'closed': Fore.CYAN,
3936 'error': Fore.WHITE,
3937 }.get(status, Fore.WHITE)
3938
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003939
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003940def get_cl_statuses(changes, fine_grained, max_processes=None):
3941 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003942
3943 If fine_grained is true, this will fetch CL statuses from the server.
3944 Otherwise, simply indicate if there's a matching url for the given branches.
3945
3946 If max_processes is specified, it is used as the maximum number of processes
3947 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3948 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003949
3950 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003951 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003952 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003953 upload.verbosity = 0
3954
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003955 if not changes:
3956 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003957
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003958 if not fine_grained:
3959 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003960 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003961 for cl in changes:
3962 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003963 return
3964
3965 # First, sort out authentication issues.
3966 logging.debug('ensuring credentials exist')
3967 for cl in changes:
3968 cl.EnsureAuthenticated(force=False, refresh=True)
3969
3970 def fetch(cl):
3971 try:
3972 return (cl, cl.GetStatus())
3973 except:
3974 # See http://crbug.com/629863.
3975 logging.exception('failed to fetch status for %s:', cl)
3976 raise
3977
3978 threads_count = len(changes)
3979 if max_processes:
3980 threads_count = max(1, min(threads_count, max_processes))
3981 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3982
3983 pool = ThreadPool(threads_count)
3984 fetched_cls = set()
3985 try:
3986 it = pool.imap_unordered(fetch, changes).__iter__()
3987 while True:
3988 try:
3989 cl, status = it.next(timeout=5)
3990 except multiprocessing.TimeoutError:
3991 break
3992 fetched_cls.add(cl)
3993 yield cl, status
3994 finally:
3995 pool.close()
3996
3997 # Add any branches that failed to fetch.
3998 for cl in set(changes) - fetched_cls:
3999 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004000
rmistry@google.com2dd99862015-06-22 12:22:18 +00004001
4002def upload_branch_deps(cl, args):
4003 """Uploads CLs of local branches that are dependents of the current branch.
4004
4005 If the local branch dependency tree looks like:
4006 test1 -> test2.1 -> test3.1
4007 -> test3.2
4008 -> test2.2 -> test3.3
4009
4010 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4011 run on the dependent branches in this order:
4012 test2.1, test3.1, test3.2, test2.2, test3.3
4013
4014 Note: This function does not rebase your local dependent branches. Use it when
4015 you make a change to the parent branch that will not conflict with its
4016 dependent branches, and you would like their dependencies updated in
4017 Rietveld.
4018 """
4019 if git_common.is_dirty_git_tree('upload-branch-deps'):
4020 return 1
4021
4022 root_branch = cl.GetBranch()
4023 if root_branch is None:
4024 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4025 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004026 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004027 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4028 'patchset dependencies without an uploaded CL.')
4029
4030 branches = RunGit(['for-each-ref',
4031 '--format=%(refname:short) %(upstream:short)',
4032 'refs/heads'])
4033 if not branches:
4034 print('No local branches found.')
4035 return 0
4036
4037 # Create a dictionary of all local branches to the branches that are dependent
4038 # on it.
4039 tracked_to_dependents = collections.defaultdict(list)
4040 for b in branches.splitlines():
4041 tokens = b.split()
4042 if len(tokens) == 2:
4043 branch_name, tracked = tokens
4044 tracked_to_dependents[tracked].append(branch_name)
4045
vapiera7fbd5a2016-06-16 09:17:49 -07004046 print()
4047 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004048 dependents = []
4049 def traverse_dependents_preorder(branch, padding=''):
4050 dependents_to_process = tracked_to_dependents.get(branch, [])
4051 padding += ' '
4052 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004054 dependents.append(dependent)
4055 traverse_dependents_preorder(dependent, padding)
4056 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004057 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004058
4059 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004060 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004061 return 0
4062
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004063 confirm_or_exit('This command will checkout all dependent branches and run '
4064 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004065
andybons@chromium.org962f9462016-02-03 20:00:42 +00004066 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004067 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004068 args.extend(['-t', 'Updated patchset dependency'])
4069
rmistry@google.com2dd99862015-06-22 12:22:18 +00004070 # Record all dependents that failed to upload.
4071 failures = {}
4072 # Go through all dependents, checkout the branch and upload.
4073 try:
4074 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print()
4076 print('--------------------------------------')
4077 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004078 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004080 try:
4081 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004083 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004084 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004085 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004086 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004087 finally:
4088 # Swap back to the original root branch.
4089 RunGit(['checkout', '-q', root_branch])
4090
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print()
4092 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004093 for dependent_branch in dependents:
4094 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004095 print(' %s : %s' % (dependent_branch, upload_status))
4096 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004097
4098 return 0
4099
4100
kmarshall3bff56b2016-06-06 18:31:47 -07004101def CMDarchive(parser, args):
4102 """Archives and deletes branches associated with closed changelists."""
4103 parser.add_option(
4104 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004105 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004106 parser.add_option(
4107 '-f', '--force', action='store_true',
4108 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004109 parser.add_option(
4110 '-d', '--dry-run', action='store_true',
4111 help='Skip the branch tagging and removal steps.')
4112 parser.add_option(
4113 '-t', '--notags', action='store_true',
4114 help='Do not tag archived branches. '
4115 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004116
4117 auth.add_auth_options(parser)
4118 options, args = parser.parse_args(args)
4119 if args:
4120 parser.error('Unsupported args: %s' % ' '.join(args))
4121 auth_config = auth.extract_auth_config_from_options(options)
4122
4123 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4124 if not branches:
4125 return 0
4126
vapiera7fbd5a2016-06-16 09:17:49 -07004127 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004128 changes = [Changelist(branchref=b, auth_config=auth_config)
4129 for b in branches.splitlines()]
4130 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4131 statuses = get_cl_statuses(changes,
4132 fine_grained=True,
4133 max_processes=options.maxjobs)
4134 proposal = [(cl.GetBranch(),
4135 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4136 for cl, status in statuses
4137 if status == 'closed']
4138 proposal.sort()
4139
4140 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004141 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004142 return 0
4143
4144 current_branch = GetCurrentBranch()
4145
vapiera7fbd5a2016-06-16 09:17:49 -07004146 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004147 if options.notags:
4148 for next_item in proposal:
4149 print(' ' + next_item[0])
4150 else:
4151 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4152 for next_item in proposal:
4153 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004154
kmarshall9249e012016-08-23 12:02:16 -07004155 # Quit now on precondition failure or if instructed by the user, either
4156 # via an interactive prompt or by command line flags.
4157 if options.dry_run:
4158 print('\nNo changes were made (dry run).\n')
4159 return 0
4160 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004161 print('You are currently on a branch \'%s\' which is associated with a '
4162 'closed codereview issue, so archive cannot proceed. Please '
4163 'checkout another branch and run this command again.' %
4164 current_branch)
4165 return 1
kmarshall9249e012016-08-23 12:02:16 -07004166 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004167 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4168 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004170 return 1
4171
4172 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004173 if not options.notags:
4174 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004175 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004176
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004178
4179 return 0
4180
4181
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004182def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004183 """Show status of changelists.
4184
4185 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004186 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004187 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004188 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004189 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004190 - Magenta in the commit queue
4191 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004192 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004193
4194 Also see 'git cl comments'.
4195 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004197 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004198 parser.add_option('-f', '--fast', action='store_true',
4199 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004200 parser.add_option(
4201 '-j', '--maxjobs', action='store', type=int,
4202 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004203
4204 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004205 _add_codereview_issue_select_options(
4206 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004207 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004208 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004209 if args:
4210 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004211 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212
iannuccie53c9352016-08-17 14:40:40 -07004213 if options.issue is not None and not options.field:
4214 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004215
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004216 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004217 cl = Changelist(auth_config=auth_config, issue=options.issue,
4218 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004220 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004221 elif options.field == 'id':
4222 issueid = cl.GetIssue()
4223 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004224 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004225 elif options.field == 'patch':
4226 patchset = cl.GetPatchset()
4227 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004228 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004229 elif options.field == 'status':
4230 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004231 elif options.field == 'url':
4232 url = cl.GetIssueURL()
4233 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004234 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004235 return 0
4236
4237 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4238 if not branches:
4239 print('No local branch found.')
4240 return 0
4241
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004242 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004243 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004244 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004245 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004246 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004247 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004248 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004249
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004250 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004251 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4252 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4253 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004254 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004255 c, status = output.next()
4256 branch_statuses[c.GetBranch()] = status
4257 status = branch_statuses.pop(branch)
4258 url = cl.GetIssueURL()
4259 if url and (not status or status == 'error'):
4260 # The issue probably doesn't exist anymore.
4261 url += ' (broken)'
4262
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004263 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004264 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004265 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004266 color = ''
4267 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004268 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004269 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004270 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004271 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004272
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004273
4274 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004275 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004276 print('Current branch: %s' % branch)
4277 for cl in changes:
4278 if cl.GetBranch() == branch:
4279 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004280 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004281 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004282 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004283 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004284 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004285 print('Issue description:')
4286 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004287 return 0
4288
4289
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004290def colorize_CMDstatus_doc():
4291 """To be called once in main() to add colors to git cl status help."""
4292 colors = [i for i in dir(Fore) if i[0].isupper()]
4293
4294 def colorize_line(line):
4295 for color in colors:
4296 if color in line.upper():
4297 # Extract whitespaces first and the leading '-'.
4298 indent = len(line) - len(line.lstrip(' ')) + 1
4299 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4300 return line
4301
4302 lines = CMDstatus.__doc__.splitlines()
4303 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4304
4305
phajdan.jre328cf92016-08-22 04:12:17 -07004306def write_json(path, contents):
4307 with open(path, 'w') as f:
4308 json.dump(contents, f)
4309
4310
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004311@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004312def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004313 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004314
4315 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004316 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004317 parser.add_option('-r', '--reverse', action='store_true',
4318 help='Lookup the branch(es) for the specified issues. If '
4319 'no issues are specified, all branches with mapped '
4320 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004321 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004322 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004323 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004324 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004325
dnj@chromium.org406c4402015-03-03 17:22:28 +00004326 if options.reverse:
4327 branches = RunGit(['for-each-ref', 'refs/heads',
4328 '--format=%(refname:short)']).splitlines()
4329
4330 # Reverse issue lookup.
4331 issue_branch_map = {}
4332 for branch in branches:
4333 cl = Changelist(branchref=branch)
4334 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4335 if not args:
4336 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004337 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004338 for issue in args:
4339 if not issue:
4340 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004341 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004342 print('Branch for issue number %s: %s' % (
4343 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004344 if options.json:
4345 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004346 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004347 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004348 if len(args) > 0:
4349 try:
4350 issue = int(args[0])
4351 except ValueError:
4352 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004353 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004354 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004355 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004356 if options.json:
4357 write_json(options.json, {
4358 'issue': cl.GetIssue(),
4359 'issue_url': cl.GetIssueURL(),
4360 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004361 return 0
4362
4363
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004364def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004365 """Shows or posts review comments for any changelist."""
4366 parser.add_option('-a', '--add-comment', dest='comment',
4367 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004368 parser.add_option('-i', '--issue', dest='issue',
4369 help='review issue id (defaults to current issue). '
4370 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004371 parser.add_option('-j', '--json-file',
4372 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004373 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004374 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004375 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004376 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004377 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004378
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004379 issue = None
4380 if options.issue:
4381 try:
4382 issue = int(options.issue)
4383 except ValueError:
4384 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004385 if not options.forced_codereview:
4386 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004387
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004388 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004389 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004390 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004391
4392 if options.comment:
4393 cl.AddComment(options.comment)
4394 return 0
4395
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004396 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4397 for comment in summary:
4398 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004399 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004400 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004401 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004402 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004403 color = Fore.MAGENTA
4404 else:
4405 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004406 print('\n%s%s %s%s\n%s' % (
4407 color,
4408 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4409 comment.sender,
4410 Fore.RESET,
4411 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4412
smut@google.comc85ac942015-09-15 16:34:43 +00004413 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004414 def pre_serialize(c):
4415 dct = c.__dict__.copy()
4416 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4417 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004418 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004419 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004420 return 0
4421
4422
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004423@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004424def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004425 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004426 parser.add_option('-d', '--display', action='store_true',
4427 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004428 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004429 help='New description to set for this issue (- for stdin, '
4430 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004431 parser.add_option('-f', '--force', action='store_true',
4432 help='Delete any unpublished Gerrit edits for this issue '
4433 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004434
4435 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004436 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004437 options, args = parser.parse_args(args)
4438 _process_codereview_select_options(parser, options)
4439
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004440 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004441 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004442 target_issue_arg = ParseIssueNumberArgument(args[0],
4443 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004444 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004445 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004446
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004447 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004448
martiniss6eda05f2016-06-30 10:18:35 -07004449 kwargs = {
4450 'auth_config': auth_config,
4451 'codereview': options.forced_codereview,
4452 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004453 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004454 if target_issue_arg:
4455 kwargs['issue'] = target_issue_arg.issue
4456 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004457 if target_issue_arg.codereview and not options.forced_codereview:
4458 detected_codereview_from_url = True
4459 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004460
4461 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004462 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004463 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004464 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004465
4466 if detected_codereview_from_url:
4467 logging.info('canonical issue/change URL: %s (type: %s)\n',
4468 cl.GetIssueURL(), target_issue_arg.codereview)
4469
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004470 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004471
smut@google.com34fb6b12015-07-13 20:03:26 +00004472 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004473 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004474 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004475
4476 if options.new_description:
4477 text = options.new_description
4478 if text == '-':
4479 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004480 elif text == '+':
4481 base_branch = cl.GetCommonAncestorWithUpstream()
4482 change = cl.GetChange(base_branch, None, local_description=True)
4483 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004484
4485 description.set_description(text)
4486 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004487 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004488
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004489 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004490 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004491 return 0
4492
4493
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494def CreateDescriptionFromLog(args):
4495 """Pulls out the commit log to use as a base for the CL description."""
4496 log_args = []
4497 if len(args) == 1 and not args[0].endswith('.'):
4498 log_args = [args[0] + '..']
4499 elif len(args) == 1 and args[0].endswith('...'):
4500 log_args = [args[0][:-1]]
4501 elif len(args) == 2:
4502 log_args = [args[0] + '..' + args[1]]
4503 else:
4504 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004505 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506
4507
thestig@chromium.org44202a22014-03-11 19:22:18 +00004508def CMDlint(parser, args):
4509 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004510 parser.add_option('--filter', action='append', metavar='-x,+y',
4511 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004512 auth.add_auth_options(parser)
4513 options, args = parser.parse_args(args)
4514 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004515
4516 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004517 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004518 try:
4519 import cpplint
4520 import cpplint_chromium
4521 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004522 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004523 return 1
4524
4525 # Change the current working directory before calling lint so that it
4526 # shows the correct base.
4527 previous_cwd = os.getcwd()
4528 os.chdir(settings.GetRoot())
4529 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004530 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004531 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4532 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004533 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004534 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004535 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004536
4537 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004538 command = args + files
4539 if options.filter:
4540 command = ['--filter=' + ','.join(options.filter)] + command
4541 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004542
4543 white_regex = re.compile(settings.GetLintRegex())
4544 black_regex = re.compile(settings.GetLintIgnoreRegex())
4545 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4546 for filename in filenames:
4547 if white_regex.match(filename):
4548 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004549 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004550 else:
4551 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4552 extra_check_functions)
4553 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004554 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004555 finally:
4556 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004557 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004558 if cpplint._cpplint_state.error_count != 0:
4559 return 1
4560 return 0
4561
4562
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004564 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004565 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004566 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004567 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004568 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004569 auth.add_auth_options(parser)
4570 options, args = parser.parse_args(args)
4571 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004572
sbc@chromium.org71437c02015-04-09 19:29:40 +00004573 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004574 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575 return 1
4576
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004577 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578 if args:
4579 base_branch = args[0]
4580 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004581 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004582 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004583
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004584 cl.RunHook(
4585 committing=not options.upload,
4586 may_prompt=False,
4587 verbose=options.verbose,
4588 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004589 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004590
4591
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004592def GenerateGerritChangeId(message):
4593 """Returns Ixxxxxx...xxx change id.
4594
4595 Works the same way as
4596 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4597 but can be called on demand on all platforms.
4598
4599 The basic idea is to generate git hash of a state of the tree, original commit
4600 message, author/committer info and timestamps.
4601 """
4602 lines = []
4603 tree_hash = RunGitSilent(['write-tree'])
4604 lines.append('tree %s' % tree_hash.strip())
4605 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4606 if code == 0:
4607 lines.append('parent %s' % parent.strip())
4608 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4609 lines.append('author %s' % author.strip())
4610 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4611 lines.append('committer %s' % committer.strip())
4612 lines.append('')
4613 # Note: Gerrit's commit-hook actually cleans message of some lines and
4614 # whitespace. This code is not doing this, but it clearly won't decrease
4615 # entropy.
4616 lines.append(message)
4617 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4618 stdin='\n'.join(lines))
4619 return 'I%s' % change_hash.strip()
4620
4621
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004622def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004623 """Computes the remote branch ref to use for the CL.
4624
4625 Args:
4626 remote (str): The git remote for the CL.
4627 remote_branch (str): The git remote branch for the CL.
4628 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004629 """
4630 if not (remote and remote_branch):
4631 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004632
wittman@chromium.org455dc922015-01-26 20:15:50 +00004633 if target_branch:
4634 # Cannonicalize branch references to the equivalent local full symbolic
4635 # refs, which are then translated into the remote full symbolic refs
4636 # below.
4637 if '/' not in target_branch:
4638 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4639 else:
4640 prefix_replacements = (
4641 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4642 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4643 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4644 )
4645 match = None
4646 for regex, replacement in prefix_replacements:
4647 match = re.search(regex, target_branch)
4648 if match:
4649 remote_branch = target_branch.replace(match.group(0), replacement)
4650 break
4651 if not match:
4652 # This is a branch path but not one we recognize; use as-is.
4653 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004654 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4655 # Handle the refs that need to land in different refs.
4656 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004657
wittman@chromium.org455dc922015-01-26 20:15:50 +00004658 # Create the true path to the remote branch.
4659 # Does the following translation:
4660 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4661 # * refs/remotes/origin/master -> refs/heads/master
4662 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4663 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4664 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4665 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4666 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4667 'refs/heads/')
4668 elif remote_branch.startswith('refs/remotes/branch-heads'):
4669 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004670
wittman@chromium.org455dc922015-01-26 20:15:50 +00004671 return remote_branch
4672
4673
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004674def cleanup_list(l):
4675 """Fixes a list so that comma separated items are put as individual items.
4676
4677 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4678 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4679 """
4680 items = sum((i.split(',') for i in l), [])
4681 stripped_items = (i.strip() for i in items)
4682 return sorted(filter(None, stripped_items))
4683
4684
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004685@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004686def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004687 """Uploads the current changelist to codereview.
4688
4689 Can skip dependency patchset uploads for a branch by running:
4690 git config branch.branch_name.skip-deps-uploads True
4691 To unset run:
4692 git config --unset branch.branch_name.skip-deps-uploads
4693 Can also set the above globally by using the --global flag.
4694 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004695 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4696 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004697 parser.add_option('--bypass-watchlists', action='store_true',
4698 dest='bypass_watchlists',
4699 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004700 parser.add_option('-f', action='store_true', dest='force',
4701 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004702 parser.add_option('--message', '-m', dest='message',
4703 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004704 parser.add_option('-b', '--bug',
4705 help='pre-populate the bug number(s) for this issue. '
4706 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004707 parser.add_option('--message-file', dest='message_file',
4708 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004709 parser.add_option('--title', '-t', dest='title',
4710 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004711 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004712 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004713 help='reviewer email addresses')
4714 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004715 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004716 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004717 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004718 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004719 parser.add_option('--emulate_svn_auto_props',
4720 '--emulate-svn-auto-props',
4721 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004722 dest="emulate_svn_auto_props",
4723 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004724 parser.add_option('-c', '--use-commit-queue', action='store_true',
4725 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004726 parser.add_option('--private', action='store_true',
4727 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004728 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004729 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004730 metavar='TARGET',
4731 help='Apply CL to remote ref TARGET. ' +
4732 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004733 parser.add_option('--squash', action='store_true',
4734 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004735 parser.add_option('--no-squash', action='store_true',
4736 help='Don\'t squash multiple commits into one ' +
4737 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004738 parser.add_option('--topic', default=None,
4739 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004740 parser.add_option('--email', default=None,
4741 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004742 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4743 const='TBR', help='add a set of OWNERS to TBR')
4744 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4745 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004746 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4747 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004748 help='Send the patchset to do a CQ dry run right after '
4749 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004750 parser.add_option('--dependencies', action='store_true',
4751 help='Uploads CLs of all the local branches that depend on '
4752 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004753
rmistry@google.com2dd99862015-06-22 12:22:18 +00004754 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004755 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004756 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004757 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004758 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004759 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004760 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004761
sbc@chromium.org71437c02015-04-09 19:29:40 +00004762 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004763 return 1
4764
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004765 options.reviewers = cleanup_list(options.reviewers)
4766 options.cc = cleanup_list(options.cc)
4767
tandriib80458a2016-06-23 12:20:07 -07004768 if options.message_file:
4769 if options.message:
4770 parser.error('only one of --message and --message-file allowed.')
4771 options.message = gclient_utils.FileRead(options.message_file)
4772 options.message_file = None
4773
tandrii4d0545a2016-07-06 03:56:49 -07004774 if options.cq_dry_run and options.use_commit_queue:
4775 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4776
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004777 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4778 settings.GetIsGerrit()
4779
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004780 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004781 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004782
4783
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004784@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004785def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004786 """DEPRECATED: Used to commit the current changelist via git-svn."""
4787 message = ('git-cl no longer supports committing to SVN repositories via '
4788 'git-svn. You probably want to use `git cl land` instead.')
4789 print(message)
4790 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791
4792
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004793# Two special branches used by git cl land.
4794MERGE_BRANCH = 'git-cl-commit'
4795CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4796
4797
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004798@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004799def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004800 """Commits the current changelist via git.
4801
4802 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4803 upstream and closes the issue automatically and atomically.
4804
4805 Otherwise (in case of Rietveld):
4806 Squashes branch into a single commit.
4807 Updates commit message with metadata (e.g. pointer to review).
4808 Pushes the code upstream.
4809 Updates review and closes.
4810 """
4811 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4812 help='bypass upload presubmit hook')
4813 parser.add_option('-m', dest='message',
4814 help="override review description")
4815 parser.add_option('-f', action='store_true', dest='force',
4816 help="force yes to questions (don't prompt)")
4817 parser.add_option('-c', dest='contributor',
4818 help="external contributor for patch (appended to " +
4819 "description and used as author for git). Should be " +
4820 "formatted as 'First Last <email@example.com>'")
4821 add_git_similarity(parser)
4822 auth.add_auth_options(parser)
4823 (options, args) = parser.parse_args(args)
4824 auth_config = auth.extract_auth_config_from_options(options)
4825
4826 cl = Changelist(auth_config=auth_config)
4827
4828 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4829 if cl.IsGerrit():
4830 if options.message:
4831 # This could be implemented, but it requires sending a new patch to
4832 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4833 # Besides, Gerrit has the ability to change the commit message on submit
4834 # automatically, thus there is no need to support this option (so far?).
4835 parser.error('-m MESSAGE option is not supported for Gerrit.')
4836 if options.contributor:
4837 parser.error(
4838 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4839 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4840 'the contributor\'s "name <email>". If you can\'t upload such a '
4841 'commit for review, contact your repository admin and request'
4842 '"Forge-Author" permission.')
4843 if not cl.GetIssue():
4844 DieWithError('You must upload the change first to Gerrit.\n'
4845 ' If you would rather have `git cl land` upload '
4846 'automatically for you, see http://crbug.com/642759')
4847 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4848 options.verbose)
4849
4850 current = cl.GetBranch()
4851 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4852 if remote == '.':
4853 print()
4854 print('Attempting to push branch %r into another local branch!' % current)
4855 print()
4856 print('Either reparent this branch on top of origin/master:')
4857 print(' git reparent-branch --root')
4858 print()
4859 print('OR run `git rebase-update` if you think the parent branch is ')
4860 print('already committed.')
4861 print()
4862 print(' Current parent: %r' % upstream_branch)
4863 return 1
4864
4865 if not args:
4866 # Default to merging against our best guess of the upstream branch.
4867 args = [cl.GetUpstreamBranch()]
4868
4869 if options.contributor:
4870 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4871 print("Please provide contibutor as 'First Last <email@example.com>'")
4872 return 1
4873
4874 base_branch = args[0]
4875
4876 if git_common.is_dirty_git_tree('land'):
4877 return 1
4878
4879 # This rev-list syntax means "show all commits not in my branch that
4880 # are in base_branch".
4881 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4882 base_branch]).splitlines()
4883 if upstream_commits:
4884 print('Base branch "%s" has %d commits '
4885 'not in this branch.' % (base_branch, len(upstream_commits)))
4886 print('Run "git merge %s" before attempting to land.' % base_branch)
4887 return 1
4888
4889 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4890 if not options.bypass_hooks:
4891 author = None
4892 if options.contributor:
4893 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4894 hook_results = cl.RunHook(
4895 committing=True,
4896 may_prompt=not options.force,
4897 verbose=options.verbose,
4898 change=cl.GetChange(merge_base, author))
4899 if not hook_results.should_continue():
4900 return 1
4901
4902 # Check the tree status if the tree status URL is set.
4903 status = GetTreeStatus()
4904 if 'closed' == status:
4905 print('The tree is closed. Please wait for it to reopen. Use '
4906 '"git cl land --bypass-hooks" to commit on a closed tree.')
4907 return 1
4908 elif 'unknown' == status:
4909 print('Unable to determine tree status. Please verify manually and '
4910 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4911 return 1
4912
4913 change_desc = ChangeDescription(options.message)
4914 if not change_desc.description and cl.GetIssue():
4915 change_desc = ChangeDescription(cl.GetDescription())
4916
4917 if not change_desc.description:
4918 if not cl.GetIssue() and options.bypass_hooks:
4919 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4920 else:
4921 print('No description set.')
4922 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4923 return 1
4924
4925 # Keep a separate copy for the commit message, because the commit message
4926 # contains the link to the Rietveld issue, while the Rietveld message contains
4927 # the commit viewvc url.
4928 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07004929 change_desc.update_reviewers(
4930 get_approving_reviewers(cl.GetIssueProperties()))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004931
4932 commit_desc = ChangeDescription(change_desc.description)
4933 if cl.GetIssue():
4934 # Xcode won't linkify this URL unless there is a non-whitespace character
4935 # after it. Add a period on a new line to circumvent this. Also add a space
4936 # before the period to make sure that Gitiles continues to correctly resolve
4937 # the URL.
4938 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4939 if options.contributor:
4940 commit_desc.append_footer('Patch from %s.' % options.contributor)
4941
4942 print('Description:')
4943 print(commit_desc.description)
4944
4945 branches = [merge_base, cl.GetBranchRef()]
4946 if not options.force:
4947 print_stats(options.similarity, options.find_copies, branches)
4948
4949 # We want to squash all this branch's commits into one commit with the proper
4950 # description. We do this by doing a "reset --soft" to the base branch (which
4951 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004952 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004953 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4954 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4955 result = RunGitWithCode(showref_cmd)
4956 if result[0] == 0:
4957 RunGit(['branch', '-D', branch])
4958
4959 # We might be in a directory that's present in this branch but not in the
4960 # trunk. Move up to the top of the tree so that git commands that expect a
4961 # valid CWD won't fail after we check out the merge branch.
4962 rel_base_path = settings.GetRelativeRoot()
4963 if rel_base_path:
4964 os.chdir(rel_base_path)
4965
4966 # Stuff our change into the merge branch.
4967 # We wrap in a try...finally block so if anything goes wrong,
4968 # we clean up the branches.
4969 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004970 revision = None
4971 try:
4972 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4973 RunGit(['reset', '--soft', merge_base])
4974 if options.contributor:
4975 RunGit(
4976 [
4977 'commit', '--author', options.contributor,
4978 '-m', commit_desc.description,
4979 ])
4980 else:
4981 RunGit(['commit', '-m', commit_desc.description])
4982
4983 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4984 mirror = settings.GetGitMirror(remote)
4985 if mirror:
4986 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004987 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 else:
4989 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004990 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004991 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4992
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004993 retcode = PushToGitWithAutoRebase(
4994 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004995 if retcode == 0:
4996 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004997 if git_numberer_enabled:
4998 change_desc = ChangeDescription(
4999 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005000 except: # pylint: disable=bare-except
5001 if _IS_BEING_TESTED:
5002 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5003 + '-' * 30 + '8<' + '-' * 30)
5004 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5005 raise
5006 finally:
5007 # And then swap back to the original branch and clean up.
5008 RunGit(['checkout', '-q', cl.GetBranch()])
5009 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005010 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005011
5012 if not revision:
5013 print('Failed to push. If this persists, please file a bug.')
5014 return 1
5015
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005016 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005017 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005018 if viewvc_url and revision:
5019 change_desc.append_footer(
5020 'Committed: %s%s' % (viewvc_url, revision))
5021 elif revision:
5022 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005023 print('Closing issue '
5024 '(you may be prompted for your codereview password)...')
5025 cl.UpdateDescription(change_desc.description)
5026 cl.CloseIssue()
5027 props = cl.GetIssueProperties()
5028 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005029 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5030 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005031 if options.bypass_hooks:
5032 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5033 else:
5034 comment += ' (presubmit successful).'
5035 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5036
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005037 if os.path.isfile(POSTUPSTREAM_HOOK):
5038 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5039
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005040 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005041
5042
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005043def PushToGitWithAutoRebase(remote, branch, original_description,
5044 git_numberer_enabled, max_attempts=3):
5045 """Pushes current HEAD commit on top of remote's branch.
5046
5047 Attempts to fetch and autorebase on push failures.
5048 Adds git number footers on the fly.
5049
5050 Returns integer code from last command.
5051 """
5052 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5053 code = 0
5054 attempts_left = max_attempts
5055 while attempts_left:
5056 attempts_left -= 1
5057 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5058
5059 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5060 # If fetch fails, retry.
5061 print('Fetching %s/%s...' % (remote, branch))
5062 code, out = RunGitWithCode(
5063 ['retry', 'fetch', remote,
5064 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5065 if code:
5066 print('Fetch failed with exit code %d.' % code)
5067 print(out.strip())
5068 continue
5069
5070 print('Cherry-picking commit on top of latest %s' % branch)
5071 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5072 suppress_stderr=True)
5073 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5074 code, out = RunGitWithCode(['cherry-pick', cherry])
5075 if code:
5076 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5077 'the following files have merge conflicts:' %
5078 (branch, parent_hash))
5079 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5080 print('Please rebase your patch and try again.')
5081 RunGitWithCode(['cherry-pick', '--abort'])
5082 break
5083
5084 commit_desc = ChangeDescription(original_description)
5085 if git_numberer_enabled:
5086 logging.debug('Adding git number footers')
5087 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5088 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5089 branch)
5090 # Ensure timestamps are monotonically increasing.
5091 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5092 _get_committer_timestamp('HEAD'))
5093 _git_amend_head(commit_desc.description, timestamp)
5094
5095 code, out = RunGitWithCode(
5096 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5097 print(out)
5098 if code == 0:
5099 break
5100 if IsFatalPushFailure(out):
5101 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005102 'user.email are correct and you have push access to the repo.\n'
5103 'Hint: run command below to diangose common Git/Gerrit credential '
5104 'problems:\n'
5105 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005106 break
5107 return code
5108
5109
5110def IsFatalPushFailure(push_stdout):
5111 """True if retrying push won't help."""
5112 return '(prohibited by Gerrit)' in push_stdout
5113
5114
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005115@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005116def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005117 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005118 parser.add_option('-b', dest='newbranch',
5119 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005120 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005121 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005122 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5123 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005124 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005125 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005126 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005127 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005128 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005129 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005130
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005131
5132 group = optparse.OptionGroup(
5133 parser,
5134 'Options for continuing work on the current issue uploaded from a '
5135 'different clone (e.g. different machine). Must be used independently '
5136 'from the other options. No issue number should be specified, and the '
5137 'branch must have an issue number associated with it')
5138 group.add_option('--reapply', action='store_true', dest='reapply',
5139 help='Reset the branch and reapply the issue.\n'
5140 'CAUTION: This will undo any local changes in this '
5141 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005142
5143 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005144 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005145 parser.add_option_group(group)
5146
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005147 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005148 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005149 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005150 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005151 auth_config = auth.extract_auth_config_from_options(options)
5152
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005153 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005154 if options.newbranch:
5155 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005156 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005157 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005158
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005159 cl = Changelist(auth_config=auth_config,
5160 codereview=options.forced_codereview)
5161 if not cl.GetIssue():
5162 parser.error('current branch must have an associated issue')
5163
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005164 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005165 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005166 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005167
5168 RunGit(['reset', '--hard', upstream])
5169 if options.pull:
5170 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005171
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005172 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5173 options.directory)
5174
5175 if len(args) != 1 or not args[0]:
5176 parser.error('Must specify issue number or url')
5177
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005178 target_issue_arg = ParseIssueNumberArgument(args[0],
5179 options.forced_codereview)
5180 if not target_issue_arg.valid:
5181 parser.error('invalid codereview url or CL id')
5182
5183 cl_kwargs = {
5184 'auth_config': auth_config,
5185 'codereview_host': target_issue_arg.hostname,
5186 'codereview': options.forced_codereview,
5187 }
5188 detected_codereview_from_url = False
5189 if target_issue_arg.codereview and not options.forced_codereview:
5190 detected_codereview_from_url = True
5191 cl_kwargs['codereview'] = target_issue_arg.codereview
5192 cl_kwargs['issue'] = target_issue_arg.issue
5193
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005194 # We don't want uncommitted changes mixed up with the patch.
5195 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005196 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005197
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005198 if options.newbranch:
5199 if options.force:
5200 RunGit(['branch', '-D', options.newbranch],
5201 stderr=subprocess2.PIPE, error_ok=True)
5202 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005203 elif not GetCurrentBranch():
5204 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005205
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005206 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005207
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005208 if cl.IsGerrit():
5209 if options.reject:
5210 parser.error('--reject is not supported with Gerrit codereview.')
5211 if options.nocommit:
5212 parser.error('--nocommit is not supported with Gerrit codereview.')
5213 if options.directory:
5214 parser.error('--directory is not supported with Gerrit codereview.')
5215
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005216 if detected_codereview_from_url:
5217 print('canonical issue/change URL: %s (type: %s)\n' %
5218 (cl.GetIssueURL(), target_issue_arg.codereview))
5219
5220 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5221 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005222
5223
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005224def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005225 """Fetches the tree status and returns either 'open', 'closed',
5226 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005227 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005228 if url:
5229 status = urllib2.urlopen(url).read().lower()
5230 if status.find('closed') != -1 or status == '0':
5231 return 'closed'
5232 elif status.find('open') != -1 or status == '1':
5233 return 'open'
5234 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005235 return 'unset'
5236
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005237
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005238def GetTreeStatusReason():
5239 """Fetches the tree status from a json url and returns the message
5240 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005241 url = settings.GetTreeStatusUrl()
5242 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005243 connection = urllib2.urlopen(json_url)
5244 status = json.loads(connection.read())
5245 connection.close()
5246 return status['message']
5247
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005248
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005249def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005250 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005251 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005252 status = GetTreeStatus()
5253 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005254 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005255 return 2
5256
vapiera7fbd5a2016-06-16 09:17:49 -07005257 print('The tree is %s' % status)
5258 print()
5259 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260 if status != 'open':
5261 return 1
5262 return 0
5263
5264
maruel@chromium.org15192402012-09-06 12:38:29 +00005265def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005266 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005267 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005268 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005269 '-b', '--bot', action='append',
5270 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5271 'times to specify multiple builders. ex: '
5272 '"-b win_rel -b win_layout". See '
5273 'the try server waterfall for the builders name and the tests '
5274 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005275 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005276 '-B', '--bucket', default='',
5277 help=('Buildbucket bucket to send the try requests.'))
5278 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005279 '-m', '--master', default='',
5280 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005281 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005282 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005283 help='Revision to use for the try job; default: the revision will '
5284 'be determined by the try recipe that builder runs, which usually '
5285 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005286 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005287 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005288 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005289 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005290 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005291 '--project',
5292 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005293 'in recipe to determine to which repository or directory to '
5294 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005295 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005296 '-p', '--property', dest='properties', action='append', default=[],
5297 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005298 'key2=value2 etc. The value will be treated as '
5299 'json if decodable, or as string otherwise. '
5300 'NOTE: using this may make your try job not usable for CQ, '
5301 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005302 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005303 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5304 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005305 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005306 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005307 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005308 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005309
machenbach@chromium.org45453142015-09-15 08:45:22 +00005310 # Make sure that all properties are prop=value pairs.
5311 bad_params = [x for x in options.properties if '=' not in x]
5312 if bad_params:
5313 parser.error('Got properties with missing "=": %s' % bad_params)
5314
maruel@chromium.org15192402012-09-06 12:38:29 +00005315 if args:
5316 parser.error('Unknown arguments: %s' % args)
5317
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005318 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005319 if not cl.GetIssue():
5320 parser.error('Need to upload first')
5321
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005322 if cl.IsGerrit():
5323 # HACK: warm up Gerrit change detail cache to save on RPCs.
5324 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5325
tandriie113dfd2016-10-11 10:20:12 -07005326 error_message = cl.CannotTriggerTryJobReason()
5327 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005328 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005329
borenet6c0efe62016-10-19 08:13:29 -07005330 if options.bucket and options.master:
5331 parser.error('Only one of --bucket and --master may be used.')
5332
qyearsley1fdfcb62016-10-24 13:22:03 -07005333 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005334
qyearsleydd49f942016-10-28 11:57:22 -07005335 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5336 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005337 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005338 if options.verbose:
5339 print('git cl try with no bots now defaults to CQ Dry Run.')
5340 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005341
borenet6c0efe62016-10-19 08:13:29 -07005342 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005343 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005344 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005345 'of bot requires an initial job from a parent (usually a builder). '
5346 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005347 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005348 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005349
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005350 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005351 # TODO(tandrii): Checking local patchset against remote patchset is only
5352 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5353 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005354 print('Warning: Codereview server has newer patchsets (%s) than most '
5355 'recent upload from local checkout (%s). Did a previous upload '
5356 'fail?\n'
5357 'By default, git cl try uses the latest patchset from '
5358 'codereview, continuing to use patchset %s.\n' %
5359 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005360
tandrii568043b2016-10-11 07:49:18 -07005361 try:
borenet6c0efe62016-10-19 08:13:29 -07005362 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5363 patchset)
tandrii568043b2016-10-11 07:49:18 -07005364 except BuildbucketResponseException as ex:
5365 print('ERROR: %s' % ex)
5366 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005367 return 0
5368
5369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005370def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005371 """Prints info about try jobs associated with current CL."""
5372 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005373 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005374 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005375 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005376 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005377 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005378 '--color', action='store_true', default=setup_color.IS_TTY,
5379 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005380 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005381 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5382 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005383 group.add_option(
5384 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005385 parser.add_option_group(group)
5386 auth.add_auth_options(parser)
5387 options, args = parser.parse_args(args)
5388 if args:
5389 parser.error('Unrecognized args: %s' % ' '.join(args))
5390
5391 auth_config = auth.extract_auth_config_from_options(options)
5392 cl = Changelist(auth_config=auth_config)
5393 if not cl.GetIssue():
5394 parser.error('Need to upload first')
5395
tandrii221ab252016-10-06 08:12:04 -07005396 patchset = options.patchset
5397 if not patchset:
5398 patchset = cl.GetMostRecentPatchset()
5399 if not patchset:
5400 parser.error('Codereview doesn\'t know about issue %s. '
5401 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005402 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005403 cl.GetIssue())
5404
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005405 # TODO(tandrii): Checking local patchset against remote patchset is only
5406 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5407 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005408 print('Warning: Codereview server has newer patchsets (%s) than most '
5409 'recent upload from local checkout (%s). Did a previous upload '
5410 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005411 'By default, git cl try-results uses the latest patchset from '
5412 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005413 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005414 try:
tandrii221ab252016-10-06 08:12:04 -07005415 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005416 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005417 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005418 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005419 if options.json:
5420 write_try_results_json(options.json, jobs)
5421 else:
5422 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005423 return 0
5424
5425
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005426@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005427def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005428 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005429 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005430 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005431 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005432
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005433 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005434 if args:
5435 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005436 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005437 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005438 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005439 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005440
5441 # Clear configured merge-base, if there is one.
5442 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005443 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005444 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005445 return 0
5446
5447
thestig@chromium.org00858c82013-12-02 23:08:03 +00005448def CMDweb(parser, args):
5449 """Opens the current CL in the web browser."""
5450 _, args = parser.parse_args(args)
5451 if args:
5452 parser.error('Unrecognized args: %s' % ' '.join(args))
5453
5454 issue_url = Changelist().GetIssueURL()
5455 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005456 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005457 return 1
5458
5459 webbrowser.open(issue_url)
5460 return 0
5461
5462
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005463def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005464 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005465 parser.add_option('-d', '--dry-run', action='store_true',
5466 help='trigger in dry run mode')
5467 parser.add_option('-c', '--clear', action='store_true',
5468 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005469 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005470 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005471 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005472 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005473 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005474 if args:
5475 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005476 if options.dry_run and options.clear:
5477 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5478
iannuccie53c9352016-08-17 14:40:40 -07005479 cl = Changelist(auth_config=auth_config, issue=options.issue,
5480 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005481 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005482 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005483 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005484 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005485 state = _CQState.DRY_RUN
5486 else:
5487 state = _CQState.COMMIT
5488 if not cl.GetIssue():
5489 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005490 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005491 return 0
5492
5493
groby@chromium.org411034a2013-02-26 15:12:01 +00005494def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005495 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005496 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005497 auth.add_auth_options(parser)
5498 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005499 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005500 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005501 if args:
5502 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005503 cl = Changelist(auth_config=auth_config, issue=options.issue,
5504 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005505 # Ensure there actually is an issue to close.
5506 cl.GetDescription()
5507 cl.CloseIssue()
5508 return 0
5509
5510
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005511def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005512 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005513 parser.add_option(
5514 '--stat',
5515 action='store_true',
5516 dest='stat',
5517 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005518 auth.add_auth_options(parser)
5519 options, args = parser.parse_args(args)
5520 auth_config = auth.extract_auth_config_from_options(options)
5521 if args:
5522 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005523
5524 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005525 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005526 # Staged changes would be committed along with the patch from last
5527 # upload, hence counted toward the "last upload" side in the final
5528 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005529 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005530 return 1
5531
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005532 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005533 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005534 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005535 if not issue:
5536 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005537 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005538 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005539
5540 # Create a new branch based on the merge-base
5541 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005542 # Clear cached branch in cl object, to avoid overwriting original CL branch
5543 # properties.
5544 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005545 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005546 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005547 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005548 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005549 return rtn
5550
wychen@chromium.org06928532015-02-03 02:11:29 +00005551 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005552 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005553 cmd = ['git', 'diff']
5554 if options.stat:
5555 cmd.append('--stat')
5556 cmd.extend([TMP_BRANCH, branch, '--'])
5557 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005558 finally:
5559 RunGit(['checkout', '-q', branch])
5560 RunGit(['branch', '-D', TMP_BRANCH])
5561
5562 return 0
5563
5564
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005565def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005566 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005567 parser.add_option(
5568 '--no-color',
5569 action='store_true',
5570 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005571 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005572 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005573 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005574
5575 author = RunGit(['config', 'user.email']).strip() or None
5576
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005577 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005578
5579 if args:
5580 if len(args) > 1:
5581 parser.error('Unknown args')
5582 base_branch = args[0]
5583 else:
5584 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005585 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005586
5587 change = cl.GetChange(base_branch, None)
5588 return owners_finder.OwnersFinder(
5589 [f.LocalPath() for f in
5590 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005591 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005592 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005593 disable_color=options.no_color,
5594 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005595
5596
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005597def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005598 """Generates a diff command."""
5599 # Generate diff for the current branch's changes.
5600 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005601 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005602
5603 if args:
5604 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005605 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005606 diff_cmd.append(arg)
5607 else:
5608 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005609
5610 return diff_cmd
5611
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005612
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005613def MatchingFileType(file_name, extensions):
5614 """Returns true if the file name ends with one of the given extensions."""
5615 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005616
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005617
enne@chromium.org555cfe42014-01-29 18:21:39 +00005618@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005619def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005620 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005621 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005622 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005623 parser.add_option('--full', action='store_true',
5624 help='Reformat the full content of all touched files')
5625 parser.add_option('--dry-run', action='store_true',
5626 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005627 parser.add_option('--python', action='store_true',
5628 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005629 parser.add_option('--js', action='store_true',
5630 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005631 parser.add_option('--diff', action='store_true',
5632 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005633 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005634
Daniel Chengc55eecf2016-12-30 03:11:02 -08005635 # Normalize any remaining args against the current path, so paths relative to
5636 # the current directory are still resolved as expected.
5637 args = [os.path.join(os.getcwd(), arg) for arg in args]
5638
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005639 # git diff generates paths against the root of the repository. Change
5640 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005641 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005642 if rel_base_path:
5643 os.chdir(rel_base_path)
5644
digit@chromium.org29e47272013-05-17 17:01:46 +00005645 # Grab the merge-base commit, i.e. the upstream commit of the current
5646 # branch when it was created or the last time it was rebased. This is
5647 # to cover the case where the user may have called "git fetch origin",
5648 # moving the origin branch to a newer commit, but hasn't rebased yet.
5649 upstream_commit = None
5650 cl = Changelist()
5651 upstream_branch = cl.GetUpstreamBranch()
5652 if upstream_branch:
5653 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5654 upstream_commit = upstream_commit.strip()
5655
5656 if not upstream_commit:
5657 DieWithError('Could not find base commit for this branch. '
5658 'Are you in detached state?')
5659
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005660 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5661 diff_output = RunGit(changed_files_cmd)
5662 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005663 # Filter out files deleted by this CL
5664 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005665
Christopher Lamc5ba6922017-01-24 11:19:14 +11005666 if opts.js:
5667 CLANG_EXTS.append('.js')
5668
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005669 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5670 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5671 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005672 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005673
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005674 top_dir = os.path.normpath(
5675 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5676
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005677 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5678 # formatted. This is used to block during the presubmit.
5679 return_value = 0
5680
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005681 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005682 # Locate the clang-format binary in the checkout
5683 try:
5684 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005685 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005686 DieWithError(e)
5687
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005688 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005689 cmd = [clang_format_tool]
5690 if not opts.dry_run and not opts.diff:
5691 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005692 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005693 if opts.diff:
5694 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005695 else:
5696 env = os.environ.copy()
5697 env['PATH'] = str(os.path.dirname(clang_format_tool))
5698 try:
5699 script = clang_format.FindClangFormatScriptInChromiumTree(
5700 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005701 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005702 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005703
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005704 cmd = [sys.executable, script, '-p0']
5705 if not opts.dry_run and not opts.diff:
5706 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005707
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005708 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5709 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005710
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005711 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5712 if opts.diff:
5713 sys.stdout.write(stdout)
5714 if opts.dry_run and len(stdout) > 0:
5715 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005716
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005717 # Similar code to above, but using yapf on .py files rather than clang-format
5718 # on C/C++ files
5719 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005720 yapf_tool = gclient_utils.FindExecutable('yapf')
5721 if yapf_tool is None:
5722 DieWithError('yapf not found in PATH')
5723
5724 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005725 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005726 cmd = [yapf_tool]
5727 if not opts.dry_run and not opts.diff:
5728 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005729 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005730 if opts.diff:
5731 sys.stdout.write(stdout)
5732 else:
5733 # TODO(sbc): yapf --lines mode still has some issues.
5734 # https://github.com/google/yapf/issues/154
5735 DieWithError('--python currently only works with --full')
5736
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005737 # Dart's formatter does not have the nice property of only operating on
5738 # modified chunks, so hard code full.
5739 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005740 try:
5741 command = [dart_format.FindDartFmtToolInChromiumTree()]
5742 if not opts.dry_run and not opts.diff:
5743 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005744 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005745
ppi@chromium.org6593d932016-03-03 15:41:15 +00005746 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005747 if opts.dry_run and stdout:
5748 return_value = 2
5749 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005750 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5751 'found in this checkout. Files in other languages are still '
5752 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005753
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005754 # Format GN build files. Always run on full build files for canonical form.
5755 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005756 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005757 if opts.dry_run or opts.diff:
5758 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005759 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005760 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5761 shell=sys.platform == 'win32',
5762 cwd=top_dir)
5763 if opts.dry_run and gn_ret == 2:
5764 return_value = 2 # Not formatted.
5765 elif opts.diff and gn_ret == 2:
5766 # TODO this should compute and print the actual diff.
5767 print("This change has GN build file diff for " + gn_diff_file)
5768 elif gn_ret != 0:
5769 # For non-dry run cases (and non-2 return values for dry-run), a
5770 # nonzero error code indicates a failure, probably because the file
5771 # doesn't parse.
5772 DieWithError("gn format failed on " + gn_diff_file +
5773 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005774
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005775 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005776 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5777 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5778 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005779 for xml_file in metrics_xml_files:
5780 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005781 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5782 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005783 if opts.dry_run or opts.diff:
5784 cmd.append('--diff')
5785 stdout = RunCommand(cmd, cwd=top_dir)
5786 if opts.diff:
5787 sys.stdout.write(stdout)
5788 if opts.dry_run and stdout:
5789 return_value = 2 # Not formatted.
5790
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005791 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005792
5793
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005794@subcommand.usage('<codereview url or issue id>')
5795def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005796 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005797 _, args = parser.parse_args(args)
5798
5799 if len(args) != 1:
5800 parser.print_help()
5801 return 1
5802
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005803 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005804 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005805 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005806
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005807 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005808
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005809 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005810 output = RunGit(['config', '--local', '--get-regexp',
5811 r'branch\..*\.%s' % issueprefix],
5812 error_ok=True)
5813 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005814 if issue == target_issue:
5815 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005816
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005817 branches = []
5818 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005819 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005820 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005821 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005822 return 1
5823 if len(branches) == 1:
5824 RunGit(['checkout', branches[0]])
5825 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005826 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005827 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005828 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005829 which = raw_input('Choose by index: ')
5830 try:
5831 RunGit(['checkout', branches[int(which)]])
5832 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005833 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005834 return 1
5835
5836 return 0
5837
5838
maruel@chromium.org29404b52014-09-08 22:58:00 +00005839def CMDlol(parser, args):
5840 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005841 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005842 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5843 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5844 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005845 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005846 return 0
5847
5848
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005849class OptionParser(optparse.OptionParser):
5850 """Creates the option parse and add --verbose support."""
5851 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005852 optparse.OptionParser.__init__(
5853 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005854 self.add_option(
5855 '-v', '--verbose', action='count', default=0,
5856 help='Use 2 times for more debugging info')
5857
5858 def parse_args(self, args=None, values=None):
5859 options, args = optparse.OptionParser.parse_args(self, args, values)
5860 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005861 logging.basicConfig(
5862 level=levels[min(options.verbose, len(levels) - 1)],
5863 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5864 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005865 return options, args
5866
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005867
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005868def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005869 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005870 print('\nYour python version %s is unsupported, please upgrade.\n' %
5871 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005872 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005873
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005874 # Reload settings.
5875 global settings
5876 settings = Settings()
5877
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005878 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005879 dispatcher = subcommand.CommandDispatcher(__name__)
5880 try:
5881 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005882 except auth.AuthenticationError as e:
5883 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005884 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005885 if e.code != 500:
5886 raise
5887 DieWithError(
5888 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5889 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005890 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005891
5892
5893if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005894 # These affect sys.stdout so do it outside of main() to simplify mocks in
5895 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005896 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005897 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005898 try:
5899 sys.exit(main(sys.argv[1:]))
5900 except KeyboardInterrupt:
5901 sys.stderr.write('interrupted\n')
5902 sys.exit(1)