blob: b83a053b7b3a3a6ba269666192a20431c2b24f36 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 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
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
39try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080040 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000041except ImportError:
42 pass
43
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000044from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000045from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000046from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000058import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000059import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000060import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000061import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040063import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000064import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000065import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066import watchlists
67
tandrii7400cf02016-06-21 08:48:07 -070068__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000069
tandrii9d2c7a32016-06-22 03:42:45 -070070COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070071DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080072POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000073DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000074REFS_THAT_ALIAS_TO_OTHER_REFS = {
75 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
76 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
77}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000078
thestig@chromium.org44202a22014-03-11 19:22:18 +000079# Valid extensions for files we want to lint.
80DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
81DEFAULT_LINT_IGNORE_REGEX = r"$^"
82
borenet6c0efe62016-10-19 08:13:29 -070083# Buildbucket master name prefix.
84MASTER_PREFIX = 'master.'
85
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000086# Shortcut since it quickly becomes redundant.
87Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000088
maruel@chromium.orgddd59412011-11-30 14:20:38 +000089# Initialized in main()
90settings = None
91
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010092# Used by tests/git_cl_test.py to add extra logging.
93# Inside the weirdly failing test, add this:
94# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -070095# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010096_IS_BEING_TESTED = False
97
maruel@chromium.orgddd59412011-11-30 14:20:38 +000098
Christopher Lamf732cd52017-01-24 12:40:11 +110099def DieWithError(message, change_desc=None):
100 if change_desc:
101 SaveDescriptionBackup(change_desc)
102
vapiera7fbd5a2016-06-16 09:17:49 -0700103 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000104 sys.exit(1)
105
106
Christopher Lamf732cd52017-01-24 12:40:11 +1100107def SaveDescriptionBackup(change_desc):
108 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
109 print('\nError after CL description prompt -- saving description to %s\n' %
110 backup_path)
111 backup_file = open(backup_path, 'w')
112 backup_file.write(change_desc.description)
113 backup_file.close()
114
115
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000116def GetNoGitPagerEnv():
117 env = os.environ.copy()
118 # 'cat' is a magical git string that disables pagers on all platforms.
119 env['GIT_PAGER'] = 'cat'
120 return env
121
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000122
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000124 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000125 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000126 except subprocess2.CalledProcessError as e:
127 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000129 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000130 'Command "%s" failed.\n%s' % (
131 ' '.join(args), error_message or e.stdout or ''))
132 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133
134
135def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000136 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000137 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000138
139
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000140def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000141 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700142 if suppress_stderr:
143 stderr = subprocess2.VOID
144 else:
145 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000146 try:
tandrii5d48c322016-08-18 16:19:37 -0700147 (out, _), code = subprocess2.communicate(['git'] + args,
148 env=GetNoGitPagerEnv(),
149 stdout=subprocess2.PIPE,
150 stderr=stderr)
151 return code, out
152 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900153 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700154 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155
156
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000158 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000159 return RunGitWithCode(args, suppress_stderr=True)[1]
160
161
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000164 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000165 return (version.startswith(prefix) and
166 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000167
168
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000169def BranchExists(branch):
170 """Return True if specified branch exists."""
171 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
172 suppress_stderr=True)
173 return not code
174
175
tandrii2a16b952016-10-19 07:09:44 -0700176def time_sleep(seconds):
177 # Use this so that it can be mocked in tests without interfering with python
178 # system machinery.
179 import time # Local import to discourage others from importing time globally.
180 return time.sleep(seconds)
181
182
maruel@chromium.org90541732011-04-01 17:54:18 +0000183def ask_for_data(prompt):
184 try:
185 return raw_input(prompt)
186 except KeyboardInterrupt:
187 # Hide the exception.
188 sys.exit(1)
189
190
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100191def confirm_or_exit(prefix='', action='confirm'):
192 """Asks user to press enter to continue or press Ctrl+C to abort."""
193 if not prefix or prefix.endswith('\n'):
194 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100195 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100196 mid = ' Press'
197 elif prefix.endswith(' '):
198 mid = 'press'
199 else:
200 mid = ' press'
201 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
202
203
204def ask_for_explicit_yes(prompt):
205 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
206 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
207 while True:
208 if 'yes'.startswith(result):
209 return True
210 if 'no'.startswith(result):
211 return False
212 result = ask_for_data('Please, type yes or no: ').lower()
213
214
tandrii5d48c322016-08-18 16:19:37 -0700215def _git_branch_config_key(branch, key):
216 """Helper method to return Git config key for a branch."""
217 assert branch, 'branch name is required to set git config for it'
218 return 'branch.%s.%s' % (branch, key)
219
220
221def _git_get_branch_config_value(key, default=None, value_type=str,
222 branch=False):
223 """Returns git config value of given or current branch if any.
224
225 Returns default in all other cases.
226 """
227 assert value_type in (int, str, bool)
228 if branch is False: # Distinguishing default arg value from None.
229 branch = GetCurrentBranch()
230
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700232 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000233
tandrii5d48c322016-08-18 16:19:37 -0700234 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700235 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700236 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700237 # git config also has --int, but apparently git config suffers from integer
238 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700239 args.append(_git_branch_config_key(branch, key))
240 code, out = RunGitWithCode(args)
241 if code == 0:
242 value = out.strip()
243 if value_type == int:
244 return int(value)
245 if value_type == bool:
246 return bool(value.lower() == 'true')
247 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000248 return default
249
250
tandrii5d48c322016-08-18 16:19:37 -0700251def _git_set_branch_config_value(key, value, branch=None, **kwargs):
252 """Sets the value or unsets if it's None of a git branch config.
253
254 Valid, though not necessarily existing, branch must be provided,
255 otherwise currently checked out branch is used.
256 """
257 if not branch:
258 branch = GetCurrentBranch()
259 assert branch, 'a branch name OR currently checked out branch is required'
260 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700261 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700262 if value is None:
263 args.append('--unset')
264 elif isinstance(value, bool):
265 args.append('--bool')
266 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700267 else:
tandrii33a46ff2016-08-23 05:53:40 -0700268 # git config also has --int, but apparently git config suffers from integer
269 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700270 value = str(value)
271 args.append(_git_branch_config_key(branch, key))
272 if value is not None:
273 args.append(value)
274 RunGit(args, **kwargs)
275
276
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100277def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700278 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100279
280 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
281 """
282 # Git also stores timezone offset, but it only affects visual display,
283 # actual point in time is defined by this timestamp only.
284 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
285
286
287def _git_amend_head(message, committer_timestamp):
288 """Amends commit with new message and desired committer_timestamp.
289
290 Sets committer timezone to UTC.
291 """
292 env = os.environ.copy()
293 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
294 return RunGit(['commit', '--amend', '-m', message], env=env)
295
296
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000297def add_git_similarity(parser):
298 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700299 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000300 help='Sets the percentage that a pair of files need to match in order to'
301 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000302 parser.add_option(
303 '--find-copies', action='store_true',
304 help='Allows git to look for copies.')
305 parser.add_option(
306 '--no-find-copies', action='store_false', dest='find_copies',
307 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000308
309 old_parser_args = parser.parse_args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 def Parse(args):
312 options, args = old_parser_args(args)
313
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700315 options.similarity = _git_get_branch_config_value(
316 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000317 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000318 print('Note: Saving similarity of %d%% in git config.'
319 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700320 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000321
iannucci@chromium.org79540052012-10-19 23:15:26 +0000322 options.similarity = max(0, min(options.similarity, 100))
323
324 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700325 options.find_copies = _git_get_branch_config_value(
326 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000327 else:
tandrii5d48c322016-08-18 16:19:37 -0700328 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000329
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000330 return options, args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700331
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000332 parser.parse_args = Parse
333
334
machenbach@chromium.org45453142015-09-15 08:45:22 +0000335def _get_properties_from_options(options):
336 properties = dict(x.split('=', 1) for x in options.properties)
337 for key, val in properties.iteritems():
338 try:
339 properties[key] = json.loads(val)
340 except ValueError:
341 pass # If a value couldn't be evaluated, treat it as a string.
342 return properties
343
344
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000345def _prefix_master(master):
346 """Convert user-specified master name to full master name.
347
348 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
349 name, while the developers always use shortened master name
350 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
351 function does the conversion for buildbucket migration.
352 """
borenet6c0efe62016-10-19 08:13:29 -0700353 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000354 return master
borenet6c0efe62016-10-19 08:13:29 -0700355 return '%s%s' % (MASTER_PREFIX, master)
356
357
358def _unprefix_master(bucket):
359 """Convert bucket name to shortened master name.
360
361 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
362 name, while the developers always use shortened master name
363 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
364 function does the conversion for buildbucket migration.
365 """
366 if bucket.startswith(MASTER_PREFIX):
367 return bucket[len(MASTER_PREFIX):]
368 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000369
370
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000371def _buildbucket_retry(operation_name, http, *args, **kwargs):
372 """Retries requests to buildbucket service and returns parsed json content."""
373 try_count = 0
374 while True:
375 response, content = http.request(*args, **kwargs)
376 try:
377 content_json = json.loads(content)
378 except ValueError:
379 content_json = None
380
381 # Buildbucket could return an error even if status==200.
382 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000383 error = content_json.get('error')
384 if error.get('code') == 403:
385 raise BuildbucketResponseException(
386 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000387 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000388 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000389 raise BuildbucketResponseException(msg)
390
391 if response.status == 200:
392 if not content_json:
393 raise BuildbucketResponseException(
394 'Buildbucket returns invalid json content: %s.\n'
395 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
396 content)
397 return content_json
398 if response.status < 500 or try_count >= 2:
399 raise httplib2.HttpLib2Error(content)
400
401 # status >= 500 means transient failures.
402 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700403 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000404 try_count += 1
405 assert False, 'unreachable'
406
407
qyearsley1fdfcb62016-10-24 13:22:03 -0700408def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700409 """Returns a dict mapping bucket names to builders and tests,
410 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700411 """
qyearsleydd49f942016-10-28 11:57:22 -0700412 # If no bots are listed, we try to get a set of builders and tests based
413 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700414 if not options.bot:
415 change = changelist.GetChange(
416 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700417 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700418 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 change=change,
420 changed_files=change.LocalPaths(),
421 repository_root=settings.GetRoot(),
422 default_presubmit=None,
423 project=None,
424 verbose=options.verbose,
425 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700426 if masters is None:
427 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100428 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700429
qyearsley1fdfcb62016-10-24 13:22:03 -0700430 if options.bucket:
431 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700432 if options.master:
433 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700434
qyearsleydd49f942016-10-28 11:57:22 -0700435 # If bots are listed but no master or bucket, then we need to find out
436 # the corresponding master for each bot.
437 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
438 if error_message:
439 option_parser.error(
440 'Tryserver master cannot be found because: %s\n'
441 'Please manually specify the tryserver master, e.g. '
442 '"-m tryserver.chromium.linux".' % error_message)
443 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700444
445
qyearsley123a4682016-10-26 09:12:17 -0700446def _get_bucket_map_for_builders(builders):
447 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700448 map_url = 'https://builders-map.appspot.com/'
449 try:
qyearsley123a4682016-10-26 09:12:17 -0700450 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 except urllib2.URLError as e:
452 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
453 (map_url, e))
454 except ValueError as e:
455 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700456 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700457 return None, 'Failed to build master map.'
458
qyearsley123a4682016-10-26 09:12:17 -0700459 bucket_map = {}
460 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700461 masters = builders_map.get(builder, [])
462 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700463 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700464 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700465 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700466 (builder, masters))
467 bucket = _prefix_master(masters[0])
468 bucket_map.setdefault(bucket, {})[builder] = []
469
470 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700471
472
borenet6c0efe62016-10-19 08:13:29 -0700473def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700474 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700475 """Sends a request to Buildbucket to trigger try jobs for a changelist.
476
477 Args:
478 auth_config: AuthConfig for Rietveld.
479 changelist: Changelist that the try jobs are associated with.
480 buckets: A nested dict mapping bucket names to builders to tests.
481 options: Command-line options.
482 """
tandriide281ae2016-10-12 06:02:30 -0700483 assert changelist.GetIssue(), 'CL must be uploaded first'
484 codereview_url = changelist.GetCodereviewServer()
485 assert codereview_url, 'CL must be uploaded first'
486 patchset = patchset or changelist.GetMostRecentPatchset()
487 assert patchset, 'CL must be uploaded first'
488
489 codereview_host = urlparse.urlparse(codereview_url).hostname
490 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000491 http = authenticator.authorize(httplib2.Http())
492 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700493
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000494 buildbucket_put_url = (
495 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000496 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700497 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
498 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
499 hostname=codereview_host,
500 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000501 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700502
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700503 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700504 shared_parameters_properties['category'] = category
505 if options.clobber:
506 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700507 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700508 if extra_properties:
509 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000510
511 batch_req_body = {'builds': []}
512 print_text = []
513 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700514 for bucket, builders_and_tests in sorted(buckets.iteritems()):
515 print_text.append('Bucket: %s' % bucket)
516 master = None
517 if bucket.startswith(MASTER_PREFIX):
518 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000519 for builder, tests in sorted(builders_and_tests.iteritems()):
520 print_text.append(' %s: %s' % (builder, tests))
521 parameters = {
522 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000523 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100524 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000525 'revision': options.revision,
526 }],
tandrii8c5a3532016-11-04 07:52:02 -0700527 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000529 if 'presubmit' in builder.lower():
530 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000531 if tests:
532 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700533
534 tags = [
535 'builder:%s' % builder,
536 'buildset:%s' % buildset,
537 'user_agent:git_cl_try',
538 ]
539 if master:
540 parameters['properties']['master'] = master
541 tags.append('master:%s' % master)
542
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000543 batch_req_body['builds'].append(
544 {
545 'bucket': bucket,
546 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000547 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700548 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000549 }
550 )
551
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700553 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 http,
555 buildbucket_put_url,
556 'PUT',
557 body=json.dumps(batch_req_body),
558 headers={'Content-Type': 'application/json'}
559 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000560 print_text.append('To see results here, run: git cl try-results')
561 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700562 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000563
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000564
tandrii221ab252016-10-06 08:12:04 -0700565def fetch_try_jobs(auth_config, changelist, buildbucket_host,
566 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700567 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568
qyearsley53f48a12016-09-01 10:45:13 -0700569 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570 """
tandrii221ab252016-10-06 08:12:04 -0700571 assert buildbucket_host
572 assert changelist.GetIssue(), 'CL must be uploaded first'
573 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
574 patchset = patchset or changelist.GetMostRecentPatchset()
575 assert patchset, 'CL must be uploaded first'
576
577 codereview_url = changelist.GetCodereviewServer()
578 codereview_host = urlparse.urlparse(codereview_url).hostname
579 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580 if authenticator.has_cached_credentials():
581 http = authenticator.authorize(httplib2.Http())
582 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700583 print('Warning: Some results might be missing because %s' %
584 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700585 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586 http = httplib2.Http()
587
588 http.force_exception_to_status_code = True
589
tandrii221ab252016-10-06 08:12:04 -0700590 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
591 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
592 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700594 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 params = {'tag': 'buildset:%s' % buildset}
596
597 builds = {}
598 while True:
599 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700600 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700602 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 for build in content.get('builds', []):
604 builds[build['id']] = build
605 if 'next_cursor' in content:
606 params['start_cursor'] = content['next_cursor']
607 else:
608 break
609 return builds
610
611
qyearsleyeab3c042016-08-24 09:18:28 -0700612def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 """Prints nicely result of fetch_try_jobs."""
614 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700615 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616 return
617
618 # Make a copy, because we'll be modifying builds dictionary.
619 builds = builds.copy()
620 builder_names_cache = {}
621
622 def get_builder(b):
623 try:
624 return builder_names_cache[b['id']]
625 except KeyError:
626 try:
627 parameters = json.loads(b['parameters_json'])
628 name = parameters['builder_name']
629 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700630 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700631 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632 name = None
633 builder_names_cache[b['id']] = name
634 return name
635
636 def get_bucket(b):
637 bucket = b['bucket']
638 if bucket.startswith('master.'):
639 return bucket[len('master.'):]
640 return bucket
641
642 if options.print_master:
643 name_fmt = '%%-%ds %%-%ds' % (
644 max(len(str(get_bucket(b))) for b in builds.itervalues()),
645 max(len(str(get_builder(b))) for b in builds.itervalues()))
646 def get_name(b):
647 return name_fmt % (get_bucket(b), get_builder(b))
648 else:
649 name_fmt = '%%-%ds' % (
650 max(len(str(get_builder(b))) for b in builds.itervalues()))
651 def get_name(b):
652 return name_fmt % get_builder(b)
653
654 def sort_key(b):
655 return b['status'], b.get('result'), get_name(b), b.get('url')
656
657 def pop(title, f, color=None, **kwargs):
658 """Pop matching builds from `builds` dict and print them."""
659
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000660 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000661 colorize = str
662 else:
663 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
664
665 result = []
666 for b in builds.values():
667 if all(b.get(k) == v for k, v in kwargs.iteritems()):
668 builds.pop(b['id'])
669 result.append(b)
670 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700671 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700673 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675 total = len(builds)
676 pop(status='COMPLETED', result='SUCCESS',
677 title='Successes:', color=Fore.GREEN,
678 f=lambda b: (get_name(b), b.get('url')))
679 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
680 title='Infra Failures:', color=Fore.MAGENTA,
681 f=lambda b: (get_name(b), b.get('url')))
682 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
683 title='Failures:', color=Fore.RED,
684 f=lambda b: (get_name(b), b.get('url')))
685 pop(status='COMPLETED', result='CANCELED',
686 title='Canceled:', color=Fore.MAGENTA,
687 f=lambda b: (get_name(b),))
688 pop(status='COMPLETED', result='FAILURE',
689 failure_reason='INVALID_BUILD_DEFINITION',
690 title='Wrong master/builder name:', color=Fore.MAGENTA,
691 f=lambda b: (get_name(b),))
692 pop(status='COMPLETED', result='FAILURE',
693 title='Other failures:',
694 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
695 pop(status='COMPLETED',
696 title='Other finished:',
697 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
698 pop(status='STARTED',
699 title='Started:', color=Fore.YELLOW,
700 f=lambda b: (get_name(b), b.get('url')))
701 pop(status='SCHEDULED',
702 title='Scheduled:',
703 f=lambda b: (get_name(b), 'id=%s' % b['id']))
704 # The last section is just in case buildbucket API changes OR there is a bug.
705 pop(title='Other:',
706 f=lambda b: (get_name(b), 'id=%s' % b['id']))
707 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700708 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000709
710
qyearsley53f48a12016-09-01 10:45:13 -0700711def write_try_results_json(output_file, builds):
712 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
713
714 The input |builds| dict is assumed to be generated by Buildbucket.
715 Buildbucket documentation: http://goo.gl/G0s101
716 """
717
718 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800719 """Extracts some of the information from one build dict."""
720 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700721 return {
722 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700723 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800724 'builder_name': parameters.get('builder_name'),
725 'created_ts': build.get('created_ts'),
726 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700727 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800728 'result': build.get('result'),
729 'status': build.get('status'),
730 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700731 'url': build.get('url'),
732 }
733
734 converted = []
735 for _, build in sorted(builds.items()):
736 converted.append(convert_build_dict(build))
737 write_json(output_file, converted)
738
739
iannucci@chromium.org79540052012-10-19 23:15:26 +0000740def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 """Prints statistics about the change to the user."""
742 # --no-ext-diff is broken in some versions of Git, so try to work around
743 # this by overriding the environment (but there is still a problem if the
744 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000745 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000746 if 'GIT_EXTERNAL_DIFF' in env:
747 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000748
749 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800750 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000751 else:
752 similarity_options = ['-M%s' % similarity]
753
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000754 try:
755 stdout = sys.stdout.fileno()
756 except AttributeError:
757 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000759 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000760 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000761 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762
763
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000764class BuildbucketResponseException(Exception):
765 pass
766
767
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768class Settings(object):
769 def __init__(self):
770 self.default_server = None
771 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000772 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773 self.tree_status_url = None
774 self.viewvc_url = None
775 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000776 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000777 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000778 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000779 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000780 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000781 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000782
783 def LazyUpdateIfNeeded(self):
784 """Updates the settings from a codereview.settings file, if available."""
785 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000786 # The only value that actually changes the behavior is
787 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000788 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000789 error_ok=True
790 ).strip().lower()
791
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000793 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000794 LoadCodereviewSettingsFromFile(cr_settings_file)
795 self.updated = True
796
797 def GetDefaultServerUrl(self, error_ok=False):
798 if not self.default_server:
799 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000800 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 if error_ok:
803 return self.default_server
804 if not self.default_server:
805 error_message = ('Could not find settings file. You must configure '
806 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000807 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000808 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 return self.default_server
810
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 @staticmethod
812 def GetRelativeRoot():
813 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000814
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000816 if self.root is None:
817 self.root = os.path.abspath(self.GetRelativeRoot())
818 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000820 def GetGitMirror(self, remote='origin'):
821 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000822 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000823 if not os.path.isdir(local_url):
824 return None
825 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
826 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100827 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100828 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000829 if mirror.exists():
830 return mirror
831 return None
832
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 def GetTreeStatusUrl(self, error_ok=False):
834 if not self.tree_status_url:
835 error_message = ('You must configure your tree status URL by running '
836 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000837 self.tree_status_url = self._GetRietveldConfig(
838 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.tree_status_url
840
841 def GetViewVCUrl(self):
842 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000843 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 return self.viewvc_url
845
rmistry@google.com90752582014-01-14 21:04:50 +0000846 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000847 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000848
rmistry@google.com78948ed2015-07-08 23:09:57 +0000849 def GetIsSkipDependencyUpload(self, branch_name):
850 """Returns true if specified branch should skip dep uploads."""
851 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
852 error_ok=True)
853
rmistry@google.com5626a922015-02-26 14:03:30 +0000854 def GetRunPostUploadHook(self):
855 run_post_upload_hook = self._GetRietveldConfig(
856 'run-post-upload-hook', error_ok=True)
857 return run_post_upload_hook == "True"
858
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000859 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000860 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000861
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000862 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000863 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000864
ukai@chromium.orge8077812012-02-03 03:41:46 +0000865 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700866 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000867 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700868 self.is_gerrit = (
869 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000870 return self.is_gerrit
871
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000872 def GetSquashGerritUploads(self):
873 """Return true if uploads to Gerrit should be squashed by default."""
874 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700875 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
876 if self.squash_gerrit_uploads is None:
877 # Default is squash now (http://crbug.com/611892#c23).
878 self.squash_gerrit_uploads = not (
879 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
880 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000881 return self.squash_gerrit_uploads
882
tandriia60502f2016-06-20 02:01:53 -0700883 def GetSquashGerritUploadsOverride(self):
884 """Return True or False if codereview.settings should be overridden.
885
886 Returns None if no override has been defined.
887 """
888 # See also http://crbug.com/611892#c23
889 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
890 error_ok=True).strip()
891 if result == 'true':
892 return True
893 if result == 'false':
894 return False
895 return None
896
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 def GetGerritSkipEnsureAuthenticated(self):
898 """Return True if EnsureAuthenticated should not be done for Gerrit
899 uploads."""
900 if self.gerrit_skip_ensure_authenticated is None:
901 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000902 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000903 error_ok=True).strip() == 'true')
904 return self.gerrit_skip_ensure_authenticated
905
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000906 def GetGitEditor(self):
907 """Return the editor specified in the git config, or None if none is."""
908 if self.git_editor is None:
909 self.git_editor = self._GetConfig('core.editor', error_ok=True)
910 return self.git_editor or None
911
thestig@chromium.org44202a22014-03-11 19:22:18 +0000912 def GetLintRegex(self):
913 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
914 DEFAULT_LINT_REGEX)
915
916 def GetLintIgnoreRegex(self):
917 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
918 DEFAULT_LINT_IGNORE_REGEX)
919
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000920 def GetProject(self):
921 if not self.project:
922 self.project = self._GetRietveldConfig('project', error_ok=True)
923 return self.project
924
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000925 def _GetRietveldConfig(self, param, **kwargs):
926 return self._GetConfig('rietveld.' + param, **kwargs)
927
rmistry@google.com78948ed2015-07-08 23:09:57 +0000928 def _GetBranchConfig(self, branch_name, param, **kwargs):
929 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
930
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000931 def _GetConfig(self, param, **kwargs):
932 self.LazyUpdateIfNeeded()
933 return RunGit(['config', param], **kwargs).strip()
934
935
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100936@contextlib.contextmanager
937def _get_gerrit_project_config_file(remote_url):
938 """Context manager to fetch and store Gerrit's project.config from
939 refs/meta/config branch and store it in temp file.
940
941 Provides a temporary filename or None if there was error.
942 """
943 error, _ = RunGitWithCode([
944 'fetch', remote_url,
945 '+refs/meta/config:refs/git_cl/meta/config'])
946 if error:
947 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700948 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100949 (remote_url, error))
950 yield None
951 return
952
953 error, project_config_data = RunGitWithCode(
954 ['show', 'refs/git_cl/meta/config:project.config'])
955 if error:
956 print('WARNING: project.config file not found')
957 yield None
958 return
959
960 with gclient_utils.temporary_directory() as tempdir:
961 project_config_file = os.path.join(tempdir, 'project.config')
962 gclient_utils.FileWrite(project_config_file, project_config_data)
963 yield project_config_file
964
965
966def _is_git_numberer_enabled(remote_url, remote_ref):
967 """Returns True if Git Numberer is enabled on this ref."""
968 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100969 KNOWN_PROJECTS_WHITELIST = [
970 'chromium/src',
971 'external/webrtc',
972 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100973 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200974 # For webrtc.googlesource.com/src.
975 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100976 ]
977
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100978 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
979 url_parts = urlparse.urlparse(remote_url)
980 project_name = url_parts.path.lstrip('/').rstrip('git./')
981 for known in KNOWN_PROJECTS_WHITELIST:
982 if project_name.endswith(known):
983 break
984 else:
985 # Early exit to avoid extra fetches for repos that aren't using Git
986 # Numberer.
987 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100988
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100989 with _get_gerrit_project_config_file(remote_url) as project_config_file:
990 if project_config_file is None:
991 # Failed to fetch project.config, which shouldn't happen on open source
992 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100993 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100994 def get_opts(x):
995 code, out = RunGitWithCode(
996 ['config', '-f', project_config_file, '--get-all',
997 'plugin.git-numberer.validate-%s-refglob' % x])
998 if code == 0:
999 return out.strip().splitlines()
1000 return []
1001 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001002
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001003 logging.info('validator config enabled %s disabled %s refglobs for '
1004 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001005
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001006 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001007 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001008 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001009 return True
1010 return False
1011
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001012 if match_refglobs(disabled):
1013 return False
1014 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001015
1016
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017def ShortBranchName(branch):
1018 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 return branch.replace('refs/heads/', '', 1)
1020
1021
1022def GetCurrentBranchRef():
1023 """Returns branch ref (e.g., refs/heads/master) or None."""
1024 return RunGit(['symbolic-ref', 'HEAD'],
1025 stderr=subprocess2.VOID, error_ok=True).strip() or None
1026
1027
1028def GetCurrentBranch():
1029 """Returns current branch or None.
1030
1031 For refs/heads/* branches, returns just last part. For others, full ref.
1032 """
1033 branchref = GetCurrentBranchRef()
1034 if branchref:
1035 return ShortBranchName(branchref)
1036 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037
1038
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001039class _CQState(object):
1040 """Enum for states of CL with respect to Commit Queue."""
1041 NONE = 'none'
1042 DRY_RUN = 'dry_run'
1043 COMMIT = 'commit'
1044
1045 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1046
1047
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001048class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001049 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001050 self.issue = issue
1051 self.patchset = patchset
1052 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001053 assert codereview in (None, 'rietveld', 'gerrit')
1054 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055
1056 @property
1057 def valid(self):
1058 return self.issue is not None
1059
1060
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001061def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001062 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1063 fail_result = _ParsedIssueNumberArgument()
1064
1065 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001066 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001067 if not arg.startswith('http'):
1068 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001069
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001070 url = gclient_utils.UpgradeToHttps(arg)
1071 try:
1072 parsed_url = urlparse.urlparse(url)
1073 except ValueError:
1074 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001075
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001076 if codereview is not None:
1077 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1078 return parsed or fail_result
1079
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001080 results = {}
1081 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1082 parsed = cls.ParseIssueURL(parsed_url)
1083 if parsed is not None:
1084 results[name] = parsed
1085
1086 if not results:
1087 return fail_result
1088 if len(results) == 1:
1089 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001090
1091 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1092 # This is likely Gerrit.
1093 return results['gerrit']
1094 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001095 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001096
1097
Aaron Gablea45ee112016-11-22 15:14:38 -08001098class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001099 def __init__(self, issue, url):
1100 self.issue = issue
1101 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001102 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001103
1104 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001105 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001106 self.issue, self.url)
1107
1108
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001109_CommentSummary = collections.namedtuple(
1110 '_CommentSummary', ['date', 'message', 'sender',
1111 # TODO(tandrii): these two aren't known in Gerrit.
1112 'approval', 'disapproval'])
1113
1114
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001116 """Changelist works with one changelist in local branch.
1117
1118 Supports two codereview backends: Rietveld or Gerrit, selected at object
1119 creation.
1120
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001121 Notes:
1122 * Not safe for concurrent multi-{thread,process} use.
1123 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001124 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001125 """
1126
1127 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1128 """Create a new ChangeList instance.
1129
1130 If issue is given, the codereview must be given too.
1131
1132 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1133 Otherwise, it's decided based on current configuration of the local branch,
1134 with default being 'rietveld' for backwards compatibility.
1135 See _load_codereview_impl for more details.
1136
1137 **kwargs will be passed directly to codereview implementation.
1138 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001140 global settings
1141 if not settings:
1142 # Happens when git_cl.py is used as a utility library.
1143 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001144
1145 if issue:
1146 assert codereview, 'codereview must be known, if issue is known'
1147
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001148 self.branchref = branchref
1149 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001150 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001151 self.branch = ShortBranchName(self.branchref)
1152 else:
1153 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001155 self.lookedup_issue = False
1156 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 self.has_description = False
1158 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001159 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001161 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001162 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001163 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001164
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001165 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001166 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001167 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001168 assert self._codereview_impl
1169 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170
1171 def _load_codereview_impl(self, codereview=None, **kwargs):
1172 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001173 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1174 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1175 self._codereview = codereview
1176 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001177 return
1178
1179 # Automatic selection based on issue number set for a current branch.
1180 # Rietveld takes precedence over Gerrit.
1181 assert not self.issue
1182 # Whether we find issue or not, we are doing the lookup.
1183 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001184 if self.GetBranch():
1185 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1186 issue = _git_get_branch_config_value(
1187 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1188 if issue:
1189 self._codereview = codereview
1190 self._codereview_impl = cls(self, **kwargs)
1191 self.issue = int(issue)
1192 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001193
1194 # No issue is set for this branch, so decide based on repo-wide settings.
1195 return self._load_codereview_impl(
1196 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1197 **kwargs)
1198
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001199 def IsGerrit(self):
1200 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001201
1202 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001203 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001204
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001205 The return value is a string suitable for passing to git cl with the --cc
1206 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001207 """
1208 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001209 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001210 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001211 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1212 return self.cc
1213
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001214 def GetCCListWithoutDefault(self):
1215 """Return the users cc'd on this CL excluding default ones."""
1216 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001217 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001218 return self.cc
1219
Daniel Cheng7227d212017-11-17 08:12:37 -08001220 def ExtendCC(self, more_cc):
1221 """Extends the list of users to cc on this CL based on the changed files."""
1222 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223
1224 def GetBranch(self):
1225 """Returns the short branch name, e.g. 'master'."""
1226 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001227 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001228 if not branchref:
1229 return None
1230 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 self.branch = ShortBranchName(self.branchref)
1232 return self.branch
1233
1234 def GetBranchRef(self):
1235 """Returns the full branch name, e.g. 'refs/heads/master'."""
1236 self.GetBranch() # Poke the lazy loader.
1237 return self.branchref
1238
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001239 def ClearBranch(self):
1240 """Clears cached branch data of this object."""
1241 self.branch = self.branchref = None
1242
tandrii5d48c322016-08-18 16:19:37 -07001243 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1244 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1245 kwargs['branch'] = self.GetBranch()
1246 return _git_get_branch_config_value(key, default, **kwargs)
1247
1248 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1249 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1250 assert self.GetBranch(), (
1251 'this CL must have an associated branch to %sset %s%s' %
1252 ('un' if value is None else '',
1253 key,
1254 '' if value is None else ' to %r' % value))
1255 kwargs['branch'] = self.GetBranch()
1256 return _git_set_branch_config_value(key, value, **kwargs)
1257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 @staticmethod
1259 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001260 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 e.g. 'origin', 'refs/heads/master'
1262 """
1263 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001264 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1265
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001267 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001269 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1270 error_ok=True).strip()
1271 if upstream_branch:
1272 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001274 # Else, try to guess the origin remote.
1275 remote_branches = RunGit(['branch', '-r']).split()
1276 if 'origin/master' in remote_branches:
1277 # Fall back on origin/master if it exits.
1278 remote = 'origin'
1279 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001281 DieWithError(
1282 'Unable to determine default branch to diff against.\n'
1283 'Either pass complete "git diff"-style arguments, like\n'
1284 ' git cl upload origin/master\n'
1285 'or verify this branch is set up to track another \n'
1286 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001287
1288 return remote, upstream_branch
1289
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001290 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001291 upstream_branch = self.GetUpstreamBranch()
1292 if not BranchExists(upstream_branch):
1293 DieWithError('The upstream for the current branch (%s) does not exist '
1294 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001295 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001296 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 def GetUpstreamBranch(self):
1299 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001302 upstream_branch = upstream_branch.replace('refs/heads/',
1303 'refs/remotes/%s/' % remote)
1304 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1305 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306 self.upstream_branch = upstream_branch
1307 return self.upstream_branch
1308
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001310 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001311 remote, branch = None, self.GetBranch()
1312 seen_branches = set()
1313 while branch not in seen_branches:
1314 seen_branches.add(branch)
1315 remote, branch = self.FetchUpstreamTuple(branch)
1316 branch = ShortBranchName(branch)
1317 if remote != '.' or branch.startswith('refs/remotes'):
1318 break
1319 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001320 remotes = RunGit(['remote'], error_ok=True).split()
1321 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001323 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001325 logging.warn('Could not determine which remote this change is '
1326 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001327 else:
1328 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001329 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 branch = 'HEAD'
1331 if branch.startswith('refs/remotes'):
1332 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001333 elif branch.startswith('refs/branch-heads/'):
1334 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001335 else:
1336 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001337 return self._remote
1338
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001339 def GitSanityChecks(self, upstream_git_obj):
1340 """Checks git repo status and ensures diff is from local commits."""
1341
sbc@chromium.org79706062015-01-14 21:18:12 +00001342 if upstream_git_obj is None:
1343 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001344 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001345 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001346 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001347 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001348 return False
1349
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001350 # Verify the commit we're diffing against is in our current branch.
1351 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1352 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1353 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001354 print('ERROR: %s is not in the current branch. You may need to rebase '
1355 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001356 return False
1357
1358 # List the commits inside the diff, and verify they are all local.
1359 commits_in_diff = RunGit(
1360 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1361 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1362 remote_branch = remote_branch.strip()
1363 if code != 0:
1364 _, remote_branch = self.GetRemoteBranch()
1365
1366 commits_in_remote = RunGit(
1367 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1368
1369 common_commits = set(commits_in_diff) & set(commits_in_remote)
1370 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001371 print('ERROR: Your diff contains %d commits already in %s.\n'
1372 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1373 'the diff. If you are using a custom git flow, you can override'
1374 ' the reference used for this check with "git config '
1375 'gitcl.remotebranch <git-ref>".' % (
1376 len(common_commits), remote_branch, upstream_git_obj),
1377 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001378 return False
1379 return True
1380
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001381 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001382 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001383
1384 Returns None if it is not set.
1385 """
tandrii5d48c322016-08-18 16:19:37 -07001386 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001387
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 def GetRemoteUrl(self):
1389 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1390
1391 Returns None if there is no remote.
1392 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001393 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001394 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1395
1396 # If URL is pointing to a local directory, it is probably a git cache.
1397 if os.path.isdir(url):
1398 url = RunGit(['config', 'remote.%s.url' % remote],
1399 error_ok=True,
1400 cwd=url).strip()
1401 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001402
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001403 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001404 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001405 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001406 self.issue = self._GitGetBranchConfigValue(
1407 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001408 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409 return self.issue
1410
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411 def GetIssueURL(self):
1412 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001413 issue = self.GetIssue()
1414 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001415 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001416 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001418 def GetDescription(self, pretty=False, force=False):
1419 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001420 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001421 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422 self.has_description = True
1423 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001424 # Set width to 72 columns + 2 space indent.
1425 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001426 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001427 lines = self.description.splitlines()
1428 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 return self.description
1430
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001431 def GetDescriptionFooters(self):
1432 """Returns (non_footer_lines, footers) for the commit message.
1433
1434 Returns:
1435 non_footer_lines (list(str)) - Simple list of description lines without
1436 any footer. The lines do not contain newlines, nor does the list contain
1437 the empty line between the message and the footers.
1438 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1439 [("Change-Id", "Ideadbeef...."), ...]
1440 """
1441 raw_description = self.GetDescription()
1442 msg_lines, _, footers = git_footers.split_footers(raw_description)
1443 if footers:
1444 msg_lines = msg_lines[:len(msg_lines)-1]
1445 return msg_lines, footers
1446
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001447 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001448 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001449 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001450 self.patchset = self._GitGetBranchConfigValue(
1451 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001452 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001453 return self.patchset
1454
1455 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001456 """Set this branch's patchset. If patchset=0, clears the patchset."""
1457 assert self.GetBranch()
1458 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001459 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001460 else:
1461 self.patchset = int(patchset)
1462 self._GitSetBranchConfigValue(
1463 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001464
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001465 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001466 """Set this branch's issue. If issue isn't given, clears the issue."""
1467 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001468 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001469 issue = int(issue)
1470 self._GitSetBranchConfigValue(
1471 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001472 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001473 codereview_server = self._codereview_impl.GetCodereviewServer()
1474 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001475 self._GitSetBranchConfigValue(
1476 self._codereview_impl.CodereviewServerConfigKey(),
1477 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001478 else:
tandrii5d48c322016-08-18 16:19:37 -07001479 # Reset all of these just to be clean.
1480 reset_suffixes = [
1481 'last-upload-hash',
1482 self._codereview_impl.IssueConfigKey(),
1483 self._codereview_impl.PatchsetConfigKey(),
1484 self._codereview_impl.CodereviewServerConfigKey(),
1485 ] + self._PostUnsetIssueProperties()
1486 for prop in reset_suffixes:
1487 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001488 msg = RunGit(['log', '-1', '--format=%B']).strip()
1489 if msg and git_footers.get_footer_change_id(msg):
1490 print('WARNING: The change patched into this branch has a Change-Id. '
1491 'Removing it.')
1492 RunGit(['commit', '--amend', '-m',
1493 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001494 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001495 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001496
dnjba1b0f32016-09-02 12:37:42 -07001497 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001498 if not self.GitSanityChecks(upstream_branch):
1499 DieWithError('\nGit sanity check failure')
1500
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001501 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001502 if not root:
1503 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001504 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001505
1506 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001507 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001508 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001509 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001510 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001511 except subprocess2.CalledProcessError:
1512 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001513 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001514 'This branch probably doesn\'t exist anymore. To reset the\n'
1515 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001516 ' git branch --set-upstream-to origin/master %s\n'
1517 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001518 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001519
maruel@chromium.org52424302012-08-29 15:14:30 +00001520 issue = self.GetIssue()
1521 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001522 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001523 description = self.GetDescription()
1524 else:
1525 # If the change was never uploaded, use the log messages of all commits
1526 # up to the branch point, as git cl upload will prefill the description
1527 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001528 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1529 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001530
1531 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001532 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001533 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001534 name,
1535 description,
1536 absroot,
1537 files,
1538 issue,
1539 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001540 author,
1541 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001542
dsansomee2d6fd92016-09-08 00:10:47 -07001543 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001544 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001546 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001547
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001548 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1549 """Sets the description for this CL remotely.
1550
1551 You can get description_lines and footers with GetDescriptionFooters.
1552
1553 Args:
1554 description_lines (list(str)) - List of CL description lines without
1555 newline characters.
1556 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1557 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1558 `List-Of-Tokens`). It will be case-normalized so that each token is
1559 title-cased.
1560 """
1561 new_description = '\n'.join(description_lines)
1562 if footers:
1563 new_description += '\n'
1564 for k, v in footers:
1565 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1566 if not git_footers.FOOTER_PATTERN.match(foot):
1567 raise ValueError('Invalid footer %r' % foot)
1568 new_description += foot + '\n'
1569 self.UpdateDescription(new_description, force)
1570
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001571 def RunHook(self, committing, may_prompt, verbose, change):
1572 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1573 try:
1574 return presubmit_support.DoPresubmitChecks(change, committing,
1575 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1576 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001577 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001578 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001579 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001580 DieWithError(
1581 ('%s\nMaybe your depot_tools is out of date?\n'
1582 'If all fails, contact maruel@') % e)
1583
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001584 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1585 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001586 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1587 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001588 else:
1589 # Assume url.
1590 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1591 urlparse.urlparse(issue_arg))
1592 if not parsed_issue_arg or not parsed_issue_arg.valid:
1593 DieWithError('Failed to parse issue argument "%s". '
1594 'Must be an issue number or a valid URL.' % issue_arg)
1595 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001596 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001597
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 def CMDUpload(self, options, git_diff_args, orig_args):
1599 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001600 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001602 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001603 else:
1604 if self.GetBranch() is None:
1605 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1606
1607 # Default to diffing against common ancestor of upstream branch
1608 base_branch = self.GetCommonAncestorWithUpstream()
1609 git_diff_args = [base_branch, 'HEAD']
1610
Aaron Gablec4c40d12017-05-22 11:49:53 -07001611 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1612 if not self.IsGerrit() and not self.GetIssue():
1613 print('=====================================')
1614 print('NOTICE: Rietveld is being deprecated. '
1615 'You can upload changes to Gerrit with')
1616 print(' git cl upload --gerrit')
1617 print('or set Gerrit to be your default code review tool with')
1618 print(' git config gerrit.host true')
1619 print('=====================================')
1620
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001621 # Fast best-effort checks to abort before running potentially
1622 # expensive hooks if uploading is likely to fail anyway. Passing these
1623 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001624 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001625 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001626
1627 # Apply watchlists on upload.
1628 change = self.GetChange(base_branch, None)
1629 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1630 files = [f.LocalPath() for f in change.AffectedFiles()]
1631 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001632 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001633
1634 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001635 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001636 # Set the reviewer list now so that presubmit checks can access it.
1637 change_description = ChangeDescription(change.FullDescriptionText())
1638 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001639 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001640 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001641 change)
1642 change.SetDescriptionText(change_description.description)
1643 hook_results = self.RunHook(committing=False,
1644 may_prompt=not options.force,
1645 verbose=options.verbose,
1646 change=change)
1647 if not hook_results.should_continue():
1648 return 1
1649 if not options.reviewers and hook_results.reviewers:
1650 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001651 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001653 # TODO(tandrii): Checking local patchset against remote patchset is only
1654 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1655 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001656 latest_patchset = self.GetMostRecentPatchset()
1657 local_patchset = self.GetPatchset()
1658 if (latest_patchset and local_patchset and
1659 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001660 print('The last upload made from this repository was patchset #%d but '
1661 'the most recent patchset on the server is #%d.'
1662 % (local_patchset, latest_patchset))
1663 print('Uploading will still work, but if you\'ve uploaded to this '
1664 'issue from another machine or branch the patch you\'re '
1665 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001666 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001667
1668 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001669 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001670 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001671 if options.use_commit_queue:
1672 self.SetCQState(_CQState.COMMIT)
1673 elif options.cq_dry_run:
1674 self.SetCQState(_CQState.DRY_RUN)
1675
tandrii5d48c322016-08-18 16:19:37 -07001676 _git_set_branch_config_value('last-upload-hash',
1677 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001678 # Run post upload hooks, if specified.
1679 if settings.GetRunPostUploadHook():
1680 presubmit_support.DoPostUploadExecuter(
1681 change,
1682 self,
1683 settings.GetRoot(),
1684 options.verbose,
1685 sys.stdout)
1686
1687 # Upload all dependencies if specified.
1688 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001689 print()
1690 print('--dependencies has been specified.')
1691 print('All dependent local branches will be re-uploaded.')
1692 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001693 # Remove the dependencies flag from args so that we do not end up in a
1694 # loop.
1695 orig_args.remove('--dependencies')
1696 ret = upload_branch_deps(self, orig_args)
1697 return ret
1698
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001699 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001700 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001701
1702 Issue must have been already uploaded and known.
1703 """
1704 assert new_state in _CQState.ALL_STATES
1705 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001706 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001707 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001708 return 0
1709 except KeyboardInterrupt:
1710 raise
1711 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001712 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001713 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001714 ' * Your project has no CQ,\n'
1715 ' * You don\'t have permission to change the CQ state,\n'
1716 ' * There\'s a bug in this code (see stack trace below).\n'
1717 'Consider specifying which bots to trigger manually or asking your '
1718 'project owners for permissions or contacting Chrome Infra at:\n'
1719 'https://www.chromium.org/infra\n\n' %
1720 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001721 # Still raise exception so that stack trace is printed.
1722 raise
1723
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001724 # Forward methods to codereview specific implementation.
1725
Aaron Gable636b13f2017-07-14 10:42:48 -07001726 def AddComment(self, message, publish=None):
1727 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001728
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001729 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730 """Returns list of _CommentSummary for each comment.
1731
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001732 args:
1733 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001734 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001735 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001736
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 def CloseIssue(self):
1738 return self._codereview_impl.CloseIssue()
1739
1740 def GetStatus(self):
1741 return self._codereview_impl.GetStatus()
1742
1743 def GetCodereviewServer(self):
1744 return self._codereview_impl.GetCodereviewServer()
1745
tandriide281ae2016-10-12 06:02:30 -07001746 def GetIssueOwner(self):
1747 """Get owner from codereview, which may differ from this checkout."""
1748 return self._codereview_impl.GetIssueOwner()
1749
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001750 def GetMostRecentPatchset(self):
1751 return self._codereview_impl.GetMostRecentPatchset()
1752
tandriide281ae2016-10-12 06:02:30 -07001753 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001754 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001755 return self._codereview_impl.CannotTriggerTryJobReason()
1756
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001757 def GetTryJobProperties(self, patchset=None):
1758 """Returns dictionary of properties to launch try job."""
1759 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001760
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001761 def __getattr__(self, attr):
1762 # This is because lots of untested code accesses Rietveld-specific stuff
1763 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001764 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001765 # Note that child method defines __getattr__ as well, and forwards it here,
1766 # because _RietveldChangelistImpl is not cleaned up yet, and given
1767 # deprecation of Rietveld, it should probably be just removed.
1768 # Until that time, avoid infinite recursion by bypassing __getattr__
1769 # of implementation class.
1770 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001771
1772
1773class _ChangelistCodereviewBase(object):
1774 """Abstract base class encapsulating codereview specifics of a changelist."""
1775 def __init__(self, changelist):
1776 self._changelist = changelist # instance of Changelist
1777
1778 def __getattr__(self, attr):
1779 # Forward methods to changelist.
1780 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1781 # _RietveldChangelistImpl to avoid this hack?
1782 return getattr(self._changelist, attr)
1783
1784 def GetStatus(self):
1785 """Apply a rough heuristic to give a simple summary of an issue's review
1786 or CQ status, assuming adherence to a common workflow.
1787
1788 Returns None if no issue for this branch, or specific string keywords.
1789 """
1790 raise NotImplementedError()
1791
1792 def GetCodereviewServer(self):
1793 """Returns server URL without end slash, like "https://codereview.com"."""
1794 raise NotImplementedError()
1795
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001796 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 """Fetches and returns description from the codereview server."""
1798 raise NotImplementedError()
1799
tandrii5d48c322016-08-18 16:19:37 -07001800 @classmethod
1801 def IssueConfigKey(cls):
1802 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001803 raise NotImplementedError()
1804
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001805 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001806 def PatchsetConfigKey(cls):
1807 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001808 raise NotImplementedError()
1809
tandrii5d48c322016-08-18 16:19:37 -07001810 @classmethod
1811 def CodereviewServerConfigKey(cls):
1812 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001813 raise NotImplementedError()
1814
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001815 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001816 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001817 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001818
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001819 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001821 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822 raise NotImplementedError()
1823
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001824 def GetGerritObjForPresubmit(self):
1825 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1826 return None
1827
dsansomee2d6fd92016-09-08 00:10:47 -07001828 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001829 """Update the description on codereview site."""
1830 raise NotImplementedError()
1831
Aaron Gable636b13f2017-07-14 10:42:48 -07001832 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001833 """Posts a comment to the codereview site."""
1834 raise NotImplementedError()
1835
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001836 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001837 raise NotImplementedError()
1838
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839 def CloseIssue(self):
1840 """Closes the issue."""
1841 raise NotImplementedError()
1842
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001843 def GetMostRecentPatchset(self):
1844 """Returns the most recent patchset number from the codereview site."""
1845 raise NotImplementedError()
1846
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001847 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001848 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001849 """Fetches and applies the issue.
1850
1851 Arguments:
1852 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1853 reject: if True, reject the failed patch instead of switching to 3-way
1854 merge. Rietveld only.
1855 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1856 only.
1857 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001858 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001859 """
1860 raise NotImplementedError()
1861
1862 @staticmethod
1863 def ParseIssueURL(parsed_url):
1864 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1865 failed."""
1866 raise NotImplementedError()
1867
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001868 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001869 """Best effort check that user is authenticated with codereview server.
1870
1871 Arguments:
1872 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001873 refresh: whether to attempt to refresh credentials. Ignored if not
1874 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001875 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876 raise NotImplementedError()
1877
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001878 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001879 """Best effort check that uploading isn't supposed to fail for predictable
1880 reasons.
1881
1882 This method should raise informative exception if uploading shouldn't
1883 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001884
1885 Arguments:
1886 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001887 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001888 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001889
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001890 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001891 """Uploads a change to codereview."""
1892 raise NotImplementedError()
1893
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001894 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001895 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896
1897 Issue must have been already uploaded and known.
1898 """
1899 raise NotImplementedError()
1900
tandriie113dfd2016-10-11 10:20:12 -07001901 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001902 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001903 raise NotImplementedError()
1904
tandriide281ae2016-10-12 06:02:30 -07001905 def GetIssueOwner(self):
1906 raise NotImplementedError()
1907
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001908 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001909 raise NotImplementedError()
1910
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
1912class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001913
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001914 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915 super(_RietveldChangelistImpl, self).__init__(changelist)
1916 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001917 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001918 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001920 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001921 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001922 self._props = None
1923 self._rpc_server = None
1924
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 def GetCodereviewServer(self):
1926 if not self._rietveld_server:
1927 # If we're on a branch then get the server potentially associated
1928 # with that branch.
1929 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001930 self._rietveld_server = gclient_utils.UpgradeToHttps(
1931 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932 if not self._rietveld_server:
1933 self._rietveld_server = settings.GetDefaultServerUrl()
1934 return self._rietveld_server
1935
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001936 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001937 """Best effort check that user is authenticated with Rietveld server."""
1938 if self._auth_config.use_oauth2:
1939 authenticator = auth.get_authenticator_for_host(
1940 self.GetCodereviewServer(), self._auth_config)
1941 if not authenticator.has_cached_credentials():
1942 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001943 if refresh:
1944 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001945
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001946 def EnsureCanUploadPatchset(self, force):
1947 # No checks for Rietveld because we are deprecating Rietveld.
1948 pass
1949
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001950 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001951 issue = self.GetIssue()
1952 assert issue
1953 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001954 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001955 except urllib2.HTTPError as e:
1956 if e.code == 404:
1957 DieWithError(
1958 ('\nWhile fetching the description for issue %d, received a '
1959 '404 (not found)\n'
1960 'error. It is likely that you deleted this '
1961 'issue on the server. If this is the\n'
1962 'case, please run\n\n'
1963 ' git cl issue 0\n\n'
1964 'to clear the association with the deleted issue. Then run '
1965 'this command again.') % issue)
1966 else:
1967 DieWithError(
1968 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1969 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001970 print('Warning: Failed to retrieve CL description due to network '
1971 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001972 return ''
1973
1974 def GetMostRecentPatchset(self):
1975 return self.GetIssueProperties()['patchsets'][-1]
1976
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001977 def GetIssueProperties(self):
1978 if self._props is None:
1979 issue = self.GetIssue()
1980 if not issue:
1981 self._props = {}
1982 else:
1983 self._props = self.RpcServer().get_issue_properties(issue, True)
1984 return self._props
1985
tandriie113dfd2016-10-11 10:20:12 -07001986 def CannotTriggerTryJobReason(self):
1987 props = self.GetIssueProperties()
1988 if not props:
1989 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1990 if props.get('closed'):
1991 return 'CL %s is closed' % self.GetIssue()
1992 if props.get('private'):
1993 return 'CL %s is private' % self.GetIssue()
1994 return None
1995
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001996 def GetTryJobProperties(self, patchset=None):
1997 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001998 project = (self.GetIssueProperties() or {}).get('project')
1999 return {
2000 'issue': self.GetIssue(),
2001 'patch_project': project,
2002 'patch_storage': 'rietveld',
2003 'patchset': patchset or self.GetPatchset(),
2004 'rietveld': self.GetCodereviewServer(),
2005 }
2006
tandriide281ae2016-10-12 06:02:30 -07002007 def GetIssueOwner(self):
2008 return (self.GetIssueProperties() or {}).get('owner_email')
2009
Aaron Gable636b13f2017-07-14 10:42:48 -07002010 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002011 return self.RpcServer().add_comment(self.GetIssue(), message)
2012
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002013 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002014 summary = []
2015 for message in self.GetIssueProperties().get('messages', []):
2016 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2017 summary.append(_CommentSummary(
2018 date=date,
2019 disapproval=bool(message['disapproval']),
2020 approval=bool(message['approval']),
2021 sender=message['sender'],
2022 message=message['text'],
2023 ))
2024 return summary
2025
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002026 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002027 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002028 or CQ status, assuming adherence to a common workflow.
2029
2030 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002031 * 'error' - error from review tool (including deleted issues)
2032 * 'unsent' - not sent for review
2033 * 'waiting' - waiting for review
2034 * 'reply' - waiting for owner to reply to review
2035 * 'not lgtm' - Code-Review label has been set negatively
2036 * 'lgtm' - LGTM from at least one approved reviewer
2037 * 'commit' - in the commit queue
2038 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002039 """
2040 if not self.GetIssue():
2041 return None
2042
2043 try:
2044 props = self.GetIssueProperties()
2045 except urllib2.HTTPError:
2046 return 'error'
2047
2048 if props.get('closed'):
2049 # Issue is closed.
2050 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002051 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002052 # Issue is in the commit queue.
2053 return 'commit'
2054
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002055 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002056 if not messages:
2057 # No message was sent.
2058 return 'unsent'
2059
2060 if get_approving_reviewers(props):
2061 return 'lgtm'
2062 elif get_approving_reviewers(props, disapproval=True):
2063 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002064
tandrii9d2c7a32016-06-22 03:42:45 -07002065 # Skip CQ messages that don't require owner's action.
2066 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2067 if 'Dry run:' in messages[-1]['text']:
2068 messages.pop()
2069 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2070 # This message always follows prior messages from CQ,
2071 # so skip this too.
2072 messages.pop()
2073 else:
2074 # This is probably a CQ messages warranting user attention.
2075 break
2076
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002077 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002078 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002079 return 'reply'
2080 return 'waiting'
2081
dsansomee2d6fd92016-09-08 00:10:47 -07002082 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002083 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002084
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002085 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002086 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002087
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002088 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002089 return self.SetFlags({flag: value})
2090
2091 def SetFlags(self, flags):
2092 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002093 """
phajdan.jr68598232016-08-10 03:28:28 -07002094 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002095 try:
tandrii4b233bd2016-07-06 03:50:29 -07002096 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002097 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002098 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002099 if e.code == 404:
2100 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2101 if e.code == 403:
2102 DieWithError(
2103 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002104 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002105 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002106
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002107 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002108 """Returns an upload.RpcServer() to access this review's rietveld instance.
2109 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002110 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002111 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002112 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002113 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002114 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002115
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002116 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002117 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002118 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002119
tandrii5d48c322016-08-18 16:19:37 -07002120 @classmethod
2121 def PatchsetConfigKey(cls):
2122 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002123
tandrii5d48c322016-08-18 16:19:37 -07002124 @classmethod
2125 def CodereviewServerConfigKey(cls):
2126 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002127
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002128 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002129 return self.RpcServer()
2130
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002131 def SetCQState(self, new_state):
2132 props = self.GetIssueProperties()
2133 if props.get('private'):
2134 DieWithError('Cannot set-commit on private issue')
2135
2136 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002137 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002138 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002139 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002140 else:
tandrii4b233bd2016-07-06 03:50:29 -07002141 assert new_state == _CQState.DRY_RUN
2142 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002143
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002145 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002146 # PatchIssue should never be called with a dirty tree. It is up to the
2147 # caller to check this, but just in case we assert here since the
2148 # consequences of the caller not checking this could be dire.
2149 assert(not git_common.is_dirty_git_tree('apply'))
2150 assert(parsed_issue_arg.valid)
2151 self._changelist.issue = parsed_issue_arg.issue
2152 if parsed_issue_arg.hostname:
2153 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2154
skobes6468b902016-10-24 08:45:10 -07002155 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2156 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2157 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 try:
skobes6468b902016-10-24 08:45:10 -07002159 scm_obj.apply_patch(patchset_object)
2160 except Exception as e:
2161 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 return 1
2163
2164 # If we had an issue, commit the current state and register the issue.
2165 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002166 self.SetIssue(self.GetIssue())
2167 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2169 'patch from issue %(i)s at patchset '
2170 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2171 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002172 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002173 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002174 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002175 return 0
2176
2177 @staticmethod
2178 def ParseIssueURL(parsed_url):
2179 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2180 return None
wychen3c1c1722016-08-04 11:46:36 -07002181 # Rietveld patch: https://domain/<number>/#ps<patchset>
2182 match = re.match(r'/(\d+)/$', parsed_url.path)
2183 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2184 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002185 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002186 issue=int(match.group(1)),
2187 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002188 hostname=parsed_url.netloc,
2189 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 # Typical url: https://domain/<issue_number>[/[other]]
2191 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2192 if match:
skobes6468b902016-10-24 08:45:10 -07002193 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002195 hostname=parsed_url.netloc,
2196 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2198 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2199 if match:
skobes6468b902016-10-24 08:45:10 -07002200 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 issue=int(match.group(1)),
2202 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002203 hostname=parsed_url.netloc,
2204 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002205 return None
2206
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002207 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 """Upload the patch to Rietveld."""
2209 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2210 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002211 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2212 if options.emulate_svn_auto_props:
2213 upload_args.append('--emulate_svn_auto_props')
2214
2215 change_desc = None
2216
2217 if options.email is not None:
2218 upload_args.extend(['--email', options.email])
2219
2220 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002221 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002222 upload_args.extend(['--title', options.title])
2223 if options.message:
2224 upload_args.extend(['--message', options.message])
2225 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002226 print('This branch is associated with issue %s. '
2227 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228 else:
nodirca166002016-06-27 10:59:51 -07002229 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002230 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002231 if options.message:
2232 message = options.message
2233 else:
2234 message = CreateDescriptionFromLog(args)
2235 if options.title:
2236 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002238 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002239 change_desc.update_reviewers(options.reviewers, options.tbrs,
2240 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002242 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002243
2244 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002245 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002246 return 1
2247
2248 upload_args.extend(['--message', change_desc.description])
2249 if change_desc.get_reviewers():
2250 upload_args.append('--reviewers=%s' % ','.join(
2251 change_desc.get_reviewers()))
2252 if options.send_mail:
2253 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002254 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002255 upload_args.append('--send_mail')
2256
2257 # We check this before applying rietveld.private assuming that in
2258 # rietveld.cc only addresses which we can send private CLs to are listed
2259 # if rietveld.private is set, and so we should ignore rietveld.cc only
2260 # when --private is specified explicitly on the command line.
2261 if options.private:
2262 logging.warn('rietveld.cc is ignored since private flag is specified. '
2263 'You need to review and add them manually if necessary.')
2264 cc = self.GetCCListWithoutDefault()
2265 else:
2266 cc = self.GetCCList()
2267 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002268 if change_desc.get_cced():
2269 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 if cc:
2271 upload_args.extend(['--cc', cc])
2272
2273 if options.private or settings.GetDefaultPrivateFlag() == "True":
2274 upload_args.append('--private')
2275
2276 upload_args.extend(['--git_similarity', str(options.similarity)])
2277 if not options.find_copies:
2278 upload_args.extend(['--git_no_find_copies'])
2279
2280 # Include the upstream repo's URL in the change -- this is useful for
2281 # projects that have their source spread across multiple repos.
2282 remote_url = self.GetGitBaseUrlFromConfig()
2283 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002284 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2285 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2286 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002287 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002289 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290 if target_ref:
2291 upload_args.extend(['--target_ref', target_ref])
2292
2293 # Look for dependent patchsets. See crbug.com/480453 for more details.
2294 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2295 upstream_branch = ShortBranchName(upstream_branch)
2296 if remote is '.':
2297 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002298 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002299 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002300 print()
2301 print('Skipping dependency patchset upload because git config '
2302 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2303 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 else:
2305 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002306 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 auth_config=auth_config)
2308 branch_cl_issue_url = branch_cl.GetIssueURL()
2309 branch_cl_issue = branch_cl.GetIssue()
2310 branch_cl_patchset = branch_cl.GetPatchset()
2311 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2312 upload_args.extend(
2313 ['--depends_on_patchset', '%s:%s' % (
2314 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002315 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002316 '\n'
2317 'The current branch (%s) is tracking a local branch (%s) with '
2318 'an associated CL.\n'
2319 'Adding %s/#ps%s as a dependency patchset.\n'
2320 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2321 branch_cl_patchset))
2322
2323 project = settings.GetProject()
2324 if project:
2325 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002326 else:
2327 print()
2328 print('WARNING: Uploading without a project specified. Please ensure '
2329 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2330 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002332 try:
2333 upload_args = ['upload'] + upload_args + args
2334 logging.info('upload.RealMain(%s)', upload_args)
2335 issue, patchset = upload.RealMain(upload_args)
2336 issue = int(issue)
2337 patchset = int(patchset)
2338 except KeyboardInterrupt:
2339 sys.exit(1)
2340 except:
2341 # If we got an exception after the user typed a description for their
2342 # change, back up the description before re-raising.
2343 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002344 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 raise
2346
2347 if not self.GetIssue():
2348 self.SetIssue(issue)
2349 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 return 0
2351
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002352
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002353class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002354 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002355 # auth_config is Rietveld thing, kept here to preserve interface only.
2356 super(_GerritChangelistImpl, self).__init__(changelist)
2357 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002358 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002359 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002360 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002361 # Map from change number (issue) to its detail cache.
2362 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002363
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002364 if codereview_host is not None:
2365 assert not codereview_host.startswith('https://'), codereview_host
2366 self._gerrit_host = codereview_host
2367 self._gerrit_server = 'https://%s' % codereview_host
2368
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002369 def _GetGerritHost(self):
2370 # Lazy load of configs.
2371 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002372 if self._gerrit_host and '.' not in self._gerrit_host:
2373 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2374 # This happens for internal stuff http://crbug.com/614312.
2375 parsed = urlparse.urlparse(self.GetRemoteUrl())
2376 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002377 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002378 ' Your current remote is: %s' % self.GetRemoteUrl())
2379 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2380 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002381 return self._gerrit_host
2382
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002383 def _GetGitHost(self):
2384 """Returns git host to be used when uploading change to Gerrit."""
2385 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2386
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002387 def GetCodereviewServer(self):
2388 if not self._gerrit_server:
2389 # If we're on a branch then get the server potentially associated
2390 # with that branch.
2391 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002392 self._gerrit_server = self._GitGetBranchConfigValue(
2393 self.CodereviewServerConfigKey())
2394 if self._gerrit_server:
2395 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002396 if not self._gerrit_server:
2397 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2398 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002399 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002400 parts[0] = parts[0] + '-review'
2401 self._gerrit_host = '.'.join(parts)
2402 self._gerrit_server = 'https://%s' % self._gerrit_host
2403 return self._gerrit_server
2404
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002405 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002406 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002407 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002408
tandrii5d48c322016-08-18 16:19:37 -07002409 @classmethod
2410 def PatchsetConfigKey(cls):
2411 return 'gerritpatchset'
2412
2413 @classmethod
2414 def CodereviewServerConfigKey(cls):
2415 return 'gerritserver'
2416
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002417 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002418 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002419 if settings.GetGerritSkipEnsureAuthenticated():
2420 # For projects with unusual authentication schemes.
2421 # See http://crbug.com/603378.
2422 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002423 # Lazy-loader to identify Gerrit and Git hosts.
2424 if gerrit_util.GceAuthenticator.is_gce():
2425 return
2426 self.GetCodereviewServer()
2427 git_host = self._GetGitHost()
2428 assert self._gerrit_server and self._gerrit_host
2429 cookie_auth = gerrit_util.CookiesAuthenticator()
2430
2431 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2432 git_auth = cookie_auth.get_auth_header(git_host)
2433 if gerrit_auth and git_auth:
2434 if gerrit_auth == git_auth:
2435 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002436 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002437 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002438 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002439 ' %s\n'
2440 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002441 ' Consider running the following command:\n'
2442 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002443 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002444 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002445 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002446 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002447 cookie_auth.get_new_password_message(git_host)))
2448 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002449 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002450 return
2451 else:
2452 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002453 ([] if gerrit_auth else [self._gerrit_host]) +
2454 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002455 DieWithError('Credentials for the following hosts are required:\n'
2456 ' %s\n'
2457 'These are read from %s (or legacy %s)\n'
2458 '%s' % (
2459 '\n '.join(missing),
2460 cookie_auth.get_gitcookies_path(),
2461 cookie_auth.get_netrc_path(),
2462 cookie_auth.get_new_password_message(git_host)))
2463
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002464 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002465 if not self.GetIssue():
2466 return
2467
2468 # Warm change details cache now to avoid RPCs later, reducing latency for
2469 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002470 self._GetChangeDetail(
2471 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002472
2473 status = self._GetChangeDetail()['status']
2474 if status in ('MERGED', 'ABANDONED'):
2475 DieWithError('Change %s has been %s, new uploads are not allowed' %
2476 (self.GetIssueURL(),
2477 'submitted' if status == 'MERGED' else 'abandoned'))
2478
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002479 if gerrit_util.GceAuthenticator.is_gce():
2480 return
2481 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2482 self._GetGerritHost())
2483 if self.GetIssueOwner() == cookies_user:
2484 return
2485 logging.debug('change %s owner is %s, cookies user is %s',
2486 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002487 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002488 # so ask what Gerrit thinks of this user.
2489 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2490 if details['email'] == self.GetIssueOwner():
2491 return
2492 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002493 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002494 'as %s.\n'
2495 'Uploading may fail due to lack of permissions.' %
2496 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2497 confirm_or_exit(action='upload')
2498
2499
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002500 def _PostUnsetIssueProperties(self):
2501 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002502 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002503
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002504 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002505 class ThisIsNotRietveldIssue(object):
2506 def __nonzero__(self):
2507 # This is a hack to make presubmit_support think that rietveld is not
2508 # defined, yet still ensure that calls directly result in a decent
2509 # exception message below.
2510 return False
2511
2512 def __getattr__(self, attr):
2513 print(
2514 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2515 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002516 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002517 'or use Rietveld for codereview.\n'
2518 'See also http://crbug.com/579160.' % attr)
2519 raise NotImplementedError()
2520 return ThisIsNotRietveldIssue()
2521
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002522 def GetGerritObjForPresubmit(self):
2523 return presubmit_support.GerritAccessor(self._GetGerritHost())
2524
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002525 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002526 """Apply a rough heuristic to give a simple summary of an issue's review
2527 or CQ status, assuming adherence to a common workflow.
2528
2529 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002530 * 'error' - error from review tool (including deleted issues)
2531 * 'unsent' - no reviewers added
2532 * 'waiting' - waiting for review
2533 * 'reply' - waiting for uploader to reply to review
2534 * 'lgtm' - Code-Review label has been set
2535 * 'commit' - in the commit queue
2536 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002537 """
2538 if not self.GetIssue():
2539 return None
2540
2541 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002542 data = self._GetChangeDetail([
2543 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002544 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002545 return 'error'
2546
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002547 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002548 return 'closed'
2549
Aaron Gable9ab38c62017-04-06 14:36:33 -07002550 if data['labels'].get('Commit-Queue', {}).get('approved'):
2551 # The section will have an "approved" subsection if anyone has voted
2552 # the maximum value on the label.
2553 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554
Aaron Gable9ab38c62017-04-06 14:36:33 -07002555 if data['labels'].get('Code-Review', {}).get('approved'):
2556 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002557
2558 if not data.get('reviewers', {}).get('REVIEWER', []):
2559 return 'unsent'
2560
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002561 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002562 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2563 last_message_author = messages.pop().get('author', {})
2564 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002565 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2566 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002567 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002568 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002569 if last_message_author.get('_account_id') == owner:
2570 # Most recent message was by owner.
2571 return 'waiting'
2572 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002573 # Some reply from non-owner.
2574 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002575
2576 # Somehow there are no messages even though there are reviewers.
2577 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002578
2579 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002580 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002581 patchset = data['revisions'][data['current_revision']]['_number']
2582 self.SetPatchset(patchset)
2583 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002584
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002585 def FetchDescription(self, force=False):
2586 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2587 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002588 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002589 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002590
dsansomee2d6fd92016-09-08 00:10:47 -07002591 def UpdateDescriptionRemote(self, description, force=False):
2592 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2593 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002594 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002595 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002596 'unpublished edit. Either publish the edit in the Gerrit web UI '
2597 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002598
2599 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2600 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002601 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002602 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002603
Aaron Gable636b13f2017-07-14 10:42:48 -07002604 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002605 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002606 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002607
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002608 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002609 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002610 messages = self._GetChangeDetail(
2611 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2612 file_comments = gerrit_util.GetChangeComments(
2613 self._GetGerritHost(), self.GetIssue())
2614
2615 # Build dictionary of file comments for easy access and sorting later.
2616 # {author+date: {path: {patchset: {line: url+message}}}}
2617 comments = collections.defaultdict(
2618 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2619 for path, line_comments in file_comments.iteritems():
2620 for comment in line_comments:
2621 if comment.get('tag', '').startswith('autogenerated'):
2622 continue
2623 key = (comment['author']['email'], comment['updated'])
2624 if comment.get('side', 'REVISION') == 'PARENT':
2625 patchset = 'Base'
2626 else:
2627 patchset = 'PS%d' % comment['patch_set']
2628 line = comment.get('line', 0)
2629 url = ('https://%s/c/%s/%s/%s#%s%s' %
2630 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2631 'b' if comment.get('side') == 'PARENT' else '',
2632 str(line) if line else ''))
2633 comments[key][path][patchset][line] = (url, comment['message'])
2634
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002635 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002636 for msg in messages:
2637 # Don't bother showing autogenerated messages.
2638 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2639 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002640 # Gerrit spits out nanoseconds.
2641 assert len(msg['date'].split('.')[-1]) == 9
2642 date = datetime.datetime.strptime(msg['date'][:-3],
2643 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002644 message = msg['message']
2645 key = (msg['author']['email'], msg['date'])
2646 if key in comments:
2647 message += '\n'
2648 for path, patchsets in sorted(comments.get(key, {}).items()):
2649 if readable:
2650 message += '\n%s' % path
2651 for patchset, lines in sorted(patchsets.items()):
2652 for line, (url, content) in sorted(lines.items()):
2653 if line:
2654 line_str = 'Line %d' % line
2655 path_str = '%s:%d:' % (path, line)
2656 else:
2657 line_str = 'File comment'
2658 path_str = '%s:0:' % path
2659 if readable:
2660 message += '\n %s, %s: %s' % (patchset, line_str, url)
2661 message += '\n %s\n' % content
2662 else:
2663 message += '\n%s ' % path_str
2664 message += '\n%s\n' % content
2665
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002666 summary.append(_CommentSummary(
2667 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002668 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002669 sender=msg['author']['email'],
2670 # These could be inferred from the text messages and correlated with
2671 # Code-Review label maximum, however this is not reliable.
2672 # Leaving as is until the need arises.
2673 approval=False,
2674 disapproval=False,
2675 ))
2676 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002677
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002678 def CloseIssue(self):
2679 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2680
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002681 def SubmitIssue(self, wait_for_merge=True):
2682 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2683 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002684
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002685 def _GetChangeDetail(self, options=None, issue=None,
2686 no_cache=False):
2687 """Returns details of the issue by querying Gerrit and caching results.
2688
2689 If fresh data is needed, set no_cache=True which will clear cache and
2690 thus new data will be fetched from Gerrit.
2691 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002692 options = options or []
2693 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002694 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002695
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002696 # Optimization to avoid multiple RPCs:
2697 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2698 'CURRENT_COMMIT' not in options):
2699 options.append('CURRENT_COMMIT')
2700
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002701 # Normalize issue and options for consistent keys in cache.
2702 issue = str(issue)
2703 options = [o.upper() for o in options]
2704
2705 # Check in cache first unless no_cache is True.
2706 if no_cache:
2707 self._detail_cache.pop(issue, None)
2708 else:
2709 options_set = frozenset(options)
2710 for cached_options_set, data in self._detail_cache.get(issue, []):
2711 # Assumption: data fetched before with extra options is suitable
2712 # for return for a smaller set of options.
2713 # For example, if we cached data for
2714 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2715 # and request is for options=[CURRENT_REVISION],
2716 # THEN we can return prior cached data.
2717 if options_set.issubset(cached_options_set):
2718 return data
2719
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002720 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002721 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002722 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002723 except gerrit_util.GerritError as e:
2724 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002725 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002726 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002727
2728 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002729 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002730
agable32978d92016-11-01 12:55:02 -07002731 def _GetChangeCommit(self, issue=None):
2732 issue = issue or self.GetIssue()
2733 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002734 try:
2735 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2736 except gerrit_util.GerritError as e:
2737 if e.http_status == 404:
2738 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2739 raise
agable32978d92016-11-01 12:55:02 -07002740 return data
2741
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002742 def CMDLand(self, force, bypass_hooks, verbose):
2743 if git_common.is_dirty_git_tree('land'):
2744 return 1
tandriid60367b2016-06-22 05:25:12 -07002745 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2746 if u'Commit-Queue' in detail.get('labels', {}):
2747 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002748 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2749 'which can test and land changes for you. '
2750 'Are you sure you wish to bypass it?\n',
2751 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002752
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002753 differs = True
tandriic4344b52016-08-29 06:04:54 -07002754 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002755 # Note: git diff outputs nothing if there is no diff.
2756 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002757 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002758 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002759 if detail['current_revision'] == last_upload:
2760 differs = False
2761 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002762 print('WARNING: Local branch contents differ from latest uploaded '
2763 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002764 if differs:
2765 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002766 confirm_or_exit(
2767 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2768 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002769 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002770 elif not bypass_hooks:
2771 hook_results = self.RunHook(
2772 committing=True,
2773 may_prompt=not force,
2774 verbose=verbose,
2775 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2776 if not hook_results.should_continue():
2777 return 1
2778
2779 self.SubmitIssue(wait_for_merge=True)
2780 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002781 links = self._GetChangeCommit().get('web_links', [])
2782 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002783 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002784 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002785 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002786 return 0
2787
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002788 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002789 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002790 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002791 assert not directory
2792 assert parsed_issue_arg.valid
2793
2794 self._changelist.issue = parsed_issue_arg.issue
2795
2796 if parsed_issue_arg.hostname:
2797 self._gerrit_host = parsed_issue_arg.hostname
2798 self._gerrit_server = 'https://%s' % self._gerrit_host
2799
tandriic2405f52016-10-10 08:13:15 -07002800 try:
2801 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002802 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002803 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002804
2805 if not parsed_issue_arg.patchset:
2806 # Use current revision by default.
2807 revision_info = detail['revisions'][detail['current_revision']]
2808 patchset = int(revision_info['_number'])
2809 else:
2810 patchset = parsed_issue_arg.patchset
2811 for revision_info in detail['revisions'].itervalues():
2812 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2813 break
2814 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002815 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002816 (parsed_issue_arg.patchset, self.GetIssue()))
2817
2818 fetch_info = revision_info['fetch']['http']
2819 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002820
Aaron Gable62619a32017-06-16 08:22:09 -07002821 if force:
2822 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2823 print('Checked out commit for change %i patchset %i locally' %
2824 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002825 elif nocommit:
2826 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2827 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002828 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002829 RunGit(['cherry-pick', 'FETCH_HEAD'])
2830 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002831 (parsed_issue_arg.issue, patchset))
2832 print('Note: this created a local commit which does not have '
2833 'the same hash as the one uploaded for review. This will make '
2834 'uploading changes based on top of this branch difficult.\n'
2835 'If you want to do that, use "git cl patch --force" instead.')
2836
Stefan Zagerd08043c2017-10-12 12:07:02 -07002837 if self.GetBranch():
2838 self.SetIssue(parsed_issue_arg.issue)
2839 self.SetPatchset(patchset)
2840 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2841 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2842 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2843 else:
2844 print('WARNING: You are in detached HEAD state.\n'
2845 'The patch has been applied to your checkout, but you will not be '
2846 'able to upload a new patch set to the gerrit issue.\n'
2847 'Try using the \'-b\' option if you would like to work on a '
2848 'branch and/or upload a new patch set.')
2849
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002850 return 0
2851
2852 @staticmethod
2853 def ParseIssueURL(parsed_url):
2854 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2855 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002856 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2857 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002858 # Short urls like https://domain/<issue_number> can be used, but don't allow
2859 # specifying the patchset (you'd 404), but we allow that here.
2860 if parsed_url.path == '/':
2861 part = parsed_url.fragment
2862 else:
2863 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002864 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002865 if match:
2866 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002867 issue=int(match.group(3)),
2868 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002869 hostname=parsed_url.netloc,
2870 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002871 return None
2872
tandrii16e0b4e2016-06-07 10:34:28 -07002873 def _GerritCommitMsgHookCheck(self, offer_removal):
2874 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2875 if not os.path.exists(hook):
2876 return
2877 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2878 # custom developer made one.
2879 data = gclient_utils.FileRead(hook)
2880 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2881 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002882 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002883 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002884 'and may interfere with it in subtle ways.\n'
2885 'We recommend you remove the commit-msg hook.')
2886 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002887 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002888 gclient_utils.rm_file_or_tree(hook)
2889 print('Gerrit commit-msg hook removed.')
2890 else:
2891 print('OK, will keep Gerrit commit-msg hook in place.')
2892
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002893 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002894 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002895 if options.squash and options.no_squash:
2896 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002897
2898 if not options.squash and not options.no_squash:
2899 # Load default for user, repo, squash=true, in this order.
2900 options.squash = settings.GetSquashGerritUploads()
2901 elif options.no_squash:
2902 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002903
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002904 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002905 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906
Aaron Gableb56ad332017-01-06 15:24:31 -08002907 # This may be None; default fallback value is determined in logic below.
2908 title = options.title
2909
Dominic Battre7d1c4842017-10-27 09:17:28 +02002910 # Extract bug number from branch name.
2911 bug = options.bug
2912 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2913 if not bug and match:
2914 bug = match.group(1)
2915
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002916 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002917 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002918 if self.GetIssue():
2919 # Try to get the message from a previous upload.
2920 message = self.GetDescription()
2921 if not message:
2922 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002923 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002924 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002925 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002926 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002927 # When uploading a subsequent patchset, -m|--message is taken
2928 # as the patchset title if --title was not provided.
2929 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002930 else:
2931 default_title = RunGit(
2932 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002933 if options.force:
2934 title = default_title
2935 else:
2936 title = ask_for_data(
2937 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002938 change_id = self._GetChangeDetail()['change_id']
2939 while True:
2940 footer_change_ids = git_footers.get_footer_change_id(message)
2941 if footer_change_ids == [change_id]:
2942 break
2943 if not footer_change_ids:
2944 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002945 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946 continue
2947 # There is already a valid footer but with different or several ids.
2948 # Doing this automatically is non-trivial as we don't want to lose
2949 # existing other footers, yet we want to append just 1 desired
2950 # Change-Id. Thus, just create a new footer, but let user verify the
2951 # new description.
2952 message = '%s\n\nChange-Id: %s' % (message, change_id)
2953 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002954 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002955 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002956 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002957 'Please, check the proposed correction to the description, '
2958 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2959 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2960 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002961 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002962 if not options.force:
2963 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002964 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002965 message = change_desc.description
2966 if not message:
2967 DieWithError("Description is empty. Aborting...")
2968 # Continue the while loop.
2969 # Sanity check of this code - we should end up with proper message
2970 # footer.
2971 assert [change_id] == git_footers.get_footer_change_id(message)
2972 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002973 else: # if not self.GetIssue()
2974 if options.message:
2975 message = options.message
2976 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002977 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002978 if options.title:
2979 message = options.title + '\n\n' + message
2980 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002981
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002982 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002983 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002984 # On first upload, patchset title is always this string, while
2985 # --title flag gets converted to first line of message.
2986 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002987 if not change_desc.description:
2988 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002989 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 if len(change_ids) > 1:
2991 DieWithError('too many Change-Id footers, at most 1 allowed.')
2992 if not change_ids:
2993 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002994 change_desc.set_description(git_footers.add_footer_change_id(
2995 change_desc.description,
2996 GenerateGerritChangeId(change_desc.description)))
2997 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998 assert len(change_ids) == 1
2999 change_id = change_ids[0]
3000
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003001 if options.reviewers or options.tbrs or options.add_owners_to:
3002 change_desc.update_reviewers(options.reviewers, options.tbrs,
3003 options.add_owners_to, change)
3004
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003005 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003006 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3007 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003008 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07003009 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
3010 desc_tempfile.write(change_desc.description)
3011 desc_tempfile.close()
3012 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
3013 '-F', desc_tempfile.name]).strip()
3014 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003015 else:
3016 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003017 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003018 if not change_desc.description:
3019 DieWithError("Description is empty. Aborting...")
3020
3021 if not git_footers.get_footer_change_id(change_desc.description):
3022 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003023 change_desc.set_description(
3024 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003025 if options.reviewers or options.tbrs or options.add_owners_to:
3026 change_desc.update_reviewers(options.reviewers, options.tbrs,
3027 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003028 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003029 # For no-squash mode, we assume the remote called "origin" is the one we
3030 # want. It is not worthwhile to support different workflows for
3031 # no-squash mode.
3032 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003033 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3034
3035 assert change_desc
3036 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3037 ref_to_push)]).splitlines()
3038 if len(commits) > 1:
3039 print('WARNING: This will upload %d commits. Run the following command '
3040 'to see which commits will be uploaded: ' % len(commits))
3041 print('git log %s..%s' % (parent, ref_to_push))
3042 print('You can also use `git squash-branch` to squash these into a '
3043 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003044 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003045
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003046 if options.reviewers or options.tbrs or options.add_owners_to:
3047 change_desc.update_reviewers(options.reviewers, options.tbrs,
3048 options.add_owners_to, change)
3049
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003050 # Extra options that can be specified at push time. Doc:
3051 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003052 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003053
Aaron Gable844cf292017-06-28 11:32:59 -07003054 # By default, new changes are started in WIP mode, and subsequent patchsets
3055 # don't send email. At any time, passing --send-mail will mark the change
3056 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003057 if options.send_mail:
3058 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003059 refspec_opts.append('notify=ALL')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003060 elif not self.GetIssue():
3061 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07003062 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003063 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003064
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003065 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003066 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003067
Aaron Gable9b713dd2016-12-14 16:04:21 -08003068 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003069 # Punctuation and whitespace in |title| must be percent-encoded.
3070 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003071
agablec6787972016-09-09 16:13:34 -07003072 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003073 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003074
rmistry9eadede2016-09-19 11:22:43 -07003075 if options.topic:
3076 # Documentation on Gerrit topics is here:
3077 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003078 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003079
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003080 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08003081 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003082 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08003083 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003084 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
3085
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003086 refspec_suffix = ''
3087 if refspec_opts:
3088 refspec_suffix = '%' + ','.join(refspec_opts)
3089 assert ' ' not in refspec_suffix, (
3090 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3091 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3092
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003093 try:
3094 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003095 ['git', 'push', self.GetRemoteUrl(), refspec],
3096 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003097 # Flush after every line: useful for seeing progress when running as
3098 # recipe.
3099 filter_fn=lambda _: sys.stdout.flush())
3100 except subprocess2.CalledProcessError:
3101 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003102 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003103 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003104 'credential problems:\n'
3105 ' git cl creds-check\n',
3106 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003107
3108 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003109 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003110 change_numbers = [m.group(1)
3111 for m in map(regex.match, push_stdout.splitlines())
3112 if m]
3113 if len(change_numbers) != 1:
3114 DieWithError(
3115 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003116 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003117 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003118 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003119
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003120 reviewers = sorted(change_desc.get_reviewers())
3121
tandrii88189772016-09-29 04:29:57 -07003122 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003123 if not options.private:
3124 cc = self.GetCCList().split(',')
3125 else:
3126 cc = []
tandrii88189772016-09-29 04:29:57 -07003127 if options.cc:
3128 cc.extend(options.cc)
3129 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003130 if change_desc.get_cced():
3131 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003132
3133 gerrit_util.AddReviewers(
3134 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3135 notify=bool(options.send_mail))
3136
Aaron Gablefd238082017-06-07 13:42:34 -07003137 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003138 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3139 score = 1
3140 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3141 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3142 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003143 gerrit_util.SetReview(
3144 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003145 msg='Self-approving for TBR',
3146 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003147
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003148 return 0
3149
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003150 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3151 change_desc):
3152 """Computes parent of the generated commit to be uploaded to Gerrit.
3153
3154 Returns revision or a ref name.
3155 """
3156 if custom_cl_base:
3157 # Try to avoid creating additional unintended CLs when uploading, unless
3158 # user wants to take this risk.
3159 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3160 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3161 local_ref_of_target_remote])
3162 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003163 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003164 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3165 'If you proceed with upload, more than 1 CL may be created by '
3166 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3167 'If you are certain that specified base `%s` has already been '
3168 'uploaded to Gerrit as another CL, you may proceed.\n' %
3169 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3170 if not force:
3171 confirm_or_exit(
3172 'Do you take responsibility for cleaning up potential mess '
3173 'resulting from proceeding with upload?',
3174 action='upload')
3175 return custom_cl_base
3176
Aaron Gablef97e33d2017-03-30 15:44:27 -07003177 if remote != '.':
3178 return self.GetCommonAncestorWithUpstream()
3179
3180 # If our upstream branch is local, we base our squashed commit on its
3181 # squashed version.
3182 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3183
Aaron Gablef97e33d2017-03-30 15:44:27 -07003184 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003185 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003186
3187 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003188 # TODO(tandrii): consider checking parent change in Gerrit and using its
3189 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3190 # the tree hash of the parent branch. The upside is less likely bogus
3191 # requests to reupload parent change just because it's uploadhash is
3192 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003193 parent = RunGit(['config',
3194 'branch.%s.gerritsquashhash' % upstream_branch_name],
3195 error_ok=True).strip()
3196 # Verify that the upstream branch has been uploaded too, otherwise
3197 # Gerrit will create additional CLs when uploading.
3198 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3199 RunGitSilent(['rev-parse', parent + ':'])):
3200 DieWithError(
3201 '\nUpload upstream branch %s first.\n'
3202 'It is likely that this branch has been rebased since its last '
3203 'upload, so you just need to upload it again.\n'
3204 '(If you uploaded it with --no-squash, then branch dependencies '
3205 'are not supported, and you should reupload with --squash.)'
3206 % upstream_branch_name,
3207 change_desc)
3208 return parent
3209
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003210 def _AddChangeIdToCommitMessage(self, options, args):
3211 """Re-commits using the current message, assumes the commit hook is in
3212 place.
3213 """
3214 log_desc = options.message or CreateDescriptionFromLog(args)
3215 git_command = ['commit', '--amend', '-m', log_desc]
3216 RunGit(git_command)
3217 new_log_desc = CreateDescriptionFromLog(args)
3218 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003219 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003220 return new_log_desc
3221 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003222 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003223
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003224 def SetCQState(self, new_state):
3225 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003226 vote_map = {
3227 _CQState.NONE: 0,
3228 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003229 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003230 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003231 labels = {'Commit-Queue': vote_map[new_state]}
3232 notify = False if new_state == _CQState.DRY_RUN else None
3233 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3234 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003235
tandriie113dfd2016-10-11 10:20:12 -07003236 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003237 try:
3238 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003239 except GerritChangeNotExists:
3240 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003241
3242 if data['status'] in ('ABANDONED', 'MERGED'):
3243 return 'CL %s is closed' % self.GetIssue()
3244
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003245 def GetTryJobProperties(self, patchset=None):
3246 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003247 data = self._GetChangeDetail(['ALL_REVISIONS'])
3248 patchset = int(patchset or self.GetPatchset())
3249 assert patchset
3250 revision_data = None # Pylint wants it to be defined.
3251 for revision_data in data['revisions'].itervalues():
3252 if int(revision_data['_number']) == patchset:
3253 break
3254 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003255 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003256 (patchset, self.GetIssue()))
3257 return {
3258 'patch_issue': self.GetIssue(),
3259 'patch_set': patchset or self.GetPatchset(),
3260 'patch_project': data['project'],
3261 'patch_storage': 'gerrit',
3262 'patch_ref': revision_data['fetch']['http']['ref'],
3263 'patch_repository_url': revision_data['fetch']['http']['url'],
3264 'patch_gerrit_url': self.GetCodereviewServer(),
3265 }
tandriie113dfd2016-10-11 10:20:12 -07003266
tandriide281ae2016-10-12 06:02:30 -07003267 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003268 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003269
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003270
3271_CODEREVIEW_IMPLEMENTATIONS = {
3272 'rietveld': _RietveldChangelistImpl,
3273 'gerrit': _GerritChangelistImpl,
3274}
3275
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003276
iannuccie53c9352016-08-17 14:40:40 -07003277def _add_codereview_issue_select_options(parser, extra=""):
3278 _add_codereview_select_options(parser)
3279
3280 text = ('Operate on this issue number instead of the current branch\'s '
3281 'implicit issue.')
3282 if extra:
3283 text += ' '+extra
3284 parser.add_option('-i', '--issue', type=int, help=text)
3285
3286
3287def _process_codereview_issue_select_options(parser, options):
3288 _process_codereview_select_options(parser, options)
3289 if options.issue is not None and not options.forced_codereview:
3290 parser.error('--issue must be specified with either --rietveld or --gerrit')
3291
3292
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003293def _add_codereview_select_options(parser):
3294 """Appends --gerrit and --rietveld options to force specific codereview."""
3295 parser.codereview_group = optparse.OptionGroup(
3296 parser, 'EXPERIMENTAL! Codereview override options')
3297 parser.add_option_group(parser.codereview_group)
3298 parser.codereview_group.add_option(
3299 '--gerrit', action='store_true',
3300 help='Force the use of Gerrit for codereview')
3301 parser.codereview_group.add_option(
3302 '--rietveld', action='store_true',
3303 help='Force the use of Rietveld for codereview')
3304
3305
3306def _process_codereview_select_options(parser, options):
3307 if options.gerrit and options.rietveld:
3308 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3309 options.forced_codereview = None
3310 if options.gerrit:
3311 options.forced_codereview = 'gerrit'
3312 elif options.rietveld:
3313 options.forced_codereview = 'rietveld'
3314
3315
tandriif9aefb72016-07-01 09:06:51 -07003316def _get_bug_line_values(default_project, bugs):
3317 """Given default_project and comma separated list of bugs, yields bug line
3318 values.
3319
3320 Each bug can be either:
3321 * a number, which is combined with default_project
3322 * string, which is left as is.
3323
3324 This function may produce more than one line, because bugdroid expects one
3325 project per line.
3326
3327 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3328 ['v8:123', 'chromium:789']
3329 """
3330 default_bugs = []
3331 others = []
3332 for bug in bugs.split(','):
3333 bug = bug.strip()
3334 if bug:
3335 try:
3336 default_bugs.append(int(bug))
3337 except ValueError:
3338 others.append(bug)
3339
3340 if default_bugs:
3341 default_bugs = ','.join(map(str, default_bugs))
3342 if default_project:
3343 yield '%s:%s' % (default_project, default_bugs)
3344 else:
3345 yield default_bugs
3346 for other in sorted(others):
3347 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3348 yield other
3349
3350
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003351class ChangeDescription(object):
3352 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003353 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003354 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003355 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003356 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003357 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3358 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3359 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3360 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003361
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003362 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003363 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003364
agable@chromium.org42c20792013-09-12 17:34:49 +00003365 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003366 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003367 return '\n'.join(self._description_lines)
3368
3369 def set_description(self, desc):
3370 if isinstance(desc, basestring):
3371 lines = desc.splitlines()
3372 else:
3373 lines = [line.rstrip() for line in desc]
3374 while lines and not lines[0]:
3375 lines.pop(0)
3376 while lines and not lines[-1]:
3377 lines.pop(-1)
3378 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003379
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003380 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3381 """Rewrites the R=/TBR= line(s) as a single line each.
3382
3383 Args:
3384 reviewers (list(str)) - list of additional emails to use for reviewers.
3385 tbrs (list(str)) - list of additional emails to use for TBRs.
3386 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3387 the change that are missing OWNER coverage. If this is not None, you
3388 must also pass a value for `change`.
3389 change (Change) - The Change that should be used for OWNERS lookups.
3390 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003391 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003392 assert isinstance(tbrs, list), tbrs
3393
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003394 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003395 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003396
3397 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003398 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003399
3400 reviewers = set(reviewers)
3401 tbrs = set(tbrs)
3402 LOOKUP = {
3403 'TBR': tbrs,
3404 'R': reviewers,
3405 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003406
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003407 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003408 regexp = re.compile(self.R_LINE)
3409 matches = [regexp.match(line) for line in self._description_lines]
3410 new_desc = [l for i, l in enumerate(self._description_lines)
3411 if not matches[i]]
3412 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003413
agable@chromium.org42c20792013-09-12 17:34:49 +00003414 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003415
3416 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003417 for match in matches:
3418 if not match:
3419 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003420 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3421
3422 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003423 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003424 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003425 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003426 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003427 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003428 LOOKUP[add_owners_to].update(
3429 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003430
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003431 # If any folks ended up in both groups, remove them from tbrs.
3432 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003433
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003434 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3435 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003436
3437 # Put the new lines in the description where the old first R= line was.
3438 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3439 if 0 <= line_loc < len(self._description_lines):
3440 if new_tbr_line:
3441 self._description_lines.insert(line_loc, new_tbr_line)
3442 if new_r_line:
3443 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003444 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003445 if new_r_line:
3446 self.append_footer(new_r_line)
3447 if new_tbr_line:
3448 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003449
Aaron Gable3a16ed12017-03-23 10:51:55 -07003450 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003451 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003452 self.set_description([
3453 '# Enter a description of the change.',
3454 '# This will be displayed on the codereview site.',
3455 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003456 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003457 '--------------------',
3458 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003459
agable@chromium.org42c20792013-09-12 17:34:49 +00003460 regexp = re.compile(self.BUG_LINE)
3461 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003462 prefix = settings.GetBugPrefix()
3463 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003464 if git_footer:
3465 self.append_footer('Bug: %s' % ', '.join(values))
3466 else:
3467 for value in values:
3468 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003469
agable@chromium.org42c20792013-09-12 17:34:49 +00003470 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003471 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003472 if not content:
3473 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003474 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003475
3476 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003477 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3478 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003479 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003480 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003481
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003482 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003483 """Adds a footer line to the description.
3484
3485 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3486 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3487 that Gerrit footers are always at the end.
3488 """
3489 parsed_footer_line = git_footers.parse_footer(line)
3490 if parsed_footer_line:
3491 # Line is a gerrit footer in the form: Footer-Key: any value.
3492 # Thus, must be appended observing Gerrit footer rules.
3493 self.set_description(
3494 git_footers.add_footer(self.description,
3495 key=parsed_footer_line[0],
3496 value=parsed_footer_line[1]))
3497 return
3498
3499 if not self._description_lines:
3500 self._description_lines.append(line)
3501 return
3502
3503 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3504 if gerrit_footers:
3505 # git_footers.split_footers ensures that there is an empty line before
3506 # actual (gerrit) footers, if any. We have to keep it that way.
3507 assert top_lines and top_lines[-1] == ''
3508 top_lines, separator = top_lines[:-1], top_lines[-1:]
3509 else:
3510 separator = [] # No need for separator if there are no gerrit_footers.
3511
3512 prev_line = top_lines[-1] if top_lines else ''
3513 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3514 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3515 top_lines.append('')
3516 top_lines.append(line)
3517 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003518
tandrii99a72f22016-08-17 14:33:24 -07003519 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003520 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003521 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003522 reviewers = [match.group(2).strip()
3523 for match in matches
3524 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003525 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003526
bradnelsond975b302016-10-23 12:20:23 -07003527 def get_cced(self):
3528 """Retrieves the list of reviewers."""
3529 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3530 cced = [match.group(2).strip() for match in matches if match]
3531 return cleanup_list(cced)
3532
Nodir Turakulov23b82142017-11-16 11:04:25 -08003533 def get_hash_tags(self):
3534 """Extracts and sanitizes a list of Gerrit hashtags."""
3535 subject = (self._description_lines or ('',))[0]
3536 subject = re.sub(
3537 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3538
3539 tags = []
3540 start = 0
3541 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3542 while True:
3543 m = bracket_exp.match(subject, start)
3544 if not m:
3545 break
3546 tags.append(self.sanitize_hash_tag(m.group(1)))
3547 start = m.end()
3548
3549 if not tags:
3550 # Try "Tag: " prefix.
3551 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3552 if m:
3553 tags.append(self.sanitize_hash_tag(m.group(1)))
3554 return tags
3555
3556 @classmethod
3557 def sanitize_hash_tag(cls, tag):
3558 """Returns a sanitized Gerrit hash tag.
3559
3560 A sanitized hashtag can be used as a git push refspec parameter value.
3561 """
3562 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3563
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003564 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3565 """Updates this commit description given the parent.
3566
3567 This is essentially what Gnumbd used to do.
3568 Consult https://goo.gl/WMmpDe for more details.
3569 """
3570 assert parent_msg # No, orphan branch creation isn't supported.
3571 assert parent_hash
3572 assert dest_ref
3573 parent_footer_map = git_footers.parse_footers(parent_msg)
3574 # This will also happily parse svn-position, which GnumbD is no longer
3575 # supporting. While we'd generate correct footers, the verifier plugin
3576 # installed in Gerrit will block such commit (ie git push below will fail).
3577 parent_position = git_footers.get_position(parent_footer_map)
3578
3579 # Cherry-picks may have last line obscuring their prior footers,
3580 # from git_footers perspective. This is also what Gnumbd did.
3581 cp_line = None
3582 if (self._description_lines and
3583 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3584 cp_line = self._description_lines.pop()
3585
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003586 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003587
3588 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3589 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003590 for i, line in enumerate(footer_lines):
3591 k, v = git_footers.parse_footer(line) or (None, None)
3592 if k and k.startswith('Cr-'):
3593 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003594
3595 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003596 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003597 if parent_position[0] == dest_ref:
3598 # Same branch as parent.
3599 number = int(parent_position[1]) + 1
3600 else:
3601 number = 1 # New branch, and extra lineage.
3602 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3603 int(parent_position[1])))
3604
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003605 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3606 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003607
3608 self._description_lines = top_lines
3609 if cp_line:
3610 self._description_lines.append(cp_line)
3611 if self._description_lines[-1] != '':
3612 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003613 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003614
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003615
Aaron Gablea1bab272017-04-11 16:38:18 -07003616def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003617 """Retrieves the reviewers that approved a CL from the issue properties with
3618 messages.
3619
3620 Note that the list may contain reviewers that are not committer, thus are not
3621 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003622
3623 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003624 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003625 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003626 return sorted(
3627 set(
3628 message['sender']
3629 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003630 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003631 )
3632 )
3633
3634
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003635def FindCodereviewSettingsFile(filename='codereview.settings'):
3636 """Finds the given file starting in the cwd and going up.
3637
3638 Only looks up to the top of the repository unless an
3639 'inherit-review-settings-ok' file exists in the root of the repository.
3640 """
3641 inherit_ok_file = 'inherit-review-settings-ok'
3642 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003643 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003644 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3645 root = '/'
3646 while True:
3647 if filename in os.listdir(cwd):
3648 if os.path.isfile(os.path.join(cwd, filename)):
3649 return open(os.path.join(cwd, filename))
3650 if cwd == root:
3651 break
3652 cwd = os.path.dirname(cwd)
3653
3654
3655def LoadCodereviewSettingsFromFile(fileobj):
3656 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003657 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003658
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003659 def SetProperty(name, setting, unset_error_ok=False):
3660 fullname = 'rietveld.' + name
3661 if setting in keyvals:
3662 RunGit(['config', fullname, keyvals[setting]])
3663 else:
3664 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3665
tandrii48df5812016-10-17 03:55:37 -07003666 if not keyvals.get('GERRIT_HOST', False):
3667 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003668 # Only server setting is required. Other settings can be absent.
3669 # In that case, we ignore errors raised during option deletion attempt.
3670 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003671 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003672 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3673 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003674 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003675 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3676 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003677 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003678 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3679 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003680
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003681 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003682 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003683
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003684 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003685 RunGit(['config', 'gerrit.squash-uploads',
3686 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003687
tandrii@chromium.org28253532016-04-14 13:46:56 +00003688 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003689 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003690 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3691
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003692 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003693 # should be of the form
3694 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3695 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003696 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3697 keyvals['ORIGIN_URL_CONFIG']])
3698
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003699
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003700def urlretrieve(source, destination):
3701 """urllib is broken for SSL connections via a proxy therefore we
3702 can't use urllib.urlretrieve()."""
3703 with open(destination, 'w') as f:
3704 f.write(urllib2.urlopen(source).read())
3705
3706
ukai@chromium.org712d6102013-11-27 00:52:58 +00003707def hasSheBang(fname):
3708 """Checks fname is a #! script."""
3709 with open(fname) as f:
3710 return f.read(2).startswith('#!')
3711
3712
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003713# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3714def DownloadHooks(*args, **kwargs):
3715 pass
3716
3717
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003718def DownloadGerritHook(force):
3719 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003720
3721 Args:
3722 force: True to update hooks. False to install hooks if not present.
3723 """
3724 if not settings.GetIsGerrit():
3725 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003726 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003727 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3728 if not os.access(dst, os.X_OK):
3729 if os.path.exists(dst):
3730 if not force:
3731 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003732 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003733 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003734 if not hasSheBang(dst):
3735 DieWithError('Not a script: %s\n'
3736 'You need to download from\n%s\n'
3737 'into .git/hooks/commit-msg and '
3738 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003739 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3740 except Exception:
3741 if os.path.exists(dst):
3742 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003743 DieWithError('\nFailed to download hooks.\n'
3744 'You need to download from\n%s\n'
3745 'into .git/hooks/commit-msg and '
3746 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003747
3748
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003749def GetRietveldCodereviewSettingsInteractively():
3750 """Prompt the user for settings."""
3751 server = settings.GetDefaultServerUrl(error_ok=True)
3752 prompt = 'Rietveld server (host[:port])'
3753 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3754 newserver = ask_for_data(prompt + ':')
3755 if not server and not newserver:
3756 newserver = DEFAULT_SERVER
3757 if newserver:
3758 newserver = gclient_utils.UpgradeToHttps(newserver)
3759 if newserver != server:
3760 RunGit(['config', 'rietveld.server', newserver])
3761
3762 def SetProperty(initial, caption, name, is_url):
3763 prompt = caption
3764 if initial:
3765 prompt += ' ("x" to clear) [%s]' % initial
3766 new_val = ask_for_data(prompt + ':')
3767 if new_val == 'x':
3768 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3769 elif new_val:
3770 if is_url:
3771 new_val = gclient_utils.UpgradeToHttps(new_val)
3772 if new_val != initial:
3773 RunGit(['config', 'rietveld.' + name, new_val])
3774
3775 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3776 SetProperty(settings.GetDefaultPrivateFlag(),
3777 'Private flag (rietveld only)', 'private', False)
3778 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3779 'tree-status-url', False)
3780 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3781 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3782 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3783 'run-post-upload-hook', False)
3784
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003785
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003786class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003787 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003788
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003789 _GOOGLESOURCE = 'googlesource.com'
3790
3791 def __init__(self):
3792 # Cached list of [host, identity, source], where source is either
3793 # .gitcookies or .netrc.
3794 self._all_hosts = None
3795
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003796 def ensure_configured_gitcookies(self):
3797 """Runs checks and suggests fixes to make git use .gitcookies from default
3798 path."""
3799 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3800 configured_path = RunGitSilent(
3801 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003802 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003803 if configured_path:
3804 self._ensure_default_gitcookies_path(configured_path, default)
3805 else:
3806 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003807
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003808 @staticmethod
3809 def _ensure_default_gitcookies_path(configured_path, default_path):
3810 assert configured_path
3811 if configured_path == default_path:
3812 print('git is already configured to use your .gitcookies from %s' %
3813 configured_path)
3814 return
3815
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003816 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003817 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3818 (configured_path, default_path))
3819
3820 if not os.path.exists(configured_path):
3821 print('However, your configured .gitcookies file is missing.')
3822 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3823 action='reconfigure')
3824 RunGit(['config', '--global', 'http.cookiefile', default_path])
3825 return
3826
3827 if os.path.exists(default_path):
3828 print('WARNING: default .gitcookies file already exists %s' %
3829 default_path)
3830 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3831 default_path)
3832
3833 confirm_or_exit('Move existing .gitcookies to default location?',
3834 action='move')
3835 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003836 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003837 print('Moved and reconfigured git to use .gitcookies from %s' %
3838 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003839
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003840 @staticmethod
3841 def _configure_gitcookies_path(default_path):
3842 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3843 if os.path.exists(netrc_path):
3844 print('You seem to be using outdated .netrc for git credentials: %s' %
3845 netrc_path)
3846 print('This tool will guide you through setting up recommended '
3847 '.gitcookies store for git credentials.\n'
3848 '\n'
3849 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3850 ' git config --global --unset http.cookiefile\n'
3851 ' mv %s %s.backup\n\n' % (default_path, default_path))
3852 confirm_or_exit(action='setup .gitcookies')
3853 RunGit(['config', '--global', 'http.cookiefile', default_path])
3854 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003855
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003856 def get_hosts_with_creds(self, include_netrc=False):
3857 if self._all_hosts is None:
3858 a = gerrit_util.CookiesAuthenticator()
3859 self._all_hosts = [
3860 (h, u, s)
3861 for h, u, s in itertools.chain(
3862 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3863 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3864 )
3865 if h.endswith(self._GOOGLESOURCE)
3866 ]
3867
3868 if include_netrc:
3869 return self._all_hosts
3870 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3871
3872 def print_current_creds(self, include_netrc=False):
3873 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3874 if not hosts:
3875 print('No Git/Gerrit credentials found')
3876 return
3877 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3878 header = [('Host', 'User', 'Which file'),
3879 ['=' * l for l in lengths]]
3880 for row in (header + hosts):
3881 print('\t'.join((('%%+%ds' % l) % s)
3882 for l, s in zip(lengths, row)))
3883
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003884 @staticmethod
3885 def _parse_identity(identity):
3886 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003887 # Special case: users whose ldaps contain ".", which are generally not
3888 # distinguishable from sub-domains. But we do know typical domains:
3889 if identity.endswith('.chromium.org'):
3890 domain = 'chromium.org'
3891 username = identity[:-len('.chromium.org')]
3892 else:
3893 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003894 if username.startswith('git-'):
3895 username = username[len('git-'):]
3896 return username, domain
3897
3898 def _get_usernames_of_domain(self, domain):
3899 """Returns list of usernames referenced by .gitcookies in a given domain."""
3900 identities_by_domain = {}
3901 for _, identity, _ in self.get_hosts_with_creds():
3902 username, domain = self._parse_identity(identity)
3903 identities_by_domain.setdefault(domain, []).append(username)
3904 return identities_by_domain.get(domain)
3905
3906 def _canonical_git_googlesource_host(self, host):
3907 """Normalizes Gerrit hosts (with '-review') to Git host."""
3908 assert host.endswith(self._GOOGLESOURCE)
3909 # Prefix doesn't include '.' at the end.
3910 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3911 if prefix.endswith('-review'):
3912 prefix = prefix[:-len('-review')]
3913 return prefix + '.' + self._GOOGLESOURCE
3914
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003915 def _canonical_gerrit_googlesource_host(self, host):
3916 git_host = self._canonical_git_googlesource_host(host)
3917 prefix = git_host.split('.', 1)[0]
3918 return prefix + '-review.' + self._GOOGLESOURCE
3919
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003920 def _get_counterpart_host(self, host):
3921 assert host.endswith(self._GOOGLESOURCE)
3922 git = self._canonical_git_googlesource_host(host)
3923 gerrit = self._canonical_gerrit_googlesource_host(git)
3924 return git if gerrit == host else gerrit
3925
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003926 def has_generic_host(self):
3927 """Returns whether generic .googlesource.com has been configured.
3928
3929 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3930 """
3931 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3932 if host == '.' + self._GOOGLESOURCE:
3933 return True
3934 return False
3935
3936 def _get_git_gerrit_identity_pairs(self):
3937 """Returns map from canonic host to pair of identities (Git, Gerrit).
3938
3939 One of identities might be None, meaning not configured.
3940 """
3941 host_to_identity_pairs = {}
3942 for host, identity, _ in self.get_hosts_with_creds():
3943 canonical = self._canonical_git_googlesource_host(host)
3944 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3945 idx = 0 if canonical == host else 1
3946 pair[idx] = identity
3947 return host_to_identity_pairs
3948
3949 def get_partially_configured_hosts(self):
3950 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003951 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3952 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3953 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003954
3955 def get_conflicting_hosts(self):
3956 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003957 host
3958 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003959 if None not in (i1, i2) and i1 != i2)
3960
3961 def get_duplicated_hosts(self):
3962 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3963 return set(host for host, count in counters.iteritems() if count > 1)
3964
3965 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3966 'chromium.googlesource.com': 'chromium.org',
3967 'chrome-internal.googlesource.com': 'google.com',
3968 }
3969
3970 def get_hosts_with_wrong_identities(self):
3971 """Finds hosts which **likely** reference wrong identities.
3972
3973 Note: skips hosts which have conflicting identities for Git and Gerrit.
3974 """
3975 hosts = set()
3976 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3977 pair = self._get_git_gerrit_identity_pairs().get(host)
3978 if pair and pair[0] == pair[1]:
3979 _, domain = self._parse_identity(pair[0])
3980 if domain != expected:
3981 hosts.add(host)
3982 return hosts
3983
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003984 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003985 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003986 hosts = sorted(hosts)
3987 assert hosts
3988 if extra_column_func is None:
3989 extras = [''] * len(hosts)
3990 else:
3991 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003992 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3993 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003994 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003995 lines.append(tmpl % he)
3996 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003997
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003998 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003999 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004000 yield ('.googlesource.com wildcard record detected',
4001 ['Chrome Infrastructure team recommends to list full host names '
4002 'explicitly.'],
4003 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004004
4005 dups = self.get_duplicated_hosts()
4006 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004007 yield ('The following hosts were defined twice',
4008 self._format_hosts(dups),
4009 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004010
4011 partial = self.get_partially_configured_hosts()
4012 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004013 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
4014 'These hosts are missing',
4015 self._format_hosts(partial, lambda host: 'but %s defined' %
4016 self._get_counterpart_host(host)),
4017 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004018
4019 conflicting = self.get_conflicting_hosts()
4020 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004021 yield ('The following Git hosts have differing credentials from their '
4022 'Gerrit counterparts',
4023 self._format_hosts(conflicting, lambda host: '%s vs %s' %
4024 tuple(self._get_git_gerrit_identity_pairs()[host])),
4025 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004026
4027 wrong = self.get_hosts_with_wrong_identities()
4028 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004029 yield ('These hosts likely use wrong identity',
4030 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
4031 (self._get_git_gerrit_identity_pairs()[host][0],
4032 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
4033 wrong)
4034
4035 def find_and_report_problems(self):
4036 """Returns True if there was at least one problem, else False."""
4037 found = False
4038 bad_hosts = set()
4039 for title, sublines, hosts in self._find_problems():
4040 if not found:
4041 found = True
4042 print('\n\n.gitcookies problem report:\n')
4043 bad_hosts.update(hosts or [])
4044 print(' %s%s' % (title , (':' if sublines else '')))
4045 if sublines:
4046 print()
4047 print(' %s' % '\n '.join(sublines))
4048 print()
4049
4050 if bad_hosts:
4051 assert found
4052 print(' You can manually remove corresponding lines in your %s file and '
4053 'visit the following URLs with correct account to generate '
4054 'correct credential lines:\n' %
4055 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4056 print(' %s' % '\n '.join(sorted(set(
4057 gerrit_util.CookiesAuthenticator().get_new_password_url(
4058 self._canonical_git_googlesource_host(host))
4059 for host in bad_hosts
4060 ))))
4061 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004062
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004063
4064def CMDcreds_check(parser, args):
4065 """Checks credentials and suggests changes."""
4066 _, _ = parser.parse_args(args)
4067
4068 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004069 DieWithError(
4070 'This command is not designed for GCE, are you on a bot?\n'
4071 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004072
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004073 checker = _GitCookiesChecker()
4074 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004075
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004076 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004077 checker.print_current_creds(include_netrc=True)
4078
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004079 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004080 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004081 return 0
4082 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004083
4084
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004085@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004087 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004088
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004089 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004090 # TODO(tandrii): remove this once we switch to Gerrit.
4091 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004092 parser.add_option('--activate-update', action='store_true',
4093 help='activate auto-updating [rietveld] section in '
4094 '.git/config')
4095 parser.add_option('--deactivate-update', action='store_true',
4096 help='deactivate auto-updating [rietveld] section in '
4097 '.git/config')
4098 options, args = parser.parse_args(args)
4099
4100 if options.deactivate_update:
4101 RunGit(['config', 'rietveld.autoupdate', 'false'])
4102 return
4103
4104 if options.activate_update:
4105 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4106 return
4107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004108 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004109 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004110 return 0
4111
4112 url = args[0]
4113 if not url.endswith('codereview.settings'):
4114 url = os.path.join(url, 'codereview.settings')
4115
4116 # Load code review settings and download hooks (if available).
4117 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4118 return 0
4119
4120
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004121def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004122 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004123 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4124 branch = ShortBranchName(branchref)
4125 _, args = parser.parse_args(args)
4126 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004127 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004128 return RunGit(['config', 'branch.%s.base-url' % branch],
4129 error_ok=False).strip()
4130 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004131 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004132 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4133 error_ok=False).strip()
4134
4135
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004136def color_for_status(status):
4137 """Maps a Changelist status to color, for CMDstatus and other tools."""
4138 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004139 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004140 'waiting': Fore.BLUE,
4141 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004142 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004143 'lgtm': Fore.GREEN,
4144 'commit': Fore.MAGENTA,
4145 'closed': Fore.CYAN,
4146 'error': Fore.WHITE,
4147 }.get(status, Fore.WHITE)
4148
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004149
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004150def get_cl_statuses(changes, fine_grained, max_processes=None):
4151 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004152
4153 If fine_grained is true, this will fetch CL statuses from the server.
4154 Otherwise, simply indicate if there's a matching url for the given branches.
4155
4156 If max_processes is specified, it is used as the maximum number of processes
4157 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4158 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004159
4160 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004161 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004162 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004163 upload.verbosity = 0
4164
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004165 if not changes:
4166 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004167
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004168 if not fine_grained:
4169 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004170 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004171 for cl in changes:
4172 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004173 return
4174
4175 # First, sort out authentication issues.
4176 logging.debug('ensuring credentials exist')
4177 for cl in changes:
4178 cl.EnsureAuthenticated(force=False, refresh=True)
4179
4180 def fetch(cl):
4181 try:
4182 return (cl, cl.GetStatus())
4183 except:
4184 # See http://crbug.com/629863.
4185 logging.exception('failed to fetch status for %s:', cl)
4186 raise
4187
4188 threads_count = len(changes)
4189 if max_processes:
4190 threads_count = max(1, min(threads_count, max_processes))
4191 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4192
4193 pool = ThreadPool(threads_count)
4194 fetched_cls = set()
4195 try:
4196 it = pool.imap_unordered(fetch, changes).__iter__()
4197 while True:
4198 try:
4199 cl, status = it.next(timeout=5)
4200 except multiprocessing.TimeoutError:
4201 break
4202 fetched_cls.add(cl)
4203 yield cl, status
4204 finally:
4205 pool.close()
4206
4207 # Add any branches that failed to fetch.
4208 for cl in set(changes) - fetched_cls:
4209 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004210
rmistry@google.com2dd99862015-06-22 12:22:18 +00004211
4212def upload_branch_deps(cl, args):
4213 """Uploads CLs of local branches that are dependents of the current branch.
4214
4215 If the local branch dependency tree looks like:
4216 test1 -> test2.1 -> test3.1
4217 -> test3.2
4218 -> test2.2 -> test3.3
4219
4220 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4221 run on the dependent branches in this order:
4222 test2.1, test3.1, test3.2, test2.2, test3.3
4223
4224 Note: This function does not rebase your local dependent branches. Use it when
4225 you make a change to the parent branch that will not conflict with its
4226 dependent branches, and you would like their dependencies updated in
4227 Rietveld.
4228 """
4229 if git_common.is_dirty_git_tree('upload-branch-deps'):
4230 return 1
4231
4232 root_branch = cl.GetBranch()
4233 if root_branch is None:
4234 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4235 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004236 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004237 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4238 'patchset dependencies without an uploaded CL.')
4239
4240 branches = RunGit(['for-each-ref',
4241 '--format=%(refname:short) %(upstream:short)',
4242 'refs/heads'])
4243 if not branches:
4244 print('No local branches found.')
4245 return 0
4246
4247 # Create a dictionary of all local branches to the branches that are dependent
4248 # on it.
4249 tracked_to_dependents = collections.defaultdict(list)
4250 for b in branches.splitlines():
4251 tokens = b.split()
4252 if len(tokens) == 2:
4253 branch_name, tracked = tokens
4254 tracked_to_dependents[tracked].append(branch_name)
4255
vapiera7fbd5a2016-06-16 09:17:49 -07004256 print()
4257 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004258 dependents = []
4259 def traverse_dependents_preorder(branch, padding=''):
4260 dependents_to_process = tracked_to_dependents.get(branch, [])
4261 padding += ' '
4262 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004264 dependents.append(dependent)
4265 traverse_dependents_preorder(dependent, padding)
4266 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004267 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004268
4269 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004270 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004271 return 0
4272
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004273 confirm_or_exit('This command will checkout all dependent branches and run '
4274 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004275
andybons@chromium.org962f9462016-02-03 20:00:42 +00004276 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004277 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004278 args.extend(['-t', 'Updated patchset dependency'])
4279
rmistry@google.com2dd99862015-06-22 12:22:18 +00004280 # Record all dependents that failed to upload.
4281 failures = {}
4282 # Go through all dependents, checkout the branch and upload.
4283 try:
4284 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004285 print()
4286 print('--------------------------------------')
4287 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004288 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004289 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004290 try:
4291 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004292 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004293 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004294 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004295 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004296 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004297 finally:
4298 # Swap back to the original root branch.
4299 RunGit(['checkout', '-q', root_branch])
4300
vapiera7fbd5a2016-06-16 09:17:49 -07004301 print()
4302 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004303 for dependent_branch in dependents:
4304 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print(' %s : %s' % (dependent_branch, upload_status))
4306 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004307
4308 return 0
4309
4310
kmarshall3bff56b2016-06-06 18:31:47 -07004311def CMDarchive(parser, args):
4312 """Archives and deletes branches associated with closed changelists."""
4313 parser.add_option(
4314 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004315 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004316 parser.add_option(
4317 '-f', '--force', action='store_true',
4318 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004319 parser.add_option(
4320 '-d', '--dry-run', action='store_true',
4321 help='Skip the branch tagging and removal steps.')
4322 parser.add_option(
4323 '-t', '--notags', action='store_true',
4324 help='Do not tag archived branches. '
4325 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004326
4327 auth.add_auth_options(parser)
4328 options, args = parser.parse_args(args)
4329 if args:
4330 parser.error('Unsupported args: %s' % ' '.join(args))
4331 auth_config = auth.extract_auth_config_from_options(options)
4332
4333 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4334 if not branches:
4335 return 0
4336
vapiera7fbd5a2016-06-16 09:17:49 -07004337 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004338 changes = [Changelist(branchref=b, auth_config=auth_config)
4339 for b in branches.splitlines()]
4340 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4341 statuses = get_cl_statuses(changes,
4342 fine_grained=True,
4343 max_processes=options.maxjobs)
4344 proposal = [(cl.GetBranch(),
4345 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4346 for cl, status in statuses
4347 if status == 'closed']
4348 proposal.sort()
4349
4350 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004351 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004352 return 0
4353
4354 current_branch = GetCurrentBranch()
4355
vapiera7fbd5a2016-06-16 09:17:49 -07004356 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004357 if options.notags:
4358 for next_item in proposal:
4359 print(' ' + next_item[0])
4360 else:
4361 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4362 for next_item in proposal:
4363 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004364
kmarshall9249e012016-08-23 12:02:16 -07004365 # Quit now on precondition failure or if instructed by the user, either
4366 # via an interactive prompt or by command line flags.
4367 if options.dry_run:
4368 print('\nNo changes were made (dry run).\n')
4369 return 0
4370 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004371 print('You are currently on a branch \'%s\' which is associated with a '
4372 'closed codereview issue, so archive cannot proceed. Please '
4373 'checkout another branch and run this command again.' %
4374 current_branch)
4375 return 1
kmarshall9249e012016-08-23 12:02:16 -07004376 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004377 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4378 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004379 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004380 return 1
4381
4382 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004383 if not options.notags:
4384 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004385 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004386
vapiera7fbd5a2016-06-16 09:17:49 -07004387 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004388
4389 return 0
4390
4391
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004392def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004393 """Show status of changelists.
4394
4395 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004396 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004397 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004398 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004399 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004400 - Magenta in the commit queue
4401 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004402 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004403
4404 Also see 'git cl comments'.
4405 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004406 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004407 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004408 parser.add_option('-f', '--fast', action='store_true',
4409 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004410 parser.add_option(
4411 '-j', '--maxjobs', action='store', type=int,
4412 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004413
4414 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004415 _add_codereview_issue_select_options(
4416 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004417 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004418 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004419 if args:
4420 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004421 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004422
iannuccie53c9352016-08-17 14:40:40 -07004423 if options.issue is not None and not options.field:
4424 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004425
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004426 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004427 cl = Changelist(auth_config=auth_config, issue=options.issue,
4428 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004429 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004430 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431 elif options.field == 'id':
4432 issueid = cl.GetIssue()
4433 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004436 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004438 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004439 elif options.field == 'status':
4440 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441 elif options.field == 'url':
4442 url = cl.GetIssueURL()
4443 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004444 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004445 return 0
4446
4447 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4448 if not branches:
4449 print('No local branch found.')
4450 return 0
4451
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004452 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004453 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004454 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004455 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004456 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004457 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004458 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004459
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004460 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004461 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4462 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4463 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004464 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004465 c, status = output.next()
4466 branch_statuses[c.GetBranch()] = status
4467 status = branch_statuses.pop(branch)
4468 url = cl.GetIssueURL()
4469 if url and (not status or status == 'error'):
4470 # The issue probably doesn't exist anymore.
4471 url += ' (broken)'
4472
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004473 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004474 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004475 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004476 color = ''
4477 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004478 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004479 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004480 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004481 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004482
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004483
4484 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004485 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004486 print('Current branch: %s' % branch)
4487 for cl in changes:
4488 if cl.GetBranch() == branch:
4489 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004490 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004491 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004492 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004493 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004494 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004495 print('Issue description:')
4496 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004497 return 0
4498
4499
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004500def colorize_CMDstatus_doc():
4501 """To be called once in main() to add colors to git cl status help."""
4502 colors = [i for i in dir(Fore) if i[0].isupper()]
4503
4504 def colorize_line(line):
4505 for color in colors:
4506 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004507 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004508 indent = len(line) - len(line.lstrip(' ')) + 1
4509 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4510 return line
4511
4512 lines = CMDstatus.__doc__.splitlines()
4513 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4514
4515
phajdan.jre328cf92016-08-22 04:12:17 -07004516def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004517 if path == '-':
4518 json.dump(contents, sys.stdout)
4519 else:
4520 with open(path, 'w') as f:
4521 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004522
4523
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004524@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004525def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004526 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004527
4528 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004529 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004530 parser.add_option('-r', '--reverse', action='store_true',
4531 help='Lookup the branch(es) for the specified issues. If '
4532 'no issues are specified, all branches with mapped '
4533 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004534 parser.add_option('--json',
4535 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004536 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004537 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004538 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539
dnj@chromium.org406c4402015-03-03 17:22:28 +00004540 if options.reverse:
4541 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004542 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004543 # Reverse issue lookup.
4544 issue_branch_map = {}
4545 for branch in branches:
4546 cl = Changelist(branchref=branch)
4547 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4548 if not args:
4549 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004550 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004551 for issue in args:
4552 if not issue:
4553 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004554 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004555 print('Branch for issue number %s: %s' % (
4556 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004557 if options.json:
4558 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004559 return 0
4560
4561 if len(args) > 0:
4562 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4563 if not issue.valid:
4564 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4565 'or no argument to list it.\n'
4566 'Maybe you want to run git cl status?')
4567 cl = Changelist(codereview=issue.codereview)
4568 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004569 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004570 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004571 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4572 if options.json:
4573 write_json(options.json, {
4574 'issue': cl.GetIssue(),
4575 'issue_url': cl.GetIssueURL(),
4576 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577 return 0
4578
4579
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004580def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004581 """Shows or posts review comments for any changelist."""
4582 parser.add_option('-a', '--add-comment', dest='comment',
4583 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004584 parser.add_option('-i', '--issue', dest='issue',
4585 help='review issue id (defaults to current issue). '
4586 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004587 parser.add_option('-m', '--machine-readable', dest='readable',
4588 action='store_false', default=True,
4589 help='output comments in a format compatible with '
4590 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004591 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004592 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004593 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004594 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004595 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004596 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004597 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004598
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004599 issue = None
4600 if options.issue:
4601 try:
4602 issue = int(options.issue)
4603 except ValueError:
4604 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004605 if not options.forced_codereview:
4606 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004607
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004608 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004609 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004610 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004611
4612 if options.comment:
4613 cl.AddComment(options.comment)
4614 return 0
4615
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004616 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4617 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004618 for comment in summary:
4619 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004620 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004621 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004622 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004623 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004624 color = Fore.MAGENTA
4625 else:
4626 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004627 print('\n%s%s %s%s\n%s' % (
4628 color,
4629 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4630 comment.sender,
4631 Fore.RESET,
4632 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4633
smut@google.comc85ac942015-09-15 16:34:43 +00004634 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004635 def pre_serialize(c):
4636 dct = c.__dict__.copy()
4637 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4638 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004639 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004640 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004641 return 0
4642
4643
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004644@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004645def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004646 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004647 parser.add_option('-d', '--display', action='store_true',
4648 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004649 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004650 help='New description to set for this issue (- for stdin, '
4651 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004652 parser.add_option('-f', '--force', action='store_true',
4653 help='Delete any unpublished Gerrit edits for this issue '
4654 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004655
4656 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004657 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004658 options, args = parser.parse_args(args)
4659 _process_codereview_select_options(parser, options)
4660
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004661 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004662 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004663 target_issue_arg = ParseIssueNumberArgument(args[0],
4664 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004665 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004666 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004667
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004668 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004669
martiniss6eda05f2016-06-30 10:18:35 -07004670 kwargs = {
4671 'auth_config': auth_config,
4672 'codereview': options.forced_codereview,
4673 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004674 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004675 if target_issue_arg:
4676 kwargs['issue'] = target_issue_arg.issue
4677 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004678 if target_issue_arg.codereview and not options.forced_codereview:
4679 detected_codereview_from_url = True
4680 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004681
4682 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004683 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004684 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004685 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004686
4687 if detected_codereview_from_url:
4688 logging.info('canonical issue/change URL: %s (type: %s)\n',
4689 cl.GetIssueURL(), target_issue_arg.codereview)
4690
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004691 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004692
smut@google.com34fb6b12015-07-13 20:03:26 +00004693 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004694 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004695 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004696
4697 if options.new_description:
4698 text = options.new_description
4699 if text == '-':
4700 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004701 elif text == '+':
4702 base_branch = cl.GetCommonAncestorWithUpstream()
4703 change = cl.GetChange(base_branch, None, local_description=True)
4704 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004705
4706 description.set_description(text)
4707 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004708 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004709
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004710 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004711 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004712 return 0
4713
4714
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004715def CreateDescriptionFromLog(args):
4716 """Pulls out the commit log to use as a base for the CL description."""
4717 log_args = []
4718 if len(args) == 1 and not args[0].endswith('.'):
4719 log_args = [args[0] + '..']
4720 elif len(args) == 1 and args[0].endswith('...'):
4721 log_args = [args[0][:-1]]
4722 elif len(args) == 2:
4723 log_args = [args[0] + '..' + args[1]]
4724 else:
4725 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004726 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004727
4728
thestig@chromium.org44202a22014-03-11 19:22:18 +00004729def CMDlint(parser, args):
4730 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004731 parser.add_option('--filter', action='append', metavar='-x,+y',
4732 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004733 auth.add_auth_options(parser)
4734 options, args = parser.parse_args(args)
4735 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004736
4737 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004738 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004739 try:
4740 import cpplint
4741 import cpplint_chromium
4742 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004743 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004744 return 1
4745
4746 # Change the current working directory before calling lint so that it
4747 # shows the correct base.
4748 previous_cwd = os.getcwd()
4749 os.chdir(settings.GetRoot())
4750 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004751 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004752 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4753 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004754 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004755 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004756 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004757
4758 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004759 command = args + files
4760 if options.filter:
4761 command = ['--filter=' + ','.join(options.filter)] + command
4762 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004763
4764 white_regex = re.compile(settings.GetLintRegex())
4765 black_regex = re.compile(settings.GetLintIgnoreRegex())
4766 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4767 for filename in filenames:
4768 if white_regex.match(filename):
4769 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004770 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004771 else:
4772 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4773 extra_check_functions)
4774 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004775 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004776 finally:
4777 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004778 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004779 if cpplint._cpplint_state.error_count != 0:
4780 return 1
4781 return 0
4782
4783
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004784def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004785 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004786 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004787 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004788 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004789 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004790 parser.add_option('--all', action='store_true',
4791 help='Run checks against all files, not just modified ones')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004792 auth.add_auth_options(parser)
4793 options, args = parser.parse_args(args)
4794 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004795
sbc@chromium.org71437c02015-04-09 19:29:40 +00004796 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004797 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004798 return 1
4799
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004800 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004801 if args:
4802 base_branch = args[0]
4803 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004804 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004805 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004806
Aaron Gable8076c282017-11-29 14:39:41 -08004807 if options.all:
4808 base_change = cl.GetChange(base_branch, None)
4809 files = [('M', f) for f in base_change.AllFiles()]
4810 change = presubmit_support.GitChange(
4811 base_change.Name(),
4812 base_change.FullDescriptionText(),
4813 base_change.RepositoryRoot(),
4814 files,
4815 base_change.issue,
4816 base_change.patchset,
4817 base_change.author_email,
4818 base_change._upstream)
4819 else:
4820 change = cl.GetChange(base_branch, None)
4821
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004822 cl.RunHook(
4823 committing=not options.upload,
4824 may_prompt=False,
4825 verbose=options.verbose,
Aaron Gable8076c282017-11-29 14:39:41 -08004826 change=change)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004827 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004828
4829
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004830def GenerateGerritChangeId(message):
4831 """Returns Ixxxxxx...xxx change id.
4832
4833 Works the same way as
4834 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4835 but can be called on demand on all platforms.
4836
4837 The basic idea is to generate git hash of a state of the tree, original commit
4838 message, author/committer info and timestamps.
4839 """
4840 lines = []
4841 tree_hash = RunGitSilent(['write-tree'])
4842 lines.append('tree %s' % tree_hash.strip())
4843 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4844 if code == 0:
4845 lines.append('parent %s' % parent.strip())
4846 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4847 lines.append('author %s' % author.strip())
4848 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4849 lines.append('committer %s' % committer.strip())
4850 lines.append('')
4851 # Note: Gerrit's commit-hook actually cleans message of some lines and
4852 # whitespace. This code is not doing this, but it clearly won't decrease
4853 # entropy.
4854 lines.append(message)
4855 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4856 stdin='\n'.join(lines))
4857 return 'I%s' % change_hash.strip()
4858
4859
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004860def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004861 """Computes the remote branch ref to use for the CL.
4862
4863 Args:
4864 remote (str): The git remote for the CL.
4865 remote_branch (str): The git remote branch for the CL.
4866 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004867 """
4868 if not (remote and remote_branch):
4869 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004870
wittman@chromium.org455dc922015-01-26 20:15:50 +00004871 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004872 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004873 # refs, which are then translated into the remote full symbolic refs
4874 # below.
4875 if '/' not in target_branch:
4876 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4877 else:
4878 prefix_replacements = (
4879 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4880 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4881 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4882 )
4883 match = None
4884 for regex, replacement in prefix_replacements:
4885 match = re.search(regex, target_branch)
4886 if match:
4887 remote_branch = target_branch.replace(match.group(0), replacement)
4888 break
4889 if not match:
4890 # This is a branch path but not one we recognize; use as-is.
4891 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004892 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4893 # Handle the refs that need to land in different refs.
4894 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004895
wittman@chromium.org455dc922015-01-26 20:15:50 +00004896 # Create the true path to the remote branch.
4897 # Does the following translation:
4898 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4899 # * refs/remotes/origin/master -> refs/heads/master
4900 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4901 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4902 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4903 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4904 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4905 'refs/heads/')
4906 elif remote_branch.startswith('refs/remotes/branch-heads'):
4907 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004908
wittman@chromium.org455dc922015-01-26 20:15:50 +00004909 return remote_branch
4910
4911
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004912def cleanup_list(l):
4913 """Fixes a list so that comma separated items are put as individual items.
4914
4915 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4916 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4917 """
4918 items = sum((i.split(',') for i in l), [])
4919 stripped_items = (i.strip() for i in items)
4920 return sorted(filter(None, stripped_items))
4921
4922
Aaron Gable4db38df2017-11-03 14:59:07 -07004923@subcommand.usage('[flags]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004924def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004925 """Uploads the current changelist to codereview.
4926
4927 Can skip dependency patchset uploads for a branch by running:
4928 git config branch.branch_name.skip-deps-uploads True
4929 To unset run:
4930 git config --unset branch.branch_name.skip-deps-uploads
4931 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004932
4933 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4934 a bug number, this bug number is automatically populated in the CL
4935 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004936
4937 If subject contains text in square brackets or has "<text>: " prefix, such
4938 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4939 [git-cl] add support for hashtags
4940 Foo bar: implement foo
4941 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004942 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004943 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4944 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004945 parser.add_option('--bypass-watchlists', action='store_true',
4946 dest='bypass_watchlists',
4947 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004948 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004949 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004950 parser.add_option('--message', '-m', dest='message',
4951 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004952 parser.add_option('-b', '--bug',
4953 help='pre-populate the bug number(s) for this issue. '
4954 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004955 parser.add_option('--message-file', dest='message_file',
4956 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004957 parser.add_option('--title', '-t', dest='title',
4958 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004959 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004960 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004961 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004962 parser.add_option('--tbrs',
4963 action='append', default=[],
4964 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004965 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004966 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004967 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004968 parser.add_option('--hashtag', dest='hashtags',
4969 action='append', default=[],
4970 help=('Gerrit hashtag for new CL; '
4971 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004972 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004973 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004974 parser.add_option('--emulate_svn_auto_props',
4975 '--emulate-svn-auto-props',
4976 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004977 dest="emulate_svn_auto_props",
4978 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004979 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004980 help='tell the commit queue to commit this patchset; '
4981 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004982 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004983 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004984 metavar='TARGET',
4985 help='Apply CL to remote ref TARGET. ' +
4986 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004987 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004988 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004989 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004990 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004991 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004992 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004993 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4994 const='TBR', help='add a set of OWNERS to TBR')
4995 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4996 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004997 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4998 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004999 help='Send the patchset to do a CQ dry run right after '
5000 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00005001 parser.add_option('--dependencies', action='store_true',
5002 help='Uploads CLs of all the local branches that depend on '
5003 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00005004
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005005 # TODO: remove Rietveld flags
5006 parser.add_option('--private', action='store_true',
5007 help='set the review private (rietveld only)')
5008 parser.add_option('--email', default=None,
5009 help='email address to use to connect to Rietveld')
5010
rmistry@google.com2dd99862015-06-22 12:22:18 +00005011 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00005012 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005013 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005014 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005015 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005016 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005017 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005018
sbc@chromium.org71437c02015-04-09 19:29:40 +00005019 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005020 return 1
5021
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005022 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005023 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005024 options.cc = cleanup_list(options.cc)
5025
tandriib80458a2016-06-23 12:20:07 -07005026 if options.message_file:
5027 if options.message:
5028 parser.error('only one of --message and --message-file allowed.')
5029 options.message = gclient_utils.FileRead(options.message_file)
5030 options.message_file = None
5031
tandrii4d0545a2016-07-06 03:56:49 -07005032 if options.cq_dry_run and options.use_commit_queue:
5033 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5034
Aaron Gableedbc4132017-09-11 13:22:28 -07005035 if options.use_commit_queue:
5036 options.send_mail = True
5037
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005038 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5039 settings.GetIsGerrit()
5040
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005041 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005042 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005043
5044
Francois Dorayd42c6812017-05-30 15:10:20 -04005045@subcommand.usage('--description=<description file>')
5046def CMDsplit(parser, args):
5047 """Splits a branch into smaller branches and uploads CLs.
5048
5049 Creates a branch and uploads a CL for each group of files modified in the
5050 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005051 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005052 the shared OWNERS file.
5053 """
5054 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005055 help="A text file containing a CL description in which "
5056 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005057 parser.add_option("-c", "--comment", dest="comment_file",
5058 help="A text file containing a CL comment.")
5059 options, _ = parser.parse_args(args)
5060
5061 if not options.description_file:
5062 parser.error('No --description flag specified.')
5063
5064 def WrappedCMDupload(args):
5065 return CMDupload(OptionParser(), args)
5066
5067 return split_cl.SplitCl(options.description_file, options.comment_file,
5068 Changelist, WrappedCMDupload)
5069
5070
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005071@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005072def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005073 """DEPRECATED: Used to commit the current changelist via git-svn."""
5074 message = ('git-cl no longer supports committing to SVN repositories via '
5075 'git-svn. You probably want to use `git cl land` instead.')
5076 print(message)
5077 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005078
5079
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005080# Two special branches used by git cl land.
5081MERGE_BRANCH = 'git-cl-commit'
5082CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5083
5084
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005085@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005086def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005087 """Commits the current changelist via git.
5088
5089 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5090 upstream and closes the issue automatically and atomically.
5091
5092 Otherwise (in case of Rietveld):
5093 Squashes branch into a single commit.
5094 Updates commit message with metadata (e.g. pointer to review).
5095 Pushes the code upstream.
5096 Updates review and closes.
5097 """
5098 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5099 help='bypass upload presubmit hook')
5100 parser.add_option('-m', dest='message',
5101 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005102 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005103 help="force yes to questions (don't prompt)")
5104 parser.add_option('-c', dest='contributor',
5105 help="external contributor for patch (appended to " +
5106 "description and used as author for git). Should be " +
5107 "formatted as 'First Last <email@example.com>'")
5108 add_git_similarity(parser)
5109 auth.add_auth_options(parser)
5110 (options, args) = parser.parse_args(args)
5111 auth_config = auth.extract_auth_config_from_options(options)
5112
5113 cl = Changelist(auth_config=auth_config)
5114
5115 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5116 if cl.IsGerrit():
5117 if options.message:
5118 # This could be implemented, but it requires sending a new patch to
5119 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5120 # Besides, Gerrit has the ability to change the commit message on submit
5121 # automatically, thus there is no need to support this option (so far?).
5122 parser.error('-m MESSAGE option is not supported for Gerrit.')
5123 if options.contributor:
5124 parser.error(
5125 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5126 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5127 'the contributor\'s "name <email>". If you can\'t upload such a '
5128 'commit for review, contact your repository admin and request'
5129 '"Forge-Author" permission.')
5130 if not cl.GetIssue():
5131 DieWithError('You must upload the change first to Gerrit.\n'
5132 ' If you would rather have `git cl land` upload '
5133 'automatically for you, see http://crbug.com/642759')
5134 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5135 options.verbose)
5136
5137 current = cl.GetBranch()
5138 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5139 if remote == '.':
5140 print()
5141 print('Attempting to push branch %r into another local branch!' % current)
5142 print()
5143 print('Either reparent this branch on top of origin/master:')
5144 print(' git reparent-branch --root')
5145 print()
5146 print('OR run `git rebase-update` if you think the parent branch is ')
5147 print('already committed.')
5148 print()
5149 print(' Current parent: %r' % upstream_branch)
5150 return 1
5151
5152 if not args:
5153 # Default to merging against our best guess of the upstream branch.
5154 args = [cl.GetUpstreamBranch()]
5155
5156 if options.contributor:
5157 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005158 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005159 return 1
5160
5161 base_branch = args[0]
5162
5163 if git_common.is_dirty_git_tree('land'):
5164 return 1
5165
5166 # This rev-list syntax means "show all commits not in my branch that
5167 # are in base_branch".
5168 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5169 base_branch]).splitlines()
5170 if upstream_commits:
5171 print('Base branch "%s" has %d commits '
5172 'not in this branch.' % (base_branch, len(upstream_commits)))
5173 print('Run "git merge %s" before attempting to land.' % base_branch)
5174 return 1
5175
5176 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5177 if not options.bypass_hooks:
5178 author = None
5179 if options.contributor:
5180 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5181 hook_results = cl.RunHook(
5182 committing=True,
5183 may_prompt=not options.force,
5184 verbose=options.verbose,
5185 change=cl.GetChange(merge_base, author))
5186 if not hook_results.should_continue():
5187 return 1
5188
5189 # Check the tree status if the tree status URL is set.
5190 status = GetTreeStatus()
5191 if 'closed' == status:
5192 print('The tree is closed. Please wait for it to reopen. Use '
5193 '"git cl land --bypass-hooks" to commit on a closed tree.')
5194 return 1
5195 elif 'unknown' == status:
5196 print('Unable to determine tree status. Please verify manually and '
5197 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5198 return 1
5199
5200 change_desc = ChangeDescription(options.message)
5201 if not change_desc.description and cl.GetIssue():
5202 change_desc = ChangeDescription(cl.GetDescription())
5203
5204 if not change_desc.description:
5205 if not cl.GetIssue() and options.bypass_hooks:
5206 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5207 else:
5208 print('No description set.')
5209 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5210 return 1
5211
5212 # Keep a separate copy for the commit message, because the commit message
5213 # contains the link to the Rietveld issue, while the Rietveld message contains
5214 # the commit viewvc url.
5215 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005216 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005217 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005218
5219 commit_desc = ChangeDescription(change_desc.description)
5220 if cl.GetIssue():
5221 # Xcode won't linkify this URL unless there is a non-whitespace character
5222 # after it. Add a period on a new line to circumvent this. Also add a space
5223 # before the period to make sure that Gitiles continues to correctly resolve
5224 # the URL.
5225 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5226 if options.contributor:
5227 commit_desc.append_footer('Patch from %s.' % options.contributor)
5228
5229 print('Description:')
5230 print(commit_desc.description)
5231
5232 branches = [merge_base, cl.GetBranchRef()]
5233 if not options.force:
5234 print_stats(options.similarity, options.find_copies, branches)
5235
5236 # We want to squash all this branch's commits into one commit with the proper
5237 # description. We do this by doing a "reset --soft" to the base branch (which
5238 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005239 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005240 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5241 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5242 result = RunGitWithCode(showref_cmd)
5243 if result[0] == 0:
5244 RunGit(['branch', '-D', branch])
5245
5246 # We might be in a directory that's present in this branch but not in the
5247 # trunk. Move up to the top of the tree so that git commands that expect a
5248 # valid CWD won't fail after we check out the merge branch.
5249 rel_base_path = settings.GetRelativeRoot()
5250 if rel_base_path:
5251 os.chdir(rel_base_path)
5252
5253 # Stuff our change into the merge branch.
5254 # We wrap in a try...finally block so if anything goes wrong,
5255 # we clean up the branches.
5256 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005257 revision = None
5258 try:
5259 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5260 RunGit(['reset', '--soft', merge_base])
5261 if options.contributor:
5262 RunGit(
5263 [
5264 'commit', '--author', options.contributor,
5265 '-m', commit_desc.description,
5266 ])
5267 else:
5268 RunGit(['commit', '-m', commit_desc.description])
5269
5270 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5271 mirror = settings.GetGitMirror(remote)
5272 if mirror:
5273 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005274 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005275 else:
5276 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005277 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005278 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5279
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005280 retcode = PushToGitWithAutoRebase(
5281 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005282 if retcode == 0:
5283 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005284 if git_numberer_enabled:
5285 change_desc = ChangeDescription(
5286 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005287 except: # pylint: disable=bare-except
5288 if _IS_BEING_TESTED:
5289 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5290 + '-' * 30 + '8<' + '-' * 30)
5291 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5292 raise
5293 finally:
5294 # And then swap back to the original branch and clean up.
5295 RunGit(['checkout', '-q', cl.GetBranch()])
5296 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005297 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005298
5299 if not revision:
5300 print('Failed to push. If this persists, please file a bug.')
5301 return 1
5302
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005303 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005304 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005305 if viewvc_url and revision:
5306 change_desc.append_footer(
5307 'Committed: %s%s' % (viewvc_url, revision))
5308 elif revision:
5309 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005310 print('Closing issue '
5311 '(you may be prompted for your codereview password)...')
5312 cl.UpdateDescription(change_desc.description)
5313 cl.CloseIssue()
5314 props = cl.GetIssueProperties()
5315 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005316 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5317 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005318 if options.bypass_hooks:
5319 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5320 else:
5321 comment += ' (presubmit successful).'
5322 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5323
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005324 if os.path.isfile(POSTUPSTREAM_HOOK):
5325 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5326
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005327 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005328
5329
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005330def PushToGitWithAutoRebase(remote, branch, original_description,
5331 git_numberer_enabled, max_attempts=3):
5332 """Pushes current HEAD commit on top of remote's branch.
5333
5334 Attempts to fetch and autorebase on push failures.
5335 Adds git number footers on the fly.
5336
5337 Returns integer code from last command.
5338 """
5339 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5340 code = 0
5341 attempts_left = max_attempts
5342 while attempts_left:
5343 attempts_left -= 1
5344 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5345
5346 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5347 # If fetch fails, retry.
5348 print('Fetching %s/%s...' % (remote, branch))
5349 code, out = RunGitWithCode(
5350 ['retry', 'fetch', remote,
5351 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5352 if code:
5353 print('Fetch failed with exit code %d.' % code)
5354 print(out.strip())
5355 continue
5356
5357 print('Cherry-picking commit on top of latest %s' % branch)
5358 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5359 suppress_stderr=True)
5360 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5361 code, out = RunGitWithCode(['cherry-pick', cherry])
5362 if code:
5363 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5364 'the following files have merge conflicts:' %
5365 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005366 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5367 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005368 print('Please rebase your patch and try again.')
5369 RunGitWithCode(['cherry-pick', '--abort'])
5370 break
5371
5372 commit_desc = ChangeDescription(original_description)
5373 if git_numberer_enabled:
5374 logging.debug('Adding git number footers')
5375 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5376 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5377 branch)
5378 # Ensure timestamps are monotonically increasing.
5379 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5380 _get_committer_timestamp('HEAD'))
5381 _git_amend_head(commit_desc.description, timestamp)
5382
5383 code, out = RunGitWithCode(
5384 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5385 print(out)
5386 if code == 0:
5387 break
5388 if IsFatalPushFailure(out):
5389 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005390 'user.email are correct and you have push access to the repo.\n'
5391 'Hint: run command below to diangose common Git/Gerrit credential '
5392 'problems:\n'
5393 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005394 break
5395 return code
5396
5397
5398def IsFatalPushFailure(push_stdout):
5399 """True if retrying push won't help."""
5400 return '(prohibited by Gerrit)' in push_stdout
5401
5402
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005403@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005404def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005405 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005406 parser.add_option('-b', dest='newbranch',
5407 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005408 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005409 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005410 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005411 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005412 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005413 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005414 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005415 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005416 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005417 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005418
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005419
5420 group = optparse.OptionGroup(
5421 parser,
5422 'Options for continuing work on the current issue uploaded from a '
5423 'different clone (e.g. different machine). Must be used independently '
5424 'from the other options. No issue number should be specified, and the '
5425 'branch must have an issue number associated with it')
5426 group.add_option('--reapply', action='store_true', dest='reapply',
5427 help='Reset the branch and reapply the issue.\n'
5428 'CAUTION: This will undo any local changes in this '
5429 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005430
5431 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005432 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005433 parser.add_option_group(group)
5434
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005435 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005436 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005437 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005438 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005439 auth_config = auth.extract_auth_config_from_options(options)
5440
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005441 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005442 if options.newbranch:
5443 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005444 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005445 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005446
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005447 cl = Changelist(auth_config=auth_config,
5448 codereview=options.forced_codereview)
5449 if not cl.GetIssue():
5450 parser.error('current branch must have an associated issue')
5451
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005452 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005453 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005454 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005455
5456 RunGit(['reset', '--hard', upstream])
5457 if options.pull:
5458 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005459
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005460 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5461 options.directory)
5462
5463 if len(args) != 1 or not args[0]:
5464 parser.error('Must specify issue number or url')
5465
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005466 target_issue_arg = ParseIssueNumberArgument(args[0],
5467 options.forced_codereview)
5468 if not target_issue_arg.valid:
5469 parser.error('invalid codereview url or CL id')
5470
5471 cl_kwargs = {
5472 'auth_config': auth_config,
5473 'codereview_host': target_issue_arg.hostname,
5474 'codereview': options.forced_codereview,
5475 }
5476 detected_codereview_from_url = False
5477 if target_issue_arg.codereview and not options.forced_codereview:
5478 detected_codereview_from_url = True
5479 cl_kwargs['codereview'] = target_issue_arg.codereview
5480 cl_kwargs['issue'] = target_issue_arg.issue
5481
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005482 # We don't want uncommitted changes mixed up with the patch.
5483 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005484 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005485
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005486 if options.newbranch:
5487 if options.force:
5488 RunGit(['branch', '-D', options.newbranch],
5489 stderr=subprocess2.PIPE, error_ok=True)
5490 RunGit(['new-branch', options.newbranch])
5491
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005492 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005493
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005494 if cl.IsGerrit():
5495 if options.reject:
5496 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005497 if options.directory:
5498 parser.error('--directory is not supported with Gerrit codereview.')
5499
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005500 if detected_codereview_from_url:
5501 print('canonical issue/change URL: %s (type: %s)\n' %
5502 (cl.GetIssueURL(), target_issue_arg.codereview))
5503
5504 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005505 options.nocommit, options.directory,
5506 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005507
5508
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005509def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005510 """Fetches the tree status and returns either 'open', 'closed',
5511 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005512 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005513 if url:
5514 status = urllib2.urlopen(url).read().lower()
5515 if status.find('closed') != -1 or status == '0':
5516 return 'closed'
5517 elif status.find('open') != -1 or status == '1':
5518 return 'open'
5519 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005520 return 'unset'
5521
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005522
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005523def GetTreeStatusReason():
5524 """Fetches the tree status from a json url and returns the message
5525 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005526 url = settings.GetTreeStatusUrl()
5527 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005528 connection = urllib2.urlopen(json_url)
5529 status = json.loads(connection.read())
5530 connection.close()
5531 return status['message']
5532
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005533
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005534def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005535 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005536 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005537 status = GetTreeStatus()
5538 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005539 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005540 return 2
5541
vapiera7fbd5a2016-06-16 09:17:49 -07005542 print('The tree is %s' % status)
5543 print()
5544 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005545 if status != 'open':
5546 return 1
5547 return 0
5548
5549
maruel@chromium.org15192402012-09-06 12:38:29 +00005550def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005551 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005552 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005553 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005554 '-b', '--bot', action='append',
5555 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5556 'times to specify multiple builders. ex: '
5557 '"-b win_rel -b win_layout". See '
5558 'the try server waterfall for the builders name and the tests '
5559 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005560 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005561 '-B', '--bucket', default='',
5562 help=('Buildbucket bucket to send the try requests.'))
5563 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005564 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005565 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005566 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005567 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005568 help='Revision to use for the try job; default: the revision will '
5569 'be determined by the try recipe that builder runs, which usually '
5570 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005571 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005572 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005573 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005574 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005575 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005576 '--project',
5577 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005578 'in recipe to determine to which repository or directory to '
5579 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005580 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005581 '-p', '--property', dest='properties', action='append', default=[],
5582 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005583 'key2=value2 etc. The value will be treated as '
5584 'json if decodable, or as string otherwise. '
5585 'NOTE: using this may make your try job not usable for CQ, '
5586 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005587 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005588 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5589 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005590 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005591 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005592 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005593 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005594
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005595 if options.master and options.master.startswith('luci.'):
5596 parser.error(
5597 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005598 # Make sure that all properties are prop=value pairs.
5599 bad_params = [x for x in options.properties if '=' not in x]
5600 if bad_params:
5601 parser.error('Got properties with missing "=": %s' % bad_params)
5602
maruel@chromium.org15192402012-09-06 12:38:29 +00005603 if args:
5604 parser.error('Unknown arguments: %s' % args)
5605
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005606 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005607 if not cl.GetIssue():
5608 parser.error('Need to upload first')
5609
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005610 if cl.IsGerrit():
5611 # HACK: warm up Gerrit change detail cache to save on RPCs.
5612 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5613
tandriie113dfd2016-10-11 10:20:12 -07005614 error_message = cl.CannotTriggerTryJobReason()
5615 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005616 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005617
borenet6c0efe62016-10-19 08:13:29 -07005618 if options.bucket and options.master:
5619 parser.error('Only one of --bucket and --master may be used.')
5620
qyearsley1fdfcb62016-10-24 13:22:03 -07005621 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005622
qyearsleydd49f942016-10-28 11:57:22 -07005623 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5624 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005625 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005626 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005627 print('git cl try with no bots now defaults to CQ dry run.')
5628 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5629 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005630
borenet6c0efe62016-10-19 08:13:29 -07005631 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005632 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005633 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005634 'of bot requires an initial job from a parent (usually a builder). '
5635 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005636 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005637 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005638
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005639 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005640 # TODO(tandrii): Checking local patchset against remote patchset is only
5641 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5642 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005643 print('Warning: Codereview server has newer patchsets (%s) than most '
5644 'recent upload from local checkout (%s). Did a previous upload '
5645 'fail?\n'
5646 'By default, git cl try uses the latest patchset from '
5647 'codereview, continuing to use patchset %s.\n' %
5648 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005649
tandrii568043b2016-10-11 07:49:18 -07005650 try:
borenet6c0efe62016-10-19 08:13:29 -07005651 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5652 patchset)
tandrii568043b2016-10-11 07:49:18 -07005653 except BuildbucketResponseException as ex:
5654 print('ERROR: %s' % ex)
5655 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005656 return 0
5657
5658
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005659def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005660 """Prints info about try jobs associated with current CL."""
5661 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005662 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005663 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005664 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005665 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005666 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005667 '--color', action='store_true', default=setup_color.IS_TTY,
5668 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005669 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005670 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5671 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005672 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005673 '--json', help=('Path of JSON output file to write try job results to,'
5674 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005675 parser.add_option_group(group)
5676 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005677 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005678 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005679 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005680 if args:
5681 parser.error('Unrecognized args: %s' % ' '.join(args))
5682
5683 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005684 cl = Changelist(
5685 issue=options.issue, codereview=options.forced_codereview,
5686 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005687 if not cl.GetIssue():
5688 parser.error('Need to upload first')
5689
tandrii221ab252016-10-06 08:12:04 -07005690 patchset = options.patchset
5691 if not patchset:
5692 patchset = cl.GetMostRecentPatchset()
5693 if not patchset:
5694 parser.error('Codereview doesn\'t know about issue %s. '
5695 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005696 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005697 cl.GetIssue())
5698
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005699 # TODO(tandrii): Checking local patchset against remote patchset is only
5700 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5701 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005702 print('Warning: Codereview server has newer patchsets (%s) than most '
5703 'recent upload from local checkout (%s). Did a previous upload '
5704 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005705 'By default, git cl try-results uses the latest patchset from '
5706 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005707 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005708 try:
tandrii221ab252016-10-06 08:12:04 -07005709 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005710 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005711 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005712 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005713 if options.json:
5714 write_try_results_json(options.json, jobs)
5715 else:
5716 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005717 return 0
5718
5719
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005720@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005721def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005722 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005723 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005724 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005725 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005726
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005727 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005728 if args:
5729 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005730 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005731 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005732 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005733 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005734
5735 # Clear configured merge-base, if there is one.
5736 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005737 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005738 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005739 return 0
5740
5741
thestig@chromium.org00858c82013-12-02 23:08:03 +00005742def CMDweb(parser, args):
5743 """Opens the current CL in the web browser."""
5744 _, args = parser.parse_args(args)
5745 if args:
5746 parser.error('Unrecognized args: %s' % ' '.join(args))
5747
5748 issue_url = Changelist().GetIssueURL()
5749 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005750 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005751 return 1
5752
5753 webbrowser.open(issue_url)
5754 return 0
5755
5756
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005757def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005758 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005759 parser.add_option('-d', '--dry-run', action='store_true',
5760 help='trigger in dry run mode')
5761 parser.add_option('-c', '--clear', action='store_true',
5762 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005763 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005764 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005765 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005766 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005767 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005768 if args:
5769 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005770 if options.dry_run and options.clear:
5771 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5772
iannuccie53c9352016-08-17 14:40:40 -07005773 cl = Changelist(auth_config=auth_config, issue=options.issue,
5774 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005775 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005776 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005777 elif options.dry_run:
5778 state = _CQState.DRY_RUN
5779 else:
5780 state = _CQState.COMMIT
5781 if not cl.GetIssue():
5782 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005783 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005784 return 0
5785
5786
groby@chromium.org411034a2013-02-26 15:12:01 +00005787def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005788 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005789 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005790 auth.add_auth_options(parser)
5791 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005792 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005793 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005794 if args:
5795 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005796 cl = Changelist(auth_config=auth_config, issue=options.issue,
5797 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005798 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005799 if not cl.GetIssue():
5800 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005801 cl.CloseIssue()
5802 return 0
5803
5804
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005805def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005806 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005807 parser.add_option(
5808 '--stat',
5809 action='store_true',
5810 dest='stat',
5811 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005812 auth.add_auth_options(parser)
5813 options, args = parser.parse_args(args)
5814 auth_config = auth.extract_auth_config_from_options(options)
5815 if args:
5816 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005817
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005818 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005819 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005820 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005821 if not issue:
5822 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005823
Aaron Gablea718c3e2017-08-28 17:47:28 -07005824 base = cl._GitGetBranchConfigValue('last-upload-hash')
5825 if not base:
5826 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5827 if not base:
5828 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5829 revision_info = detail['revisions'][detail['current_revision']]
5830 fetch_info = revision_info['fetch']['http']
5831 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5832 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005833
Aaron Gablea718c3e2017-08-28 17:47:28 -07005834 cmd = ['git', 'diff']
5835 if options.stat:
5836 cmd.append('--stat')
5837 cmd.append(base)
5838 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005839
5840 return 0
5841
5842
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005843def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005844 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005845 parser.add_option(
5846 '--no-color',
5847 action='store_true',
5848 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005849 parser.add_option(
5850 '--batch',
5851 action='store_true',
5852 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005853 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005854 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005855 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005856
5857 author = RunGit(['config', 'user.email']).strip() or None
5858
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005859 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005860
5861 if args:
5862 if len(args) > 1:
5863 parser.error('Unknown args')
5864 base_branch = args[0]
5865 else:
5866 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005867 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005868
5869 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005870 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5871
5872 if options.batch:
5873 db = owners.Database(change.RepositoryRoot(), file, os.path)
5874 print('\n'.join(db.reviewers_for(affected_files, author)))
5875 return 0
5876
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005877 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005878 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005879 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005880 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005881 disable_color=options.no_color,
5882 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005883
5884
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005885def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005886 """Generates a diff command."""
5887 # Generate diff for the current branch's changes.
5888 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005889 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005890
5891 if args:
5892 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005893 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005894 diff_cmd.append(arg)
5895 else:
5896 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005897
5898 return diff_cmd
5899
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005900
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005901def MatchingFileType(file_name, extensions):
5902 """Returns true if the file name ends with one of the given extensions."""
5903 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005904
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005905
enne@chromium.org555cfe42014-01-29 18:21:39 +00005906@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005907def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005908 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005909 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005910 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005911 parser.add_option('--full', action='store_true',
5912 help='Reformat the full content of all touched files')
5913 parser.add_option('--dry-run', action='store_true',
5914 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005915 parser.add_option('--python', action='store_true',
5916 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005917 parser.add_option('--js', action='store_true',
5918 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005919 parser.add_option('--diff', action='store_true',
5920 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005921 parser.add_option('--presubmit', action='store_true',
5922 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005923 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005924
Daniel Chengc55eecf2016-12-30 03:11:02 -08005925 # Normalize any remaining args against the current path, so paths relative to
5926 # the current directory are still resolved as expected.
5927 args = [os.path.join(os.getcwd(), arg) for arg in args]
5928
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005929 # git diff generates paths against the root of the repository. Change
5930 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005931 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005932 if rel_base_path:
5933 os.chdir(rel_base_path)
5934
digit@chromium.org29e47272013-05-17 17:01:46 +00005935 # Grab the merge-base commit, i.e. the upstream commit of the current
5936 # branch when it was created or the last time it was rebased. This is
5937 # to cover the case where the user may have called "git fetch origin",
5938 # moving the origin branch to a newer commit, but hasn't rebased yet.
5939 upstream_commit = None
5940 cl = Changelist()
5941 upstream_branch = cl.GetUpstreamBranch()
5942 if upstream_branch:
5943 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5944 upstream_commit = upstream_commit.strip()
5945
5946 if not upstream_commit:
5947 DieWithError('Could not find base commit for this branch. '
5948 'Are you in detached state?')
5949
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005950 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5951 diff_output = RunGit(changed_files_cmd)
5952 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005953 # Filter out files deleted by this CL
5954 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005955
Christopher Lamc5ba6922017-01-24 11:19:14 +11005956 if opts.js:
5957 CLANG_EXTS.append('.js')
5958
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005959 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5960 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5961 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005962 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005963
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005964 top_dir = os.path.normpath(
5965 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5966
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005967 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5968 # formatted. This is used to block during the presubmit.
5969 return_value = 0
5970
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005971 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005972 # Locate the clang-format binary in the checkout
5973 try:
5974 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005975 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005976 DieWithError(e)
5977
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005978 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005979 cmd = [clang_format_tool]
5980 if not opts.dry_run and not opts.diff:
5981 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005982 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005983 if opts.diff:
5984 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005985 else:
5986 env = os.environ.copy()
5987 env['PATH'] = str(os.path.dirname(clang_format_tool))
5988 try:
5989 script = clang_format.FindClangFormatScriptInChromiumTree(
5990 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005991 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005992 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005993
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005994 cmd = [sys.executable, script, '-p0']
5995 if not opts.dry_run and not opts.diff:
5996 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005997
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005998 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5999 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006000
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006001 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
6002 if opts.diff:
6003 sys.stdout.write(stdout)
6004 if opts.dry_run and len(stdout) > 0:
6005 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006006
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006007 # Similar code to above, but using yapf on .py files rather than clang-format
6008 # on C/C++ files
6009 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006010 yapf_tool = gclient_utils.FindExecutable('yapf')
6011 if yapf_tool is None:
6012 DieWithError('yapf not found in PATH')
6013
6014 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006015 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006016 cmd = [yapf_tool]
6017 if not opts.dry_run and not opts.diff:
6018 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006019 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006020 if opts.diff:
6021 sys.stdout.write(stdout)
6022 else:
6023 # TODO(sbc): yapf --lines mode still has some issues.
6024 # https://github.com/google/yapf/issues/154
6025 DieWithError('--python currently only works with --full')
6026
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006027 # Dart's formatter does not have the nice property of only operating on
6028 # modified chunks, so hard code full.
6029 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006030 try:
6031 command = [dart_format.FindDartFmtToolInChromiumTree()]
6032 if not opts.dry_run and not opts.diff:
6033 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006034 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006035
ppi@chromium.org6593d932016-03-03 15:41:15 +00006036 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006037 if opts.dry_run and stdout:
6038 return_value = 2
6039 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07006040 print('Warning: Unable to check Dart code formatting. Dart SDK not '
6041 'found in this checkout. Files in other languages are still '
6042 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006043
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006044 # Format GN build files. Always run on full build files for canonical form.
6045 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006046 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006047 if opts.dry_run or opts.diff:
6048 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006049 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006050 gn_ret = subprocess2.call(cmd + [gn_diff_file],
6051 shell=sys.platform == 'win32',
6052 cwd=top_dir)
6053 if opts.dry_run and gn_ret == 2:
6054 return_value = 2 # Not formatted.
6055 elif opts.diff and gn_ret == 2:
6056 # TODO this should compute and print the actual diff.
6057 print("This change has GN build file diff for " + gn_diff_file)
6058 elif gn_ret != 0:
6059 # For non-dry run cases (and non-2 return values for dry-run), a
6060 # nonzero error code indicates a failure, probably because the file
6061 # doesn't parse.
6062 DieWithError("gn format failed on " + gn_diff_file +
6063 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006064
Ilya Shermane081cbe2017-08-15 17:51:04 -07006065 # Skip the metrics formatting from the global presubmit hook. These files have
6066 # a separate presubmit hook that issues an error if the files need formatting,
6067 # whereas the top-level presubmit script merely issues a warning. Formatting
6068 # these files is somewhat slow, so it's important not to duplicate the work.
6069 if not opts.presubmit:
6070 for xml_dir in GetDirtyMetricsDirs(diff_files):
6071 tool_dir = os.path.join(top_dir, xml_dir)
6072 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
6073 if opts.dry_run or opts.diff:
6074 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006075 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006076 if opts.diff:
6077 sys.stdout.write(stdout)
6078 if opts.dry_run and stdout:
6079 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006080
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006081 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006082
Steven Holte2e664bf2017-04-21 13:10:47 -07006083def GetDirtyMetricsDirs(diff_files):
6084 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6085 metrics_xml_dirs = [
6086 os.path.join('tools', 'metrics', 'actions'),
6087 os.path.join('tools', 'metrics', 'histograms'),
6088 os.path.join('tools', 'metrics', 'rappor'),
6089 os.path.join('tools', 'metrics', 'ukm')]
6090 for xml_dir in metrics_xml_dirs:
6091 if any(file.startswith(xml_dir) for file in xml_diff_files):
6092 yield xml_dir
6093
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006094
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006095@subcommand.usage('<codereview url or issue id>')
6096def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006097 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006098 _, args = parser.parse_args(args)
6099
6100 if len(args) != 1:
6101 parser.print_help()
6102 return 1
6103
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006104 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006105 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006106 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006107
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006108 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006109
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006110 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006111 output = RunGit(['config', '--local', '--get-regexp',
6112 r'branch\..*\.%s' % issueprefix],
6113 error_ok=True)
6114 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006115 if issue == target_issue:
6116 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006117
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006118 branches = []
6119 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006120 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006121 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006122 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006123 return 1
6124 if len(branches) == 1:
6125 RunGit(['checkout', branches[0]])
6126 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006127 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006128 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006129 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006130 which = raw_input('Choose by index: ')
6131 try:
6132 RunGit(['checkout', branches[int(which)]])
6133 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006134 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006135 return 1
6136
6137 return 0
6138
6139
maruel@chromium.org29404b52014-09-08 22:58:00 +00006140def CMDlol(parser, args):
6141 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006142 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006143 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6144 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6145 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006146 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006147 return 0
6148
6149
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006150class OptionParser(optparse.OptionParser):
6151 """Creates the option parse and add --verbose support."""
6152 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006153 optparse.OptionParser.__init__(
6154 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006155 self.add_option(
6156 '-v', '--verbose', action='count', default=0,
6157 help='Use 2 times for more debugging info')
6158
6159 def parse_args(self, args=None, values=None):
6160 options, args = optparse.OptionParser.parse_args(self, args, values)
6161 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006162 logging.basicConfig(
6163 level=levels[min(options.verbose, len(levels) - 1)],
6164 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6165 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006166 return options, args
6167
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006168
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006169def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006170 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006171 print('\nYour python version %s is unsupported, please upgrade.\n' %
6172 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006173 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006174
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006175 # Reload settings.
6176 global settings
6177 settings = Settings()
6178
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006179 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006180 dispatcher = subcommand.CommandDispatcher(__name__)
6181 try:
6182 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006183 except auth.AuthenticationError as e:
6184 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006185 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006186 if e.code != 500:
6187 raise
6188 DieWithError(
6189 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6190 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006191 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006192
6193
6194if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006195 # These affect sys.stdout so do it outside of main() to simplify mocks in
6196 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006197 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006198 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006199 try:
6200 sys.exit(main(sys.argv[1:]))
6201 except KeyboardInterrupt:
6202 sys.stderr.write('interrupted\n')
6203 sys.exit(1)