blob: 123852f0961a58e5c6ecd85ba447c86f7bde6d2d [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):
719 return {
720 'buildbucket_id': build.get('id'),
721 'status': build.get('status'),
722 'result': build.get('result'),
723 'bucket': build.get('bucket'),
724 'builder_name': json.loads(
725 build.get('parameters_json', '{}')).get('builder_name'),
726 'failure_reason': build.get('failure_reason'),
727 'url': build.get('url'),
728 }
729
730 converted = []
731 for _, build in sorted(builds.items()):
732 converted.append(convert_build_dict(build))
733 write_json(output_file, converted)
734
735
iannucci@chromium.org79540052012-10-19 23:15:26 +0000736def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000737 """Prints statistics about the change to the user."""
738 # --no-ext-diff is broken in some versions of Git, so try to work around
739 # this by overriding the environment (but there is still a problem if the
740 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000741 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000742 if 'GIT_EXTERNAL_DIFF' in env:
743 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000744
745 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800746 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000747 else:
748 similarity_options = ['-M%s' % similarity]
749
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000750 try:
751 stdout = sys.stdout.fileno()
752 except AttributeError:
753 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000756 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000757 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758
759
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000760class BuildbucketResponseException(Exception):
761 pass
762
763
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764class Settings(object):
765 def __init__(self):
766 self.default_server = None
767 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000768 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 self.tree_status_url = None
770 self.viewvc_url = None
771 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000772 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000773 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000774 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000775 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000776 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000777 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778
779 def LazyUpdateIfNeeded(self):
780 """Updates the settings from a codereview.settings file, if available."""
781 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782 # The only value that actually changes the behavior is
783 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000784 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000785 error_ok=True
786 ).strip().lower()
787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000789 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790 LoadCodereviewSettingsFromFile(cr_settings_file)
791 self.updated = True
792
793 def GetDefaultServerUrl(self, error_ok=False):
794 if not self.default_server:
795 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000796 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000797 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798 if error_ok:
799 return self.default_server
800 if not self.default_server:
801 error_message = ('Could not find settings file. You must configure '
802 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000803 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000804 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 return self.default_server
806
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000807 @staticmethod
808 def GetRelativeRoot():
809 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000810
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000812 if self.root is None:
813 self.root = os.path.abspath(self.GetRelativeRoot())
814 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000816 def GetGitMirror(self, remote='origin'):
817 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000818 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000819 if not os.path.isdir(local_url):
820 return None
821 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
822 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100823 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100824 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000825 if mirror.exists():
826 return mirror
827 return None
828
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000829 def GetTreeStatusUrl(self, error_ok=False):
830 if not self.tree_status_url:
831 error_message = ('You must configure your tree status URL by running '
832 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000833 self.tree_status_url = self._GetRietveldConfig(
834 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 return self.tree_status_url
836
837 def GetViewVCUrl(self):
838 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000839 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840 return self.viewvc_url
841
rmistry@google.com90752582014-01-14 21:04:50 +0000842 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000843 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000844
rmistry@google.com78948ed2015-07-08 23:09:57 +0000845 def GetIsSkipDependencyUpload(self, branch_name):
846 """Returns true if specified branch should skip dep uploads."""
847 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
848 error_ok=True)
849
rmistry@google.com5626a922015-02-26 14:03:30 +0000850 def GetRunPostUploadHook(self):
851 run_post_upload_hook = self._GetRietveldConfig(
852 'run-post-upload-hook', error_ok=True)
853 return run_post_upload_hook == "True"
854
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000855 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000856 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000857
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000858 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000859 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000860
ukai@chromium.orge8077812012-02-03 03:41:46 +0000861 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700862 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000863 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700864 self.is_gerrit = (
865 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000866 return self.is_gerrit
867
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000868 def GetSquashGerritUploads(self):
869 """Return true if uploads to Gerrit should be squashed by default."""
870 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700871 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
872 if self.squash_gerrit_uploads is None:
873 # Default is squash now (http://crbug.com/611892#c23).
874 self.squash_gerrit_uploads = not (
875 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
876 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000877 return self.squash_gerrit_uploads
878
tandriia60502f2016-06-20 02:01:53 -0700879 def GetSquashGerritUploadsOverride(self):
880 """Return True or False if codereview.settings should be overridden.
881
882 Returns None if no override has been defined.
883 """
884 # See also http://crbug.com/611892#c23
885 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
886 error_ok=True).strip()
887 if result == 'true':
888 return True
889 if result == 'false':
890 return False
891 return None
892
tandrii@chromium.org28253532016-04-14 13:46:56 +0000893 def GetGerritSkipEnsureAuthenticated(self):
894 """Return True if EnsureAuthenticated should not be done for Gerrit
895 uploads."""
896 if self.gerrit_skip_ensure_authenticated is None:
897 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000898 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000899 error_ok=True).strip() == 'true')
900 return self.gerrit_skip_ensure_authenticated
901
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000902 def GetGitEditor(self):
903 """Return the editor specified in the git config, or None if none is."""
904 if self.git_editor is None:
905 self.git_editor = self._GetConfig('core.editor', error_ok=True)
906 return self.git_editor or None
907
thestig@chromium.org44202a22014-03-11 19:22:18 +0000908 def GetLintRegex(self):
909 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
910 DEFAULT_LINT_REGEX)
911
912 def GetLintIgnoreRegex(self):
913 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
914 DEFAULT_LINT_IGNORE_REGEX)
915
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000916 def GetProject(self):
917 if not self.project:
918 self.project = self._GetRietveldConfig('project', error_ok=True)
919 return self.project
920
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000921 def _GetRietveldConfig(self, param, **kwargs):
922 return self._GetConfig('rietveld.' + param, **kwargs)
923
rmistry@google.com78948ed2015-07-08 23:09:57 +0000924 def _GetBranchConfig(self, branch_name, param, **kwargs):
925 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
926
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000927 def _GetConfig(self, param, **kwargs):
928 self.LazyUpdateIfNeeded()
929 return RunGit(['config', param], **kwargs).strip()
930
931
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100932@contextlib.contextmanager
933def _get_gerrit_project_config_file(remote_url):
934 """Context manager to fetch and store Gerrit's project.config from
935 refs/meta/config branch and store it in temp file.
936
937 Provides a temporary filename or None if there was error.
938 """
939 error, _ = RunGitWithCode([
940 'fetch', remote_url,
941 '+refs/meta/config:refs/git_cl/meta/config'])
942 if error:
943 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700944 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100945 (remote_url, error))
946 yield None
947 return
948
949 error, project_config_data = RunGitWithCode(
950 ['show', 'refs/git_cl/meta/config:project.config'])
951 if error:
952 print('WARNING: project.config file not found')
953 yield None
954 return
955
956 with gclient_utils.temporary_directory() as tempdir:
957 project_config_file = os.path.join(tempdir, 'project.config')
958 gclient_utils.FileWrite(project_config_file, project_config_data)
959 yield project_config_file
960
961
962def _is_git_numberer_enabled(remote_url, remote_ref):
963 """Returns True if Git Numberer is enabled on this ref."""
964 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100965 KNOWN_PROJECTS_WHITELIST = [
966 'chromium/src',
967 'external/webrtc',
968 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100969 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200970 # For webrtc.googlesource.com/src.
971 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100972 ]
973
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100974 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
975 url_parts = urlparse.urlparse(remote_url)
976 project_name = url_parts.path.lstrip('/').rstrip('git./')
977 for known in KNOWN_PROJECTS_WHITELIST:
978 if project_name.endswith(known):
979 break
980 else:
981 # Early exit to avoid extra fetches for repos that aren't using Git
982 # Numberer.
983 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100984
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100985 with _get_gerrit_project_config_file(remote_url) as project_config_file:
986 if project_config_file is None:
987 # Failed to fetch project.config, which shouldn't happen on open source
988 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100989 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100990 def get_opts(x):
991 code, out = RunGitWithCode(
992 ['config', '-f', project_config_file, '--get-all',
993 'plugin.git-numberer.validate-%s-refglob' % x])
994 if code == 0:
995 return out.strip().splitlines()
996 return []
997 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100998
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100999 logging.info('validator config enabled %s disabled %s refglobs for '
1000 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001001
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001002 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001003 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001005 return True
1006 return False
1007
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001008 if match_refglobs(disabled):
1009 return False
1010 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001011
1012
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013def ShortBranchName(branch):
1014 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001015 return branch.replace('refs/heads/', '', 1)
1016
1017
1018def GetCurrentBranchRef():
1019 """Returns branch ref (e.g., refs/heads/master) or None."""
1020 return RunGit(['symbolic-ref', 'HEAD'],
1021 stderr=subprocess2.VOID, error_ok=True).strip() or None
1022
1023
1024def GetCurrentBranch():
1025 """Returns current branch or None.
1026
1027 For refs/heads/* branches, returns just last part. For others, full ref.
1028 """
1029 branchref = GetCurrentBranchRef()
1030 if branchref:
1031 return ShortBranchName(branchref)
1032 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033
1034
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001035class _CQState(object):
1036 """Enum for states of CL with respect to Commit Queue."""
1037 NONE = 'none'
1038 DRY_RUN = 'dry_run'
1039 COMMIT = 'commit'
1040
1041 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1042
1043
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001044class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001046 self.issue = issue
1047 self.patchset = patchset
1048 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001049 assert codereview in (None, 'rietveld', 'gerrit')
1050 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051
1052 @property
1053 def valid(self):
1054 return self.issue is not None
1055
1056
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001057def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001058 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1059 fail_result = _ParsedIssueNumberArgument()
1060
1061 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001062 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001063 if not arg.startswith('http'):
1064 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001065
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001066 url = gclient_utils.UpgradeToHttps(arg)
1067 try:
1068 parsed_url = urlparse.urlparse(url)
1069 except ValueError:
1070 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001071
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001072 if codereview is not None:
1073 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1074 return parsed or fail_result
1075
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001076 results = {}
1077 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1078 parsed = cls.ParseIssueURL(parsed_url)
1079 if parsed is not None:
1080 results[name] = parsed
1081
1082 if not results:
1083 return fail_result
1084 if len(results) == 1:
1085 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001086
1087 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1088 # This is likely Gerrit.
1089 return results['gerrit']
1090 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001091 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001092
1093
Aaron Gablea45ee112016-11-22 15:14:38 -08001094class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001095 def __init__(self, issue, url):
1096 self.issue = issue
1097 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001098 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001099
1100 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001101 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001102 self.issue, self.url)
1103
1104
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001105_CommentSummary = collections.namedtuple(
1106 '_CommentSummary', ['date', 'message', 'sender',
1107 # TODO(tandrii): these two aren't known in Gerrit.
1108 'approval', 'disapproval'])
1109
1110
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001112 """Changelist works with one changelist in local branch.
1113
1114 Supports two codereview backends: Rietveld or Gerrit, selected at object
1115 creation.
1116
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001117 Notes:
1118 * Not safe for concurrent multi-{thread,process} use.
1119 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001120 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001121 """
1122
1123 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1124 """Create a new ChangeList instance.
1125
1126 If issue is given, the codereview must be given too.
1127
1128 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1129 Otherwise, it's decided based on current configuration of the local branch,
1130 with default being 'rietveld' for backwards compatibility.
1131 See _load_codereview_impl for more details.
1132
1133 **kwargs will be passed directly to codereview implementation.
1134 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001136 global settings
1137 if not settings:
1138 # Happens when git_cl.py is used as a utility library.
1139 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140
1141 if issue:
1142 assert codereview, 'codereview must be known, if issue is known'
1143
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.branchref = branchref
1145 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001146 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.branch = ShortBranchName(self.branchref)
1148 else:
1149 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001151 self.lookedup_issue = False
1152 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.has_description = False
1154 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001155 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001157 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001158 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001159 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001160
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001162 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001163 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001164 assert self._codereview_impl
1165 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001166
1167 def _load_codereview_impl(self, codereview=None, **kwargs):
1168 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001169 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1170 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1171 self._codereview = codereview
1172 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001173 return
1174
1175 # Automatic selection based on issue number set for a current branch.
1176 # Rietveld takes precedence over Gerrit.
1177 assert not self.issue
1178 # Whether we find issue or not, we are doing the lookup.
1179 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001180 if self.GetBranch():
1181 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1182 issue = _git_get_branch_config_value(
1183 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1184 if issue:
1185 self._codereview = codereview
1186 self._codereview_impl = cls(self, **kwargs)
1187 self.issue = int(issue)
1188 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001189
1190 # No issue is set for this branch, so decide based on repo-wide settings.
1191 return self._load_codereview_impl(
1192 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1193 **kwargs)
1194
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001195 def IsGerrit(self):
1196 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197
1198 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001199 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001201 The return value is a string suitable for passing to git cl with the --cc
1202 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001203 """
1204 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001205 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001206 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001207 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1208 return self.cc
1209
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001210 def GetCCListWithoutDefault(self):
1211 """Return the users cc'd on this CL excluding default ones."""
1212 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001213 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001214 return self.cc
1215
Daniel Cheng7227d212017-11-17 08:12:37 -08001216 def ExtendCC(self, more_cc):
1217 """Extends the list of users to cc on this CL based on the changed files."""
1218 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001219
1220 def GetBranch(self):
1221 """Returns the short branch name, e.g. 'master'."""
1222 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001223 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001224 if not branchref:
1225 return None
1226 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227 self.branch = ShortBranchName(self.branchref)
1228 return self.branch
1229
1230 def GetBranchRef(self):
1231 """Returns the full branch name, e.g. 'refs/heads/master'."""
1232 self.GetBranch() # Poke the lazy loader.
1233 return self.branchref
1234
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001235 def ClearBranch(self):
1236 """Clears cached branch data of this object."""
1237 self.branch = self.branchref = None
1238
tandrii5d48c322016-08-18 16:19:37 -07001239 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1240 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1241 kwargs['branch'] = self.GetBranch()
1242 return _git_get_branch_config_value(key, default, **kwargs)
1243
1244 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1245 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1246 assert self.GetBranch(), (
1247 'this CL must have an associated branch to %sset %s%s' %
1248 ('un' if value is None else '',
1249 key,
1250 '' if value is None else ' to %r' % value))
1251 kwargs['branch'] = self.GetBranch()
1252 return _git_set_branch_config_value(key, value, **kwargs)
1253
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001254 @staticmethod
1255 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001256 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 e.g. 'origin', 'refs/heads/master'
1258 """
1259 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001260 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1261
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001263 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001265 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1266 error_ok=True).strip()
1267 if upstream_branch:
1268 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001270 # Else, try to guess the origin remote.
1271 remote_branches = RunGit(['branch', '-r']).split()
1272 if 'origin/master' in remote_branches:
1273 # Fall back on origin/master if it exits.
1274 remote = 'origin'
1275 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001276 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001277 DieWithError(
1278 'Unable to determine default branch to diff against.\n'
1279 'Either pass complete "git diff"-style arguments, like\n'
1280 ' git cl upload origin/master\n'
1281 'or verify this branch is set up to track another \n'
1282 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283
1284 return remote, upstream_branch
1285
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001286 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001287 upstream_branch = self.GetUpstreamBranch()
1288 if not BranchExists(upstream_branch):
1289 DieWithError('The upstream for the current branch (%s) does not exist '
1290 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001291 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001292 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001293
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001294 def GetUpstreamBranch(self):
1295 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001298 upstream_branch = upstream_branch.replace('refs/heads/',
1299 'refs/remotes/%s/' % remote)
1300 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1301 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 self.upstream_branch = upstream_branch
1303 return self.upstream_branch
1304
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001305 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001306 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001307 remote, branch = None, self.GetBranch()
1308 seen_branches = set()
1309 while branch not in seen_branches:
1310 seen_branches.add(branch)
1311 remote, branch = self.FetchUpstreamTuple(branch)
1312 branch = ShortBranchName(branch)
1313 if remote != '.' or branch.startswith('refs/remotes'):
1314 break
1315 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001316 remotes = RunGit(['remote'], error_ok=True).split()
1317 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001318 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001319 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001320 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001321 logging.warn('Could not determine which remote this change is '
1322 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001323 else:
1324 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001325 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001326 branch = 'HEAD'
1327 if branch.startswith('refs/remotes'):
1328 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001329 elif branch.startswith('refs/branch-heads/'):
1330 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001331 else:
1332 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001333 return self._remote
1334
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001335 def GitSanityChecks(self, upstream_git_obj):
1336 """Checks git repo status and ensures diff is from local commits."""
1337
sbc@chromium.org79706062015-01-14 21:18:12 +00001338 if upstream_git_obj is None:
1339 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001340 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001341 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001342 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001343 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001344 return False
1345
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001346 # Verify the commit we're diffing against is in our current branch.
1347 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1348 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1349 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001350 print('ERROR: %s is not in the current branch. You may need to rebase '
1351 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001352 return False
1353
1354 # List the commits inside the diff, and verify they are all local.
1355 commits_in_diff = RunGit(
1356 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1357 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1358 remote_branch = remote_branch.strip()
1359 if code != 0:
1360 _, remote_branch = self.GetRemoteBranch()
1361
1362 commits_in_remote = RunGit(
1363 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1364
1365 common_commits = set(commits_in_diff) & set(commits_in_remote)
1366 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001367 print('ERROR: Your diff contains %d commits already in %s.\n'
1368 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1369 'the diff. If you are using a custom git flow, you can override'
1370 ' the reference used for this check with "git config '
1371 'gitcl.remotebranch <git-ref>".' % (
1372 len(common_commits), remote_branch, upstream_git_obj),
1373 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001374 return False
1375 return True
1376
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001377 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001378 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001379
1380 Returns None if it is not set.
1381 """
tandrii5d48c322016-08-18 16:19:37 -07001382 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001383
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001384 def GetRemoteUrl(self):
1385 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1386
1387 Returns None if there is no remote.
1388 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001389 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001390 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1391
1392 # If URL is pointing to a local directory, it is probably a git cache.
1393 if os.path.isdir(url):
1394 url = RunGit(['config', 'remote.%s.url' % remote],
1395 error_ok=True,
1396 cwd=url).strip()
1397 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001398
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001399 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001400 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001401 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001402 self.issue = self._GitGetBranchConfigValue(
1403 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001404 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001405 return self.issue
1406
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407 def GetIssueURL(self):
1408 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001409 issue = self.GetIssue()
1410 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001411 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001412 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001414 def GetDescription(self, pretty=False, force=False):
1415 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001417 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 self.has_description = True
1419 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001420 # Set width to 72 columns + 2 space indent.
1421 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001423 lines = self.description.splitlines()
1424 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 return self.description
1426
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001427 def GetDescriptionFooters(self):
1428 """Returns (non_footer_lines, footers) for the commit message.
1429
1430 Returns:
1431 non_footer_lines (list(str)) - Simple list of description lines without
1432 any footer. The lines do not contain newlines, nor does the list contain
1433 the empty line between the message and the footers.
1434 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1435 [("Change-Id", "Ideadbeef...."), ...]
1436 """
1437 raw_description = self.GetDescription()
1438 msg_lines, _, footers = git_footers.split_footers(raw_description)
1439 if footers:
1440 msg_lines = msg_lines[:len(msg_lines)-1]
1441 return msg_lines, footers
1442
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001443 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001444 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001445 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001446 self.patchset = self._GitGetBranchConfigValue(
1447 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001448 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001449 return self.patchset
1450
1451 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001452 """Set this branch's patchset. If patchset=0, clears the patchset."""
1453 assert self.GetBranch()
1454 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001455 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001456 else:
1457 self.patchset = int(patchset)
1458 self._GitSetBranchConfigValue(
1459 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001461 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001462 """Set this branch's issue. If issue isn't given, clears the issue."""
1463 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001464 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001465 issue = int(issue)
1466 self._GitSetBranchConfigValue(
1467 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001468 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001469 codereview_server = self._codereview_impl.GetCodereviewServer()
1470 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001471 self._GitSetBranchConfigValue(
1472 self._codereview_impl.CodereviewServerConfigKey(),
1473 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001474 else:
tandrii5d48c322016-08-18 16:19:37 -07001475 # Reset all of these just to be clean.
1476 reset_suffixes = [
1477 'last-upload-hash',
1478 self._codereview_impl.IssueConfigKey(),
1479 self._codereview_impl.PatchsetConfigKey(),
1480 self._codereview_impl.CodereviewServerConfigKey(),
1481 ] + self._PostUnsetIssueProperties()
1482 for prop in reset_suffixes:
1483 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001484 msg = RunGit(['log', '-1', '--format=%B']).strip()
1485 if msg and git_footers.get_footer_change_id(msg):
1486 print('WARNING: The change patched into this branch has a Change-Id. '
1487 'Removing it.')
1488 RunGit(['commit', '--amend', '-m',
1489 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001490 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001491 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001492
dnjba1b0f32016-09-02 12:37:42 -07001493 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001494 if not self.GitSanityChecks(upstream_branch):
1495 DieWithError('\nGit sanity check failure')
1496
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001497 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001498 if not root:
1499 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001500 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001501
1502 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001503 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001504 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001505 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001506 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001507 except subprocess2.CalledProcessError:
1508 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001509 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001510 'This branch probably doesn\'t exist anymore. To reset the\n'
1511 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001512 ' git branch --set-upstream-to origin/master %s\n'
1513 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001514 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001515
maruel@chromium.org52424302012-08-29 15:14:30 +00001516 issue = self.GetIssue()
1517 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001518 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001519 description = self.GetDescription()
1520 else:
1521 # If the change was never uploaded, use the log messages of all commits
1522 # up to the branch point, as git cl upload will prefill the description
1523 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001524 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1525 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001526
1527 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001528 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001529 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001530 name,
1531 description,
1532 absroot,
1533 files,
1534 issue,
1535 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001536 author,
1537 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001538
dsansomee2d6fd92016-09-08 00:10:47 -07001539 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001540 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001541 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001542 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001543
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001544 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1545 """Sets the description for this CL remotely.
1546
1547 You can get description_lines and footers with GetDescriptionFooters.
1548
1549 Args:
1550 description_lines (list(str)) - List of CL description lines without
1551 newline characters.
1552 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1553 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1554 `List-Of-Tokens`). It will be case-normalized so that each token is
1555 title-cased.
1556 """
1557 new_description = '\n'.join(description_lines)
1558 if footers:
1559 new_description += '\n'
1560 for k, v in footers:
1561 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1562 if not git_footers.FOOTER_PATTERN.match(foot):
1563 raise ValueError('Invalid footer %r' % foot)
1564 new_description += foot + '\n'
1565 self.UpdateDescription(new_description, force)
1566
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001567 def RunHook(self, committing, may_prompt, verbose, change):
1568 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1569 try:
1570 return presubmit_support.DoPresubmitChecks(change, committing,
1571 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1572 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001573 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001574 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001575 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001576 DieWithError(
1577 ('%s\nMaybe your depot_tools is out of date?\n'
1578 'If all fails, contact maruel@') % e)
1579
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001580 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1581 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001582 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1583 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001584 else:
1585 # Assume url.
1586 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1587 urlparse.urlparse(issue_arg))
1588 if not parsed_issue_arg or not parsed_issue_arg.valid:
1589 DieWithError('Failed to parse issue argument "%s". '
1590 'Must be an issue number or a valid URL.' % issue_arg)
1591 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001592 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001593
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594 def CMDUpload(self, options, git_diff_args, orig_args):
1595 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001596 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001598 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001599 else:
1600 if self.GetBranch() is None:
1601 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1602
1603 # Default to diffing against common ancestor of upstream branch
1604 base_branch = self.GetCommonAncestorWithUpstream()
1605 git_diff_args = [base_branch, 'HEAD']
1606
Aaron Gablec4c40d12017-05-22 11:49:53 -07001607 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1608 if not self.IsGerrit() and not self.GetIssue():
1609 print('=====================================')
1610 print('NOTICE: Rietveld is being deprecated. '
1611 'You can upload changes to Gerrit with')
1612 print(' git cl upload --gerrit')
1613 print('or set Gerrit to be your default code review tool with')
1614 print(' git config gerrit.host true')
1615 print('=====================================')
1616
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001617 # Fast best-effort checks to abort before running potentially
1618 # expensive hooks if uploading is likely to fail anyway. Passing these
1619 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001620 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001621 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622
1623 # Apply watchlists on upload.
1624 change = self.GetChange(base_branch, None)
1625 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1626 files = [f.LocalPath() for f in change.AffectedFiles()]
1627 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001628 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001629
1630 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001631 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001632 # Set the reviewer list now so that presubmit checks can access it.
1633 change_description = ChangeDescription(change.FullDescriptionText())
1634 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001635 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001636 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001637 change)
1638 change.SetDescriptionText(change_description.description)
1639 hook_results = self.RunHook(committing=False,
1640 may_prompt=not options.force,
1641 verbose=options.verbose,
1642 change=change)
1643 if not hook_results.should_continue():
1644 return 1
1645 if not options.reviewers and hook_results.reviewers:
1646 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001647 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001648
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001649 # TODO(tandrii): Checking local patchset against remote patchset is only
1650 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1651 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652 latest_patchset = self.GetMostRecentPatchset()
1653 local_patchset = self.GetPatchset()
1654 if (latest_patchset and local_patchset and
1655 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001656 print('The last upload made from this repository was patchset #%d but '
1657 'the most recent patchset on the server is #%d.'
1658 % (local_patchset, latest_patchset))
1659 print('Uploading will still work, but if you\'ve uploaded to this '
1660 'issue from another machine or branch the patch you\'re '
1661 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001662 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001663
1664 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001665 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001666 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001667 if options.use_commit_queue:
1668 self.SetCQState(_CQState.COMMIT)
1669 elif options.cq_dry_run:
1670 self.SetCQState(_CQState.DRY_RUN)
1671
tandrii5d48c322016-08-18 16:19:37 -07001672 _git_set_branch_config_value('last-upload-hash',
1673 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001674 # Run post upload hooks, if specified.
1675 if settings.GetRunPostUploadHook():
1676 presubmit_support.DoPostUploadExecuter(
1677 change,
1678 self,
1679 settings.GetRoot(),
1680 options.verbose,
1681 sys.stdout)
1682
1683 # Upload all dependencies if specified.
1684 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001685 print()
1686 print('--dependencies has been specified.')
1687 print('All dependent local branches will be re-uploaded.')
1688 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001689 # Remove the dependencies flag from args so that we do not end up in a
1690 # loop.
1691 orig_args.remove('--dependencies')
1692 ret = upload_branch_deps(self, orig_args)
1693 return ret
1694
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001695 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001696 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001697
1698 Issue must have been already uploaded and known.
1699 """
1700 assert new_state in _CQState.ALL_STATES
1701 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001702 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001703 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001704 return 0
1705 except KeyboardInterrupt:
1706 raise
1707 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001708 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001709 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001710 ' * Your project has no CQ,\n'
1711 ' * You don\'t have permission to change the CQ state,\n'
1712 ' * There\'s a bug in this code (see stack trace below).\n'
1713 'Consider specifying which bots to trigger manually or asking your '
1714 'project owners for permissions or contacting Chrome Infra at:\n'
1715 'https://www.chromium.org/infra\n\n' %
1716 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001717 # Still raise exception so that stack trace is printed.
1718 raise
1719
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 # Forward methods to codereview specific implementation.
1721
Aaron Gable636b13f2017-07-14 10:42:48 -07001722 def AddComment(self, message, publish=None):
1723 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001724
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001726 """Returns list of _CommentSummary for each comment.
1727
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 args:
1729 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001731 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 def CloseIssue(self):
1734 return self._codereview_impl.CloseIssue()
1735
1736 def GetStatus(self):
1737 return self._codereview_impl.GetStatus()
1738
1739 def GetCodereviewServer(self):
1740 return self._codereview_impl.GetCodereviewServer()
1741
tandriide281ae2016-10-12 06:02:30 -07001742 def GetIssueOwner(self):
1743 """Get owner from codereview, which may differ from this checkout."""
1744 return self._codereview_impl.GetIssueOwner()
1745
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001746 def GetMostRecentPatchset(self):
1747 return self._codereview_impl.GetMostRecentPatchset()
1748
tandriide281ae2016-10-12 06:02:30 -07001749 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001750 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001751 return self._codereview_impl.CannotTriggerTryJobReason()
1752
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001753 def GetTryJobProperties(self, patchset=None):
1754 """Returns dictionary of properties to launch try job."""
1755 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001756
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001757 def __getattr__(self, attr):
1758 # This is because lots of untested code accesses Rietveld-specific stuff
1759 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001760 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001761 # Note that child method defines __getattr__ as well, and forwards it here,
1762 # because _RietveldChangelistImpl is not cleaned up yet, and given
1763 # deprecation of Rietveld, it should probably be just removed.
1764 # Until that time, avoid infinite recursion by bypassing __getattr__
1765 # of implementation class.
1766 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001767
1768
1769class _ChangelistCodereviewBase(object):
1770 """Abstract base class encapsulating codereview specifics of a changelist."""
1771 def __init__(self, changelist):
1772 self._changelist = changelist # instance of Changelist
1773
1774 def __getattr__(self, attr):
1775 # Forward methods to changelist.
1776 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1777 # _RietveldChangelistImpl to avoid this hack?
1778 return getattr(self._changelist, attr)
1779
1780 def GetStatus(self):
1781 """Apply a rough heuristic to give a simple summary of an issue's review
1782 or CQ status, assuming adherence to a common workflow.
1783
1784 Returns None if no issue for this branch, or specific string keywords.
1785 """
1786 raise NotImplementedError()
1787
1788 def GetCodereviewServer(self):
1789 """Returns server URL without end slash, like "https://codereview.com"."""
1790 raise NotImplementedError()
1791
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001792 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001793 """Fetches and returns description from the codereview server."""
1794 raise NotImplementedError()
1795
tandrii5d48c322016-08-18 16:19:37 -07001796 @classmethod
1797 def IssueConfigKey(cls):
1798 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001799 raise NotImplementedError()
1800
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001801 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001802 def PatchsetConfigKey(cls):
1803 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001804 raise NotImplementedError()
1805
tandrii5d48c322016-08-18 16:19:37 -07001806 @classmethod
1807 def CodereviewServerConfigKey(cls):
1808 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001809 raise NotImplementedError()
1810
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001811 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001812 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001813 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001814
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001815 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001817 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001818 raise NotImplementedError()
1819
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001820 def GetGerritObjForPresubmit(self):
1821 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1822 return None
1823
dsansomee2d6fd92016-09-08 00:10:47 -07001824 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 """Update the description on codereview site."""
1826 raise NotImplementedError()
1827
Aaron Gable636b13f2017-07-14 10:42:48 -07001828 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001829 """Posts a comment to the codereview site."""
1830 raise NotImplementedError()
1831
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001832 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001833 raise NotImplementedError()
1834
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001835 def CloseIssue(self):
1836 """Closes the issue."""
1837 raise NotImplementedError()
1838
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839 def GetMostRecentPatchset(self):
1840 """Returns the most recent patchset number from the codereview site."""
1841 raise NotImplementedError()
1842
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001844 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001845 """Fetches and applies the issue.
1846
1847 Arguments:
1848 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1849 reject: if True, reject the failed patch instead of switching to 3-way
1850 merge. Rietveld only.
1851 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1852 only.
1853 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001854 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001855 """
1856 raise NotImplementedError()
1857
1858 @staticmethod
1859 def ParseIssueURL(parsed_url):
1860 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1861 failed."""
1862 raise NotImplementedError()
1863
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001864 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001865 """Best effort check that user is authenticated with codereview server.
1866
1867 Arguments:
1868 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001869 refresh: whether to attempt to refresh credentials. Ignored if not
1870 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001871 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001872 raise NotImplementedError()
1873
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001874 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001875 """Best effort check that uploading isn't supposed to fail for predictable
1876 reasons.
1877
1878 This method should raise informative exception if uploading shouldn't
1879 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001880
1881 Arguments:
1882 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001883 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001884 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001885
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001886 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001887 """Uploads a change to codereview."""
1888 raise NotImplementedError()
1889
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001890 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001891 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001892
1893 Issue must have been already uploaded and known.
1894 """
1895 raise NotImplementedError()
1896
tandriie113dfd2016-10-11 10:20:12 -07001897 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001898 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001899 raise NotImplementedError()
1900
tandriide281ae2016-10-12 06:02:30 -07001901 def GetIssueOwner(self):
1902 raise NotImplementedError()
1903
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001904 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001905 raise NotImplementedError()
1906
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001907
1908class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001909
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 super(_RietveldChangelistImpl, self).__init__(changelist)
1912 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001913 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001914 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001916 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001917 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918 self._props = None
1919 self._rpc_server = None
1920
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 def GetCodereviewServer(self):
1922 if not self._rietveld_server:
1923 # If we're on a branch then get the server potentially associated
1924 # with that branch.
1925 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001926 self._rietveld_server = gclient_utils.UpgradeToHttps(
1927 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001928 if not self._rietveld_server:
1929 self._rietveld_server = settings.GetDefaultServerUrl()
1930 return self._rietveld_server
1931
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001932 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001933 """Best effort check that user is authenticated with Rietveld server."""
1934 if self._auth_config.use_oauth2:
1935 authenticator = auth.get_authenticator_for_host(
1936 self.GetCodereviewServer(), self._auth_config)
1937 if not authenticator.has_cached_credentials():
1938 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001939 if refresh:
1940 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001941
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001942 def EnsureCanUploadPatchset(self, force):
1943 # No checks for Rietveld because we are deprecating Rietveld.
1944 pass
1945
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001946 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 issue = self.GetIssue()
1948 assert issue
1949 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001950 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001951 except urllib2.HTTPError as e:
1952 if e.code == 404:
1953 DieWithError(
1954 ('\nWhile fetching the description for issue %d, received a '
1955 '404 (not found)\n'
1956 'error. It is likely that you deleted this '
1957 'issue on the server. If this is the\n'
1958 'case, please run\n\n'
1959 ' git cl issue 0\n\n'
1960 'to clear the association with the deleted issue. Then run '
1961 'this command again.') % issue)
1962 else:
1963 DieWithError(
1964 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1965 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001966 print('Warning: Failed to retrieve CL description due to network '
1967 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 return ''
1969
1970 def GetMostRecentPatchset(self):
1971 return self.GetIssueProperties()['patchsets'][-1]
1972
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001973 def GetIssueProperties(self):
1974 if self._props is None:
1975 issue = self.GetIssue()
1976 if not issue:
1977 self._props = {}
1978 else:
1979 self._props = self.RpcServer().get_issue_properties(issue, True)
1980 return self._props
1981
tandriie113dfd2016-10-11 10:20:12 -07001982 def CannotTriggerTryJobReason(self):
1983 props = self.GetIssueProperties()
1984 if not props:
1985 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1986 if props.get('closed'):
1987 return 'CL %s is closed' % self.GetIssue()
1988 if props.get('private'):
1989 return 'CL %s is private' % self.GetIssue()
1990 return None
1991
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001992 def GetTryJobProperties(self, patchset=None):
1993 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001994 project = (self.GetIssueProperties() or {}).get('project')
1995 return {
1996 'issue': self.GetIssue(),
1997 'patch_project': project,
1998 'patch_storage': 'rietveld',
1999 'patchset': patchset or self.GetPatchset(),
2000 'rietveld': self.GetCodereviewServer(),
2001 }
2002
tandriide281ae2016-10-12 06:02:30 -07002003 def GetIssueOwner(self):
2004 return (self.GetIssueProperties() or {}).get('owner_email')
2005
Aaron Gable636b13f2017-07-14 10:42:48 -07002006 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002007 return self.RpcServer().add_comment(self.GetIssue(), message)
2008
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002009 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002010 summary = []
2011 for message in self.GetIssueProperties().get('messages', []):
2012 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2013 summary.append(_CommentSummary(
2014 date=date,
2015 disapproval=bool(message['disapproval']),
2016 approval=bool(message['approval']),
2017 sender=message['sender'],
2018 message=message['text'],
2019 ))
2020 return summary
2021
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002022 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002023 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002024 or CQ status, assuming adherence to a common workflow.
2025
2026 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002027 * 'error' - error from review tool (including deleted issues)
2028 * 'unsent' - not sent for review
2029 * 'waiting' - waiting for review
2030 * 'reply' - waiting for owner to reply to review
2031 * 'not lgtm' - Code-Review label has been set negatively
2032 * 'lgtm' - LGTM from at least one approved reviewer
2033 * 'commit' - in the commit queue
2034 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002035 """
2036 if not self.GetIssue():
2037 return None
2038
2039 try:
2040 props = self.GetIssueProperties()
2041 except urllib2.HTTPError:
2042 return 'error'
2043
2044 if props.get('closed'):
2045 # Issue is closed.
2046 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002047 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002048 # Issue is in the commit queue.
2049 return 'commit'
2050
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002051 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002052 if not messages:
2053 # No message was sent.
2054 return 'unsent'
2055
2056 if get_approving_reviewers(props):
2057 return 'lgtm'
2058 elif get_approving_reviewers(props, disapproval=True):
2059 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002060
tandrii9d2c7a32016-06-22 03:42:45 -07002061 # Skip CQ messages that don't require owner's action.
2062 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2063 if 'Dry run:' in messages[-1]['text']:
2064 messages.pop()
2065 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2066 # This message always follows prior messages from CQ,
2067 # so skip this too.
2068 messages.pop()
2069 else:
2070 # This is probably a CQ messages warranting user attention.
2071 break
2072
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002073 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002074 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002075 return 'reply'
2076 return 'waiting'
2077
dsansomee2d6fd92016-09-08 00:10:47 -07002078 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002079 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002080
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002081 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002082 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002083
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002084 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002085 return self.SetFlags({flag: value})
2086
2087 def SetFlags(self, flags):
2088 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002089 """
phajdan.jr68598232016-08-10 03:28:28 -07002090 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002091 try:
tandrii4b233bd2016-07-06 03:50:29 -07002092 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002093 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002094 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002095 if e.code == 404:
2096 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2097 if e.code == 403:
2098 DieWithError(
2099 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002100 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002101 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002102
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002103 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002104 """Returns an upload.RpcServer() to access this review's rietveld instance.
2105 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002106 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002107 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002108 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002109 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002110 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002111
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002112 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002113 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002114 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002115
tandrii5d48c322016-08-18 16:19:37 -07002116 @classmethod
2117 def PatchsetConfigKey(cls):
2118 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002119
tandrii5d48c322016-08-18 16:19:37 -07002120 @classmethod
2121 def CodereviewServerConfigKey(cls):
2122 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002123
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002124 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002125 return self.RpcServer()
2126
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002127 def SetCQState(self, new_state):
2128 props = self.GetIssueProperties()
2129 if props.get('private'):
2130 DieWithError('Cannot set-commit on private issue')
2131
2132 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002133 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002135 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002136 else:
tandrii4b233bd2016-07-06 03:50:29 -07002137 assert new_state == _CQState.DRY_RUN
2138 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002139
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002141 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142 # PatchIssue should never be called with a dirty tree. It is up to the
2143 # caller to check this, but just in case we assert here since the
2144 # consequences of the caller not checking this could be dire.
2145 assert(not git_common.is_dirty_git_tree('apply'))
2146 assert(parsed_issue_arg.valid)
2147 self._changelist.issue = parsed_issue_arg.issue
2148 if parsed_issue_arg.hostname:
2149 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2150
skobes6468b902016-10-24 08:45:10 -07002151 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2152 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2153 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 try:
skobes6468b902016-10-24 08:45:10 -07002155 scm_obj.apply_patch(patchset_object)
2156 except Exception as e:
2157 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 return 1
2159
2160 # If we had an issue, commit the current state and register the issue.
2161 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002162 self.SetIssue(self.GetIssue())
2163 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2165 'patch from issue %(i)s at patchset '
2166 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2167 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002168 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002170 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 return 0
2172
2173 @staticmethod
2174 def ParseIssueURL(parsed_url):
2175 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2176 return None
wychen3c1c1722016-08-04 11:46:36 -07002177 # Rietveld patch: https://domain/<number>/#ps<patchset>
2178 match = re.match(r'/(\d+)/$', parsed_url.path)
2179 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2180 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002181 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002182 issue=int(match.group(1)),
2183 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002184 hostname=parsed_url.netloc,
2185 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 # Typical url: https://domain/<issue_number>[/[other]]
2187 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2188 if match:
skobes6468b902016-10-24 08:45:10 -07002189 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002191 hostname=parsed_url.netloc,
2192 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002193 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2194 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2195 if match:
skobes6468b902016-10-24 08:45:10 -07002196 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 issue=int(match.group(1)),
2198 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002199 hostname=parsed_url.netloc,
2200 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 return None
2202
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002203 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 """Upload the patch to Rietveld."""
2205 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2206 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002207 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2208 if options.emulate_svn_auto_props:
2209 upload_args.append('--emulate_svn_auto_props')
2210
2211 change_desc = None
2212
2213 if options.email is not None:
2214 upload_args.extend(['--email', options.email])
2215
2216 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002217 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 upload_args.extend(['--title', options.title])
2219 if options.message:
2220 upload_args.extend(['--message', options.message])
2221 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002222 print('This branch is associated with issue %s. '
2223 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002224 else:
nodirca166002016-06-27 10:59:51 -07002225 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002226 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002227 if options.message:
2228 message = options.message
2229 else:
2230 message = CreateDescriptionFromLog(args)
2231 if options.title:
2232 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002233 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002234 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002235 change_desc.update_reviewers(options.reviewers, options.tbrs,
2236 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002238 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002239
2240 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002241 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 return 1
2243
2244 upload_args.extend(['--message', change_desc.description])
2245 if change_desc.get_reviewers():
2246 upload_args.append('--reviewers=%s' % ','.join(
2247 change_desc.get_reviewers()))
2248 if options.send_mail:
2249 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002250 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002251 upload_args.append('--send_mail')
2252
2253 # We check this before applying rietveld.private assuming that in
2254 # rietveld.cc only addresses which we can send private CLs to are listed
2255 # if rietveld.private is set, and so we should ignore rietveld.cc only
2256 # when --private is specified explicitly on the command line.
2257 if options.private:
2258 logging.warn('rietveld.cc is ignored since private flag is specified. '
2259 'You need to review and add them manually if necessary.')
2260 cc = self.GetCCListWithoutDefault()
2261 else:
2262 cc = self.GetCCList()
2263 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002264 if change_desc.get_cced():
2265 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002266 if cc:
2267 upload_args.extend(['--cc', cc])
2268
2269 if options.private or settings.GetDefaultPrivateFlag() == "True":
2270 upload_args.append('--private')
2271
2272 upload_args.extend(['--git_similarity', str(options.similarity)])
2273 if not options.find_copies:
2274 upload_args.extend(['--git_no_find_copies'])
2275
2276 # Include the upstream repo's URL in the change -- this is useful for
2277 # projects that have their source spread across multiple repos.
2278 remote_url = self.GetGitBaseUrlFromConfig()
2279 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002280 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2281 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2282 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002285 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 if target_ref:
2287 upload_args.extend(['--target_ref', target_ref])
2288
2289 # Look for dependent patchsets. See crbug.com/480453 for more details.
2290 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2291 upstream_branch = ShortBranchName(upstream_branch)
2292 if remote is '.':
2293 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002294 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002296 print()
2297 print('Skipping dependency patchset upload because git config '
2298 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2299 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002300 else:
2301 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002302 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303 auth_config=auth_config)
2304 branch_cl_issue_url = branch_cl.GetIssueURL()
2305 branch_cl_issue = branch_cl.GetIssue()
2306 branch_cl_patchset = branch_cl.GetPatchset()
2307 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2308 upload_args.extend(
2309 ['--depends_on_patchset', '%s:%s' % (
2310 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002311 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 '\n'
2313 'The current branch (%s) is tracking a local branch (%s) with '
2314 'an associated CL.\n'
2315 'Adding %s/#ps%s as a dependency patchset.\n'
2316 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2317 branch_cl_patchset))
2318
2319 project = settings.GetProject()
2320 if project:
2321 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002322 else:
2323 print()
2324 print('WARNING: Uploading without a project specified. Please ensure '
2325 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2326 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 try:
2329 upload_args = ['upload'] + upload_args + args
2330 logging.info('upload.RealMain(%s)', upload_args)
2331 issue, patchset = upload.RealMain(upload_args)
2332 issue = int(issue)
2333 patchset = int(patchset)
2334 except KeyboardInterrupt:
2335 sys.exit(1)
2336 except:
2337 # If we got an exception after the user typed a description for their
2338 # change, back up the description before re-raising.
2339 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002340 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 raise
2342
2343 if not self.GetIssue():
2344 self.SetIssue(issue)
2345 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002346 return 0
2347
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002348
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002350 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002351 # auth_config is Rietveld thing, kept here to preserve interface only.
2352 super(_GerritChangelistImpl, self).__init__(changelist)
2353 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002354 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002355 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002356 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002357 # Map from change number (issue) to its detail cache.
2358 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002359
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002360 if codereview_host is not None:
2361 assert not codereview_host.startswith('https://'), codereview_host
2362 self._gerrit_host = codereview_host
2363 self._gerrit_server = 'https://%s' % codereview_host
2364
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002365 def _GetGerritHost(self):
2366 # Lazy load of configs.
2367 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002368 if self._gerrit_host and '.' not in self._gerrit_host:
2369 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2370 # This happens for internal stuff http://crbug.com/614312.
2371 parsed = urlparse.urlparse(self.GetRemoteUrl())
2372 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002373 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002374 ' Your current remote is: %s' % self.GetRemoteUrl())
2375 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2376 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377 return self._gerrit_host
2378
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002379 def _GetGitHost(self):
2380 """Returns git host to be used when uploading change to Gerrit."""
2381 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2382
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002383 def GetCodereviewServer(self):
2384 if not self._gerrit_server:
2385 # If we're on a branch then get the server potentially associated
2386 # with that branch.
2387 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002388 self._gerrit_server = self._GitGetBranchConfigValue(
2389 self.CodereviewServerConfigKey())
2390 if self._gerrit_server:
2391 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002392 if not self._gerrit_server:
2393 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2394 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002395 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002396 parts[0] = parts[0] + '-review'
2397 self._gerrit_host = '.'.join(parts)
2398 self._gerrit_server = 'https://%s' % self._gerrit_host
2399 return self._gerrit_server
2400
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002401 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002402 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002403 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002404
tandrii5d48c322016-08-18 16:19:37 -07002405 @classmethod
2406 def PatchsetConfigKey(cls):
2407 return 'gerritpatchset'
2408
2409 @classmethod
2410 def CodereviewServerConfigKey(cls):
2411 return 'gerritserver'
2412
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002413 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002414 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002415 if settings.GetGerritSkipEnsureAuthenticated():
2416 # For projects with unusual authentication schemes.
2417 # See http://crbug.com/603378.
2418 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 # Lazy-loader to identify Gerrit and Git hosts.
2420 if gerrit_util.GceAuthenticator.is_gce():
2421 return
2422 self.GetCodereviewServer()
2423 git_host = self._GetGitHost()
2424 assert self._gerrit_server and self._gerrit_host
2425 cookie_auth = gerrit_util.CookiesAuthenticator()
2426
2427 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2428 git_auth = cookie_auth.get_auth_header(git_host)
2429 if gerrit_auth and git_auth:
2430 if gerrit_auth == git_auth:
2431 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002432 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002434 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002435 ' %s\n'
2436 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002437 ' Consider running the following command:\n'
2438 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002439 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002440 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002441 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002442 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002443 cookie_auth.get_new_password_message(git_host)))
2444 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002445 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002446 return
2447 else:
2448 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002449 ([] if gerrit_auth else [self._gerrit_host]) +
2450 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002451 DieWithError('Credentials for the following hosts are required:\n'
2452 ' %s\n'
2453 'These are read from %s (or legacy %s)\n'
2454 '%s' % (
2455 '\n '.join(missing),
2456 cookie_auth.get_gitcookies_path(),
2457 cookie_auth.get_netrc_path(),
2458 cookie_auth.get_new_password_message(git_host)))
2459
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002460 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002461 if not self.GetIssue():
2462 return
2463
2464 # Warm change details cache now to avoid RPCs later, reducing latency for
2465 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002466 self._GetChangeDetail(
2467 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002468
2469 status = self._GetChangeDetail()['status']
2470 if status in ('MERGED', 'ABANDONED'):
2471 DieWithError('Change %s has been %s, new uploads are not allowed' %
2472 (self.GetIssueURL(),
2473 'submitted' if status == 'MERGED' else 'abandoned'))
2474
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002475 if gerrit_util.GceAuthenticator.is_gce():
2476 return
2477 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2478 self._GetGerritHost())
2479 if self.GetIssueOwner() == cookies_user:
2480 return
2481 logging.debug('change %s owner is %s, cookies user is %s',
2482 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002483 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002484 # so ask what Gerrit thinks of this user.
2485 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2486 if details['email'] == self.GetIssueOwner():
2487 return
2488 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002489 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002490 'as %s.\n'
2491 'Uploading may fail due to lack of permissions.' %
2492 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2493 confirm_or_exit(action='upload')
2494
2495
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002496 def _PostUnsetIssueProperties(self):
2497 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002498 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002499
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002500 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002501 class ThisIsNotRietveldIssue(object):
2502 def __nonzero__(self):
2503 # This is a hack to make presubmit_support think that rietveld is not
2504 # defined, yet still ensure that calls directly result in a decent
2505 # exception message below.
2506 return False
2507
2508 def __getattr__(self, attr):
2509 print(
2510 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2511 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002512 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002513 'or use Rietveld for codereview.\n'
2514 'See also http://crbug.com/579160.' % attr)
2515 raise NotImplementedError()
2516 return ThisIsNotRietveldIssue()
2517
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002518 def GetGerritObjForPresubmit(self):
2519 return presubmit_support.GerritAccessor(self._GetGerritHost())
2520
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002521 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 """Apply a rough heuristic to give a simple summary of an issue's review
2523 or CQ status, assuming adherence to a common workflow.
2524
2525 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002526 * 'error' - error from review tool (including deleted issues)
2527 * 'unsent' - no reviewers added
2528 * 'waiting' - waiting for review
2529 * 'reply' - waiting for uploader to reply to review
2530 * 'lgtm' - Code-Review label has been set
2531 * 'commit' - in the commit queue
2532 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002533 """
2534 if not self.GetIssue():
2535 return None
2536
2537 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002538 data = self._GetChangeDetail([
2539 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002540 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002541 return 'error'
2542
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002543 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002544 return 'closed'
2545
Aaron Gable9ab38c62017-04-06 14:36:33 -07002546 if data['labels'].get('Commit-Queue', {}).get('approved'):
2547 # The section will have an "approved" subsection if anyone has voted
2548 # the maximum value on the label.
2549 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002550
Aaron Gable9ab38c62017-04-06 14:36:33 -07002551 if data['labels'].get('Code-Review', {}).get('approved'):
2552 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002553
2554 if not data.get('reviewers', {}).get('REVIEWER', []):
2555 return 'unsent'
2556
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002557 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002558 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2559 last_message_author = messages.pop().get('author', {})
2560 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002561 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2562 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002563 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002564 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002565 if last_message_author.get('_account_id') == owner:
2566 # Most recent message was by owner.
2567 return 'waiting'
2568 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002569 # Some reply from non-owner.
2570 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002571
2572 # Somehow there are no messages even though there are reviewers.
2573 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002574
2575 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002576 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002577 patchset = data['revisions'][data['current_revision']]['_number']
2578 self.SetPatchset(patchset)
2579 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002580
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002581 def FetchDescription(self, force=False):
2582 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2583 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002584 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002585 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002586
dsansomee2d6fd92016-09-08 00:10:47 -07002587 def UpdateDescriptionRemote(self, description, force=False):
2588 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2589 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002590 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002591 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002592 'unpublished edit. Either publish the edit in the Gerrit web UI '
2593 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002594
2595 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2596 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002597 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002598 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002599
Aaron Gable636b13f2017-07-14 10:42:48 -07002600 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002601 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002602 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002603
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002604 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002605 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002606 messages = self._GetChangeDetail(
2607 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2608 file_comments = gerrit_util.GetChangeComments(
2609 self._GetGerritHost(), self.GetIssue())
2610
2611 # Build dictionary of file comments for easy access and sorting later.
2612 # {author+date: {path: {patchset: {line: url+message}}}}
2613 comments = collections.defaultdict(
2614 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2615 for path, line_comments in file_comments.iteritems():
2616 for comment in line_comments:
2617 if comment.get('tag', '').startswith('autogenerated'):
2618 continue
2619 key = (comment['author']['email'], comment['updated'])
2620 if comment.get('side', 'REVISION') == 'PARENT':
2621 patchset = 'Base'
2622 else:
2623 patchset = 'PS%d' % comment['patch_set']
2624 line = comment.get('line', 0)
2625 url = ('https://%s/c/%s/%s/%s#%s%s' %
2626 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2627 'b' if comment.get('side') == 'PARENT' else '',
2628 str(line) if line else ''))
2629 comments[key][path][patchset][line] = (url, comment['message'])
2630
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002631 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002632 for msg in messages:
2633 # Don't bother showing autogenerated messages.
2634 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2635 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002636 # Gerrit spits out nanoseconds.
2637 assert len(msg['date'].split('.')[-1]) == 9
2638 date = datetime.datetime.strptime(msg['date'][:-3],
2639 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002640 message = msg['message']
2641 key = (msg['author']['email'], msg['date'])
2642 if key in comments:
2643 message += '\n'
2644 for path, patchsets in sorted(comments.get(key, {}).items()):
2645 if readable:
2646 message += '\n%s' % path
2647 for patchset, lines in sorted(patchsets.items()):
2648 for line, (url, content) in sorted(lines.items()):
2649 if line:
2650 line_str = 'Line %d' % line
2651 path_str = '%s:%d:' % (path, line)
2652 else:
2653 line_str = 'File comment'
2654 path_str = '%s:0:' % path
2655 if readable:
2656 message += '\n %s, %s: %s' % (patchset, line_str, url)
2657 message += '\n %s\n' % content
2658 else:
2659 message += '\n%s ' % path_str
2660 message += '\n%s\n' % content
2661
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002662 summary.append(_CommentSummary(
2663 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002664 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002665 sender=msg['author']['email'],
2666 # These could be inferred from the text messages and correlated with
2667 # Code-Review label maximum, however this is not reliable.
2668 # Leaving as is until the need arises.
2669 approval=False,
2670 disapproval=False,
2671 ))
2672 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002673
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002674 def CloseIssue(self):
2675 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2676
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002677 def SubmitIssue(self, wait_for_merge=True):
2678 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2679 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002680
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002681 def _GetChangeDetail(self, options=None, issue=None,
2682 no_cache=False):
2683 """Returns details of the issue by querying Gerrit and caching results.
2684
2685 If fresh data is needed, set no_cache=True which will clear cache and
2686 thus new data will be fetched from Gerrit.
2687 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002688 options = options or []
2689 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002690 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002691
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002692 # Optimization to avoid multiple RPCs:
2693 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2694 'CURRENT_COMMIT' not in options):
2695 options.append('CURRENT_COMMIT')
2696
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002697 # Normalize issue and options for consistent keys in cache.
2698 issue = str(issue)
2699 options = [o.upper() for o in options]
2700
2701 # Check in cache first unless no_cache is True.
2702 if no_cache:
2703 self._detail_cache.pop(issue, None)
2704 else:
2705 options_set = frozenset(options)
2706 for cached_options_set, data in self._detail_cache.get(issue, []):
2707 # Assumption: data fetched before with extra options is suitable
2708 # for return for a smaller set of options.
2709 # For example, if we cached data for
2710 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2711 # and request is for options=[CURRENT_REVISION],
2712 # THEN we can return prior cached data.
2713 if options_set.issubset(cached_options_set):
2714 return data
2715
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002716 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002717 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002718 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002719 except gerrit_util.GerritError as e:
2720 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002721 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002722 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002723
2724 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002725 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002726
agable32978d92016-11-01 12:55:02 -07002727 def _GetChangeCommit(self, issue=None):
2728 issue = issue or self.GetIssue()
2729 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002730 try:
2731 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2732 except gerrit_util.GerritError as e:
2733 if e.http_status == 404:
2734 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2735 raise
agable32978d92016-11-01 12:55:02 -07002736 return data
2737
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002738 def CMDLand(self, force, bypass_hooks, verbose):
2739 if git_common.is_dirty_git_tree('land'):
2740 return 1
tandriid60367b2016-06-22 05:25:12 -07002741 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2742 if u'Commit-Queue' in detail.get('labels', {}):
2743 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002744 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2745 'which can test and land changes for you. '
2746 'Are you sure you wish to bypass it?\n',
2747 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002748
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002749 differs = True
tandriic4344b52016-08-29 06:04:54 -07002750 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002751 # Note: git diff outputs nothing if there is no diff.
2752 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002753 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002754 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002755 if detail['current_revision'] == last_upload:
2756 differs = False
2757 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002758 print('WARNING: Local branch contents differ from latest uploaded '
2759 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002760 if differs:
2761 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002762 confirm_or_exit(
2763 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2764 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002765 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002766 elif not bypass_hooks:
2767 hook_results = self.RunHook(
2768 committing=True,
2769 may_prompt=not force,
2770 verbose=verbose,
2771 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2772 if not hook_results.should_continue():
2773 return 1
2774
2775 self.SubmitIssue(wait_for_merge=True)
2776 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002777 links = self._GetChangeCommit().get('web_links', [])
2778 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002779 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002780 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002781 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002782 return 0
2783
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002784 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002785 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002786 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002787 assert not directory
2788 assert parsed_issue_arg.valid
2789
2790 self._changelist.issue = parsed_issue_arg.issue
2791
2792 if parsed_issue_arg.hostname:
2793 self._gerrit_host = parsed_issue_arg.hostname
2794 self._gerrit_server = 'https://%s' % self._gerrit_host
2795
tandriic2405f52016-10-10 08:13:15 -07002796 try:
2797 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002798 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002799 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002800
2801 if not parsed_issue_arg.patchset:
2802 # Use current revision by default.
2803 revision_info = detail['revisions'][detail['current_revision']]
2804 patchset = int(revision_info['_number'])
2805 else:
2806 patchset = parsed_issue_arg.patchset
2807 for revision_info in detail['revisions'].itervalues():
2808 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2809 break
2810 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002811 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002812 (parsed_issue_arg.patchset, self.GetIssue()))
2813
2814 fetch_info = revision_info['fetch']['http']
2815 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002816
Aaron Gable62619a32017-06-16 08:22:09 -07002817 if force:
2818 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2819 print('Checked out commit for change %i patchset %i locally' %
2820 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002821 elif nocommit:
2822 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2823 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002824 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002825 RunGit(['cherry-pick', 'FETCH_HEAD'])
2826 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002827 (parsed_issue_arg.issue, patchset))
2828 print('Note: this created a local commit which does not have '
2829 'the same hash as the one uploaded for review. This will make '
2830 'uploading changes based on top of this branch difficult.\n'
2831 'If you want to do that, use "git cl patch --force" instead.')
2832
Stefan Zagerd08043c2017-10-12 12:07:02 -07002833 if self.GetBranch():
2834 self.SetIssue(parsed_issue_arg.issue)
2835 self.SetPatchset(patchset)
2836 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2837 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2838 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2839 else:
2840 print('WARNING: You are in detached HEAD state.\n'
2841 'The patch has been applied to your checkout, but you will not be '
2842 'able to upload a new patch set to the gerrit issue.\n'
2843 'Try using the \'-b\' option if you would like to work on a '
2844 'branch and/or upload a new patch set.')
2845
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002846 return 0
2847
2848 @staticmethod
2849 def ParseIssueURL(parsed_url):
2850 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2851 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002852 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2853 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002854 # Short urls like https://domain/<issue_number> can be used, but don't allow
2855 # specifying the patchset (you'd 404), but we allow that here.
2856 if parsed_url.path == '/':
2857 part = parsed_url.fragment
2858 else:
2859 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002860 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002861 if match:
2862 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002863 issue=int(match.group(3)),
2864 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002865 hostname=parsed_url.netloc,
2866 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002867 return None
2868
tandrii16e0b4e2016-06-07 10:34:28 -07002869 def _GerritCommitMsgHookCheck(self, offer_removal):
2870 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2871 if not os.path.exists(hook):
2872 return
2873 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2874 # custom developer made one.
2875 data = gclient_utils.FileRead(hook)
2876 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2877 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002878 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002879 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002880 'and may interfere with it in subtle ways.\n'
2881 'We recommend you remove the commit-msg hook.')
2882 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002883 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002884 gclient_utils.rm_file_or_tree(hook)
2885 print('Gerrit commit-msg hook removed.')
2886 else:
2887 print('OK, will keep Gerrit commit-msg hook in place.')
2888
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002889 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002891 if options.squash and options.no_squash:
2892 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002893
2894 if not options.squash and not options.no_squash:
2895 # Load default for user, repo, squash=true, in this order.
2896 options.squash = settings.GetSquashGerritUploads()
2897 elif options.no_squash:
2898 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002899
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002900 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002901 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902
Aaron Gableb56ad332017-01-06 15:24:31 -08002903 # This may be None; default fallback value is determined in logic below.
2904 title = options.title
2905
Dominic Battre7d1c4842017-10-27 09:17:28 +02002906 # Extract bug number from branch name.
2907 bug = options.bug
2908 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2909 if not bug and match:
2910 bug = match.group(1)
2911
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002913 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002914 if self.GetIssue():
2915 # Try to get the message from a previous upload.
2916 message = self.GetDescription()
2917 if not message:
2918 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002919 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002920 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002921 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002922 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002923 # When uploading a subsequent patchset, -m|--message is taken
2924 # as the patchset title if --title was not provided.
2925 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002926 else:
2927 default_title = RunGit(
2928 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002929 if options.force:
2930 title = default_title
2931 else:
2932 title = ask_for_data(
2933 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002934 change_id = self._GetChangeDetail()['change_id']
2935 while True:
2936 footer_change_ids = git_footers.get_footer_change_id(message)
2937 if footer_change_ids == [change_id]:
2938 break
2939 if not footer_change_ids:
2940 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002941 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002942 continue
2943 # There is already a valid footer but with different or several ids.
2944 # Doing this automatically is non-trivial as we don't want to lose
2945 # existing other footers, yet we want to append just 1 desired
2946 # Change-Id. Thus, just create a new footer, but let user verify the
2947 # new description.
2948 message = '%s\n\nChange-Id: %s' % (message, change_id)
2949 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002950 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002951 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002952 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002953 'Please, check the proposed correction to the description, '
2954 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2955 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2956 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002957 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002958 if not options.force:
2959 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002960 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002961 message = change_desc.description
2962 if not message:
2963 DieWithError("Description is empty. Aborting...")
2964 # Continue the while loop.
2965 # Sanity check of this code - we should end up with proper message
2966 # footer.
2967 assert [change_id] == git_footers.get_footer_change_id(message)
2968 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002969 else: # if not self.GetIssue()
2970 if options.message:
2971 message = options.message
2972 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002973 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002974 if options.title:
2975 message = options.title + '\n\n' + message
2976 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002977
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002978 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002979 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002980 # On first upload, patchset title is always this string, while
2981 # --title flag gets converted to first line of message.
2982 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002983 if not change_desc.description:
2984 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002985 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002986 if len(change_ids) > 1:
2987 DieWithError('too many Change-Id footers, at most 1 allowed.')
2988 if not change_ids:
2989 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002990 change_desc.set_description(git_footers.add_footer_change_id(
2991 change_desc.description,
2992 GenerateGerritChangeId(change_desc.description)))
2993 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002994 assert len(change_ids) == 1
2995 change_id = change_ids[0]
2996
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002997 if options.reviewers or options.tbrs or options.add_owners_to:
2998 change_desc.update_reviewers(options.reviewers, options.tbrs,
2999 options.add_owners_to, change)
3000
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003001 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003002 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3003 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003004 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07003005 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
3006 desc_tempfile.write(change_desc.description)
3007 desc_tempfile.close()
3008 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
3009 '-F', desc_tempfile.name]).strip()
3010 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003011 else:
3012 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003013 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003014 if not change_desc.description:
3015 DieWithError("Description is empty. Aborting...")
3016
3017 if not git_footers.get_footer_change_id(change_desc.description):
3018 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003019 change_desc.set_description(
3020 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003021 if options.reviewers or options.tbrs or options.add_owners_to:
3022 change_desc.update_reviewers(options.reviewers, options.tbrs,
3023 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003024 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003025 # For no-squash mode, we assume the remote called "origin" is the one we
3026 # want. It is not worthwhile to support different workflows for
3027 # no-squash mode.
3028 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003029 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3030
3031 assert change_desc
3032 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3033 ref_to_push)]).splitlines()
3034 if len(commits) > 1:
3035 print('WARNING: This will upload %d commits. Run the following command '
3036 'to see which commits will be uploaded: ' % len(commits))
3037 print('git log %s..%s' % (parent, ref_to_push))
3038 print('You can also use `git squash-branch` to squash these into a '
3039 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003040 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003041
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003042 if options.reviewers or options.tbrs or options.add_owners_to:
3043 change_desc.update_reviewers(options.reviewers, options.tbrs,
3044 options.add_owners_to, change)
3045
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003046 # Extra options that can be specified at push time. Doc:
3047 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003048 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003049
Aaron Gable844cf292017-06-28 11:32:59 -07003050 # By default, new changes are started in WIP mode, and subsequent patchsets
3051 # don't send email. At any time, passing --send-mail will mark the change
3052 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003053 if options.send_mail:
3054 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003055 refspec_opts.append('notify=ALL')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003056 elif not self.GetIssue():
3057 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07003058 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003059 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003060
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003061 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003062 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003063
Aaron Gable9b713dd2016-12-14 16:04:21 -08003064 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003065 # Punctuation and whitespace in |title| must be percent-encoded.
3066 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003067
agablec6787972016-09-09 16:13:34 -07003068 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003069 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003070
rmistry9eadede2016-09-19 11:22:43 -07003071 if options.topic:
3072 # Documentation on Gerrit topics is here:
3073 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003074 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003075
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003076 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08003077 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003078 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08003079 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003080 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
3081
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003082 refspec_suffix = ''
3083 if refspec_opts:
3084 refspec_suffix = '%' + ','.join(refspec_opts)
3085 assert ' ' not in refspec_suffix, (
3086 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3087 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3088
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003089 try:
3090 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003091 ['git', 'push', self.GetRemoteUrl(), refspec],
3092 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003093 # Flush after every line: useful for seeing progress when running as
3094 # recipe.
3095 filter_fn=lambda _: sys.stdout.flush())
3096 except subprocess2.CalledProcessError:
3097 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003098 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003099 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003100 'credential problems:\n'
3101 ' git cl creds-check\n',
3102 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003103
3104 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003105 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003106 change_numbers = [m.group(1)
3107 for m in map(regex.match, push_stdout.splitlines())
3108 if m]
3109 if len(change_numbers) != 1:
3110 DieWithError(
3111 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003112 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003113 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003114 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003115
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003116 reviewers = sorted(change_desc.get_reviewers())
3117
tandrii88189772016-09-29 04:29:57 -07003118 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003119 if not options.private:
3120 cc = self.GetCCList().split(',')
3121 else:
3122 cc = []
tandrii88189772016-09-29 04:29:57 -07003123 if options.cc:
3124 cc.extend(options.cc)
3125 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003126 if change_desc.get_cced():
3127 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003128
3129 gerrit_util.AddReviewers(
3130 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3131 notify=bool(options.send_mail))
3132
Aaron Gablefd238082017-06-07 13:42:34 -07003133 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003134 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3135 score = 1
3136 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3137 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3138 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003139 gerrit_util.SetReview(
3140 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003141 msg='Self-approving for TBR',
3142 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003143
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003144 return 0
3145
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003146 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3147 change_desc):
3148 """Computes parent of the generated commit to be uploaded to Gerrit.
3149
3150 Returns revision or a ref name.
3151 """
3152 if custom_cl_base:
3153 # Try to avoid creating additional unintended CLs when uploading, unless
3154 # user wants to take this risk.
3155 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3156 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3157 local_ref_of_target_remote])
3158 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003159 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003160 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3161 'If you proceed with upload, more than 1 CL may be created by '
3162 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3163 'If you are certain that specified base `%s` has already been '
3164 'uploaded to Gerrit as another CL, you may proceed.\n' %
3165 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3166 if not force:
3167 confirm_or_exit(
3168 'Do you take responsibility for cleaning up potential mess '
3169 'resulting from proceeding with upload?',
3170 action='upload')
3171 return custom_cl_base
3172
Aaron Gablef97e33d2017-03-30 15:44:27 -07003173 if remote != '.':
3174 return self.GetCommonAncestorWithUpstream()
3175
3176 # If our upstream branch is local, we base our squashed commit on its
3177 # squashed version.
3178 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3179
Aaron Gablef97e33d2017-03-30 15:44:27 -07003180 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003181 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003182
3183 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003184 # TODO(tandrii): consider checking parent change in Gerrit and using its
3185 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3186 # the tree hash of the parent branch. The upside is less likely bogus
3187 # requests to reupload parent change just because it's uploadhash is
3188 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003189 parent = RunGit(['config',
3190 'branch.%s.gerritsquashhash' % upstream_branch_name],
3191 error_ok=True).strip()
3192 # Verify that the upstream branch has been uploaded too, otherwise
3193 # Gerrit will create additional CLs when uploading.
3194 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3195 RunGitSilent(['rev-parse', parent + ':'])):
3196 DieWithError(
3197 '\nUpload upstream branch %s first.\n'
3198 'It is likely that this branch has been rebased since its last '
3199 'upload, so you just need to upload it again.\n'
3200 '(If you uploaded it with --no-squash, then branch dependencies '
3201 'are not supported, and you should reupload with --squash.)'
3202 % upstream_branch_name,
3203 change_desc)
3204 return parent
3205
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003206 def _AddChangeIdToCommitMessage(self, options, args):
3207 """Re-commits using the current message, assumes the commit hook is in
3208 place.
3209 """
3210 log_desc = options.message or CreateDescriptionFromLog(args)
3211 git_command = ['commit', '--amend', '-m', log_desc]
3212 RunGit(git_command)
3213 new_log_desc = CreateDescriptionFromLog(args)
3214 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003215 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003216 return new_log_desc
3217 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003218 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003219
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003220 def SetCQState(self, new_state):
3221 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003222 vote_map = {
3223 _CQState.NONE: 0,
3224 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003225 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003226 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003227 labels = {'Commit-Queue': vote_map[new_state]}
3228 notify = False if new_state == _CQState.DRY_RUN else None
3229 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3230 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003231
tandriie113dfd2016-10-11 10:20:12 -07003232 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003233 try:
3234 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003235 except GerritChangeNotExists:
3236 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003237
3238 if data['status'] in ('ABANDONED', 'MERGED'):
3239 return 'CL %s is closed' % self.GetIssue()
3240
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003241 def GetTryJobProperties(self, patchset=None):
3242 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003243 data = self._GetChangeDetail(['ALL_REVISIONS'])
3244 patchset = int(patchset or self.GetPatchset())
3245 assert patchset
3246 revision_data = None # Pylint wants it to be defined.
3247 for revision_data in data['revisions'].itervalues():
3248 if int(revision_data['_number']) == patchset:
3249 break
3250 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003251 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003252 (patchset, self.GetIssue()))
3253 return {
3254 'patch_issue': self.GetIssue(),
3255 'patch_set': patchset or self.GetPatchset(),
3256 'patch_project': data['project'],
3257 'patch_storage': 'gerrit',
3258 'patch_ref': revision_data['fetch']['http']['ref'],
3259 'patch_repository_url': revision_data['fetch']['http']['url'],
3260 'patch_gerrit_url': self.GetCodereviewServer(),
3261 }
tandriie113dfd2016-10-11 10:20:12 -07003262
tandriide281ae2016-10-12 06:02:30 -07003263 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003264 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003265
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003266
3267_CODEREVIEW_IMPLEMENTATIONS = {
3268 'rietveld': _RietveldChangelistImpl,
3269 'gerrit': _GerritChangelistImpl,
3270}
3271
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003272
iannuccie53c9352016-08-17 14:40:40 -07003273def _add_codereview_issue_select_options(parser, extra=""):
3274 _add_codereview_select_options(parser)
3275
3276 text = ('Operate on this issue number instead of the current branch\'s '
3277 'implicit issue.')
3278 if extra:
3279 text += ' '+extra
3280 parser.add_option('-i', '--issue', type=int, help=text)
3281
3282
3283def _process_codereview_issue_select_options(parser, options):
3284 _process_codereview_select_options(parser, options)
3285 if options.issue is not None and not options.forced_codereview:
3286 parser.error('--issue must be specified with either --rietveld or --gerrit')
3287
3288
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003289def _add_codereview_select_options(parser):
3290 """Appends --gerrit and --rietveld options to force specific codereview."""
3291 parser.codereview_group = optparse.OptionGroup(
3292 parser, 'EXPERIMENTAL! Codereview override options')
3293 parser.add_option_group(parser.codereview_group)
3294 parser.codereview_group.add_option(
3295 '--gerrit', action='store_true',
3296 help='Force the use of Gerrit for codereview')
3297 parser.codereview_group.add_option(
3298 '--rietveld', action='store_true',
3299 help='Force the use of Rietveld for codereview')
3300
3301
3302def _process_codereview_select_options(parser, options):
3303 if options.gerrit and options.rietveld:
3304 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3305 options.forced_codereview = None
3306 if options.gerrit:
3307 options.forced_codereview = 'gerrit'
3308 elif options.rietveld:
3309 options.forced_codereview = 'rietveld'
3310
3311
tandriif9aefb72016-07-01 09:06:51 -07003312def _get_bug_line_values(default_project, bugs):
3313 """Given default_project and comma separated list of bugs, yields bug line
3314 values.
3315
3316 Each bug can be either:
3317 * a number, which is combined with default_project
3318 * string, which is left as is.
3319
3320 This function may produce more than one line, because bugdroid expects one
3321 project per line.
3322
3323 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3324 ['v8:123', 'chromium:789']
3325 """
3326 default_bugs = []
3327 others = []
3328 for bug in bugs.split(','):
3329 bug = bug.strip()
3330 if bug:
3331 try:
3332 default_bugs.append(int(bug))
3333 except ValueError:
3334 others.append(bug)
3335
3336 if default_bugs:
3337 default_bugs = ','.join(map(str, default_bugs))
3338 if default_project:
3339 yield '%s:%s' % (default_project, default_bugs)
3340 else:
3341 yield default_bugs
3342 for other in sorted(others):
3343 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3344 yield other
3345
3346
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003347class ChangeDescription(object):
3348 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003349 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003350 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003351 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003352 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003353 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3354 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3355 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3356 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003357
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003358 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003359 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003360
agable@chromium.org42c20792013-09-12 17:34:49 +00003361 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003362 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003363 return '\n'.join(self._description_lines)
3364
3365 def set_description(self, desc):
3366 if isinstance(desc, basestring):
3367 lines = desc.splitlines()
3368 else:
3369 lines = [line.rstrip() for line in desc]
3370 while lines and not lines[0]:
3371 lines.pop(0)
3372 while lines and not lines[-1]:
3373 lines.pop(-1)
3374 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003375
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003376 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3377 """Rewrites the R=/TBR= line(s) as a single line each.
3378
3379 Args:
3380 reviewers (list(str)) - list of additional emails to use for reviewers.
3381 tbrs (list(str)) - list of additional emails to use for TBRs.
3382 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3383 the change that are missing OWNER coverage. If this is not None, you
3384 must also pass a value for `change`.
3385 change (Change) - The Change that should be used for OWNERS lookups.
3386 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003387 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003388 assert isinstance(tbrs, list), tbrs
3389
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003390 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003391 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003392
3393 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003394 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003395
3396 reviewers = set(reviewers)
3397 tbrs = set(tbrs)
3398 LOOKUP = {
3399 'TBR': tbrs,
3400 'R': reviewers,
3401 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003402
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003403 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003404 regexp = re.compile(self.R_LINE)
3405 matches = [regexp.match(line) for line in self._description_lines]
3406 new_desc = [l for i, l in enumerate(self._description_lines)
3407 if not matches[i]]
3408 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003409
agable@chromium.org42c20792013-09-12 17:34:49 +00003410 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003411
3412 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003413 for match in matches:
3414 if not match:
3415 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003416 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3417
3418 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003419 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003420 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003421 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003422 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003423 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003424 LOOKUP[add_owners_to].update(
3425 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003426
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003427 # If any folks ended up in both groups, remove them from tbrs.
3428 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003429
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003430 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3431 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003432
3433 # Put the new lines in the description where the old first R= line was.
3434 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3435 if 0 <= line_loc < len(self._description_lines):
3436 if new_tbr_line:
3437 self._description_lines.insert(line_loc, new_tbr_line)
3438 if new_r_line:
3439 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003440 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003441 if new_r_line:
3442 self.append_footer(new_r_line)
3443 if new_tbr_line:
3444 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003445
Aaron Gable3a16ed12017-03-23 10:51:55 -07003446 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003447 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003448 self.set_description([
3449 '# Enter a description of the change.',
3450 '# This will be displayed on the codereview site.',
3451 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003452 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003453 '--------------------',
3454 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003455
agable@chromium.org42c20792013-09-12 17:34:49 +00003456 regexp = re.compile(self.BUG_LINE)
3457 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003458 prefix = settings.GetBugPrefix()
3459 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003460 if git_footer:
3461 self.append_footer('Bug: %s' % ', '.join(values))
3462 else:
3463 for value in values:
3464 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003465
agable@chromium.org42c20792013-09-12 17:34:49 +00003466 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003467 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003468 if not content:
3469 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003470 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003471
3472 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003473 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3474 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003475 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003476 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003477
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003478 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003479 """Adds a footer line to the description.
3480
3481 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3482 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3483 that Gerrit footers are always at the end.
3484 """
3485 parsed_footer_line = git_footers.parse_footer(line)
3486 if parsed_footer_line:
3487 # Line is a gerrit footer in the form: Footer-Key: any value.
3488 # Thus, must be appended observing Gerrit footer rules.
3489 self.set_description(
3490 git_footers.add_footer(self.description,
3491 key=parsed_footer_line[0],
3492 value=parsed_footer_line[1]))
3493 return
3494
3495 if not self._description_lines:
3496 self._description_lines.append(line)
3497 return
3498
3499 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3500 if gerrit_footers:
3501 # git_footers.split_footers ensures that there is an empty line before
3502 # actual (gerrit) footers, if any. We have to keep it that way.
3503 assert top_lines and top_lines[-1] == ''
3504 top_lines, separator = top_lines[:-1], top_lines[-1:]
3505 else:
3506 separator = [] # No need for separator if there are no gerrit_footers.
3507
3508 prev_line = top_lines[-1] if top_lines else ''
3509 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3510 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3511 top_lines.append('')
3512 top_lines.append(line)
3513 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003514
tandrii99a72f22016-08-17 14:33:24 -07003515 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003516 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003517 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003518 reviewers = [match.group(2).strip()
3519 for match in matches
3520 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003521 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003522
bradnelsond975b302016-10-23 12:20:23 -07003523 def get_cced(self):
3524 """Retrieves the list of reviewers."""
3525 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3526 cced = [match.group(2).strip() for match in matches if match]
3527 return cleanup_list(cced)
3528
Nodir Turakulov23b82142017-11-16 11:04:25 -08003529 def get_hash_tags(self):
3530 """Extracts and sanitizes a list of Gerrit hashtags."""
3531 subject = (self._description_lines or ('',))[0]
3532 subject = re.sub(
3533 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3534
3535 tags = []
3536 start = 0
3537 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3538 while True:
3539 m = bracket_exp.match(subject, start)
3540 if not m:
3541 break
3542 tags.append(self.sanitize_hash_tag(m.group(1)))
3543 start = m.end()
3544
3545 if not tags:
3546 # Try "Tag: " prefix.
3547 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3548 if m:
3549 tags.append(self.sanitize_hash_tag(m.group(1)))
3550 return tags
3551
3552 @classmethod
3553 def sanitize_hash_tag(cls, tag):
3554 """Returns a sanitized Gerrit hash tag.
3555
3556 A sanitized hashtag can be used as a git push refspec parameter value.
3557 """
3558 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3559
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003560 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3561 """Updates this commit description given the parent.
3562
3563 This is essentially what Gnumbd used to do.
3564 Consult https://goo.gl/WMmpDe for more details.
3565 """
3566 assert parent_msg # No, orphan branch creation isn't supported.
3567 assert parent_hash
3568 assert dest_ref
3569 parent_footer_map = git_footers.parse_footers(parent_msg)
3570 # This will also happily parse svn-position, which GnumbD is no longer
3571 # supporting. While we'd generate correct footers, the verifier plugin
3572 # installed in Gerrit will block such commit (ie git push below will fail).
3573 parent_position = git_footers.get_position(parent_footer_map)
3574
3575 # Cherry-picks may have last line obscuring their prior footers,
3576 # from git_footers perspective. This is also what Gnumbd did.
3577 cp_line = None
3578 if (self._description_lines and
3579 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3580 cp_line = self._description_lines.pop()
3581
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003582 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003583
3584 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3585 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003586 for i, line in enumerate(footer_lines):
3587 k, v = git_footers.parse_footer(line) or (None, None)
3588 if k and k.startswith('Cr-'):
3589 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003590
3591 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003592 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003593 if parent_position[0] == dest_ref:
3594 # Same branch as parent.
3595 number = int(parent_position[1]) + 1
3596 else:
3597 number = 1 # New branch, and extra lineage.
3598 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3599 int(parent_position[1])))
3600
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003601 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3602 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003603
3604 self._description_lines = top_lines
3605 if cp_line:
3606 self._description_lines.append(cp_line)
3607 if self._description_lines[-1] != '':
3608 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003609 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003610
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003611
Aaron Gablea1bab272017-04-11 16:38:18 -07003612def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003613 """Retrieves the reviewers that approved a CL from the issue properties with
3614 messages.
3615
3616 Note that the list may contain reviewers that are not committer, thus are not
3617 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003618
3619 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003620 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003621 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003622 return sorted(
3623 set(
3624 message['sender']
3625 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003626 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003627 )
3628 )
3629
3630
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003631def FindCodereviewSettingsFile(filename='codereview.settings'):
3632 """Finds the given file starting in the cwd and going up.
3633
3634 Only looks up to the top of the repository unless an
3635 'inherit-review-settings-ok' file exists in the root of the repository.
3636 """
3637 inherit_ok_file = 'inherit-review-settings-ok'
3638 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003639 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003640 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3641 root = '/'
3642 while True:
3643 if filename in os.listdir(cwd):
3644 if os.path.isfile(os.path.join(cwd, filename)):
3645 return open(os.path.join(cwd, filename))
3646 if cwd == root:
3647 break
3648 cwd = os.path.dirname(cwd)
3649
3650
3651def LoadCodereviewSettingsFromFile(fileobj):
3652 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003653 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003654
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003655 def SetProperty(name, setting, unset_error_ok=False):
3656 fullname = 'rietveld.' + name
3657 if setting in keyvals:
3658 RunGit(['config', fullname, keyvals[setting]])
3659 else:
3660 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3661
tandrii48df5812016-10-17 03:55:37 -07003662 if not keyvals.get('GERRIT_HOST', False):
3663 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003664 # Only server setting is required. Other settings can be absent.
3665 # In that case, we ignore errors raised during option deletion attempt.
3666 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003667 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003668 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3669 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003670 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003671 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3672 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003673 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003674 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3675 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003676
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003677 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003678 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003679
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003680 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003681 RunGit(['config', 'gerrit.squash-uploads',
3682 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003683
tandrii@chromium.org28253532016-04-14 13:46:56 +00003684 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003685 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003686 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3687
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003688 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003689 # should be of the form
3690 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3691 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003692 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3693 keyvals['ORIGIN_URL_CONFIG']])
3694
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003695
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003696def urlretrieve(source, destination):
3697 """urllib is broken for SSL connections via a proxy therefore we
3698 can't use urllib.urlretrieve()."""
3699 with open(destination, 'w') as f:
3700 f.write(urllib2.urlopen(source).read())
3701
3702
ukai@chromium.org712d6102013-11-27 00:52:58 +00003703def hasSheBang(fname):
3704 """Checks fname is a #! script."""
3705 with open(fname) as f:
3706 return f.read(2).startswith('#!')
3707
3708
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003709# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3710def DownloadHooks(*args, **kwargs):
3711 pass
3712
3713
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003714def DownloadGerritHook(force):
3715 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003716
3717 Args:
3718 force: True to update hooks. False to install hooks if not present.
3719 """
3720 if not settings.GetIsGerrit():
3721 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003722 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003723 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3724 if not os.access(dst, os.X_OK):
3725 if os.path.exists(dst):
3726 if not force:
3727 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003728 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003729 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003730 if not hasSheBang(dst):
3731 DieWithError('Not a script: %s\n'
3732 'You need to download from\n%s\n'
3733 'into .git/hooks/commit-msg and '
3734 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003735 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3736 except Exception:
3737 if os.path.exists(dst):
3738 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003739 DieWithError('\nFailed to download hooks.\n'
3740 'You need to download from\n%s\n'
3741 'into .git/hooks/commit-msg and '
3742 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003743
3744
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003745def GetRietveldCodereviewSettingsInteractively():
3746 """Prompt the user for settings."""
3747 server = settings.GetDefaultServerUrl(error_ok=True)
3748 prompt = 'Rietveld server (host[:port])'
3749 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3750 newserver = ask_for_data(prompt + ':')
3751 if not server and not newserver:
3752 newserver = DEFAULT_SERVER
3753 if newserver:
3754 newserver = gclient_utils.UpgradeToHttps(newserver)
3755 if newserver != server:
3756 RunGit(['config', 'rietveld.server', newserver])
3757
3758 def SetProperty(initial, caption, name, is_url):
3759 prompt = caption
3760 if initial:
3761 prompt += ' ("x" to clear) [%s]' % initial
3762 new_val = ask_for_data(prompt + ':')
3763 if new_val == 'x':
3764 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3765 elif new_val:
3766 if is_url:
3767 new_val = gclient_utils.UpgradeToHttps(new_val)
3768 if new_val != initial:
3769 RunGit(['config', 'rietveld.' + name, new_val])
3770
3771 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3772 SetProperty(settings.GetDefaultPrivateFlag(),
3773 'Private flag (rietveld only)', 'private', False)
3774 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3775 'tree-status-url', False)
3776 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3777 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3778 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3779 'run-post-upload-hook', False)
3780
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003781
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003782class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003783 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003784
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003785 _GOOGLESOURCE = 'googlesource.com'
3786
3787 def __init__(self):
3788 # Cached list of [host, identity, source], where source is either
3789 # .gitcookies or .netrc.
3790 self._all_hosts = None
3791
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003792 def ensure_configured_gitcookies(self):
3793 """Runs checks and suggests fixes to make git use .gitcookies from default
3794 path."""
3795 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3796 configured_path = RunGitSilent(
3797 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003798 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003799 if configured_path:
3800 self._ensure_default_gitcookies_path(configured_path, default)
3801 else:
3802 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003803
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003804 @staticmethod
3805 def _ensure_default_gitcookies_path(configured_path, default_path):
3806 assert configured_path
3807 if configured_path == default_path:
3808 print('git is already configured to use your .gitcookies from %s' %
3809 configured_path)
3810 return
3811
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003812 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003813 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3814 (configured_path, default_path))
3815
3816 if not os.path.exists(configured_path):
3817 print('However, your configured .gitcookies file is missing.')
3818 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3819 action='reconfigure')
3820 RunGit(['config', '--global', 'http.cookiefile', default_path])
3821 return
3822
3823 if os.path.exists(default_path):
3824 print('WARNING: default .gitcookies file already exists %s' %
3825 default_path)
3826 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3827 default_path)
3828
3829 confirm_or_exit('Move existing .gitcookies to default location?',
3830 action='move')
3831 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003832 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003833 print('Moved and reconfigured git to use .gitcookies from %s' %
3834 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003835
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003836 @staticmethod
3837 def _configure_gitcookies_path(default_path):
3838 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3839 if os.path.exists(netrc_path):
3840 print('You seem to be using outdated .netrc for git credentials: %s' %
3841 netrc_path)
3842 print('This tool will guide you through setting up recommended '
3843 '.gitcookies store for git credentials.\n'
3844 '\n'
3845 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3846 ' git config --global --unset http.cookiefile\n'
3847 ' mv %s %s.backup\n\n' % (default_path, default_path))
3848 confirm_or_exit(action='setup .gitcookies')
3849 RunGit(['config', '--global', 'http.cookiefile', default_path])
3850 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003851
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003852 def get_hosts_with_creds(self, include_netrc=False):
3853 if self._all_hosts is None:
3854 a = gerrit_util.CookiesAuthenticator()
3855 self._all_hosts = [
3856 (h, u, s)
3857 for h, u, s in itertools.chain(
3858 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3859 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3860 )
3861 if h.endswith(self._GOOGLESOURCE)
3862 ]
3863
3864 if include_netrc:
3865 return self._all_hosts
3866 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3867
3868 def print_current_creds(self, include_netrc=False):
3869 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3870 if not hosts:
3871 print('No Git/Gerrit credentials found')
3872 return
3873 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3874 header = [('Host', 'User', 'Which file'),
3875 ['=' * l for l in lengths]]
3876 for row in (header + hosts):
3877 print('\t'.join((('%%+%ds' % l) % s)
3878 for l, s in zip(lengths, row)))
3879
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003880 @staticmethod
3881 def _parse_identity(identity):
3882 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003883 # Special case: users whose ldaps contain ".", which are generally not
3884 # distinguishable from sub-domains. But we do know typical domains:
3885 if identity.endswith('.chromium.org'):
3886 domain = 'chromium.org'
3887 username = identity[:-len('.chromium.org')]
3888 else:
3889 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003890 if username.startswith('git-'):
3891 username = username[len('git-'):]
3892 return username, domain
3893
3894 def _get_usernames_of_domain(self, domain):
3895 """Returns list of usernames referenced by .gitcookies in a given domain."""
3896 identities_by_domain = {}
3897 for _, identity, _ in self.get_hosts_with_creds():
3898 username, domain = self._parse_identity(identity)
3899 identities_by_domain.setdefault(domain, []).append(username)
3900 return identities_by_domain.get(domain)
3901
3902 def _canonical_git_googlesource_host(self, host):
3903 """Normalizes Gerrit hosts (with '-review') to Git host."""
3904 assert host.endswith(self._GOOGLESOURCE)
3905 # Prefix doesn't include '.' at the end.
3906 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3907 if prefix.endswith('-review'):
3908 prefix = prefix[:-len('-review')]
3909 return prefix + '.' + self._GOOGLESOURCE
3910
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003911 def _canonical_gerrit_googlesource_host(self, host):
3912 git_host = self._canonical_git_googlesource_host(host)
3913 prefix = git_host.split('.', 1)[0]
3914 return prefix + '-review.' + self._GOOGLESOURCE
3915
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003916 def _get_counterpart_host(self, host):
3917 assert host.endswith(self._GOOGLESOURCE)
3918 git = self._canonical_git_googlesource_host(host)
3919 gerrit = self._canonical_gerrit_googlesource_host(git)
3920 return git if gerrit == host else gerrit
3921
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003922 def has_generic_host(self):
3923 """Returns whether generic .googlesource.com has been configured.
3924
3925 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3926 """
3927 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3928 if host == '.' + self._GOOGLESOURCE:
3929 return True
3930 return False
3931
3932 def _get_git_gerrit_identity_pairs(self):
3933 """Returns map from canonic host to pair of identities (Git, Gerrit).
3934
3935 One of identities might be None, meaning not configured.
3936 """
3937 host_to_identity_pairs = {}
3938 for host, identity, _ in self.get_hosts_with_creds():
3939 canonical = self._canonical_git_googlesource_host(host)
3940 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3941 idx = 0 if canonical == host else 1
3942 pair[idx] = identity
3943 return host_to_identity_pairs
3944
3945 def get_partially_configured_hosts(self):
3946 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003947 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3948 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3949 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003950
3951 def get_conflicting_hosts(self):
3952 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003953 host
3954 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003955 if None not in (i1, i2) and i1 != i2)
3956
3957 def get_duplicated_hosts(self):
3958 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3959 return set(host for host, count in counters.iteritems() if count > 1)
3960
3961 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3962 'chromium.googlesource.com': 'chromium.org',
3963 'chrome-internal.googlesource.com': 'google.com',
3964 }
3965
3966 def get_hosts_with_wrong_identities(self):
3967 """Finds hosts which **likely** reference wrong identities.
3968
3969 Note: skips hosts which have conflicting identities for Git and Gerrit.
3970 """
3971 hosts = set()
3972 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3973 pair = self._get_git_gerrit_identity_pairs().get(host)
3974 if pair and pair[0] == pair[1]:
3975 _, domain = self._parse_identity(pair[0])
3976 if domain != expected:
3977 hosts.add(host)
3978 return hosts
3979
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003980 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003981 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003982 hosts = sorted(hosts)
3983 assert hosts
3984 if extra_column_func is None:
3985 extras = [''] * len(hosts)
3986 else:
3987 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003988 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3989 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003990 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003991 lines.append(tmpl % he)
3992 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003993
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003994 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003995 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003996 yield ('.googlesource.com wildcard record detected',
3997 ['Chrome Infrastructure team recommends to list full host names '
3998 'explicitly.'],
3999 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004000
4001 dups = self.get_duplicated_hosts()
4002 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004003 yield ('The following hosts were defined twice',
4004 self._format_hosts(dups),
4005 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004006
4007 partial = self.get_partially_configured_hosts()
4008 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004009 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
4010 'These hosts are missing',
4011 self._format_hosts(partial, lambda host: 'but %s defined' %
4012 self._get_counterpart_host(host)),
4013 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004014
4015 conflicting = self.get_conflicting_hosts()
4016 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004017 yield ('The following Git hosts have differing credentials from their '
4018 'Gerrit counterparts',
4019 self._format_hosts(conflicting, lambda host: '%s vs %s' %
4020 tuple(self._get_git_gerrit_identity_pairs()[host])),
4021 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004022
4023 wrong = self.get_hosts_with_wrong_identities()
4024 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004025 yield ('These hosts likely use wrong identity',
4026 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
4027 (self._get_git_gerrit_identity_pairs()[host][0],
4028 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
4029 wrong)
4030
4031 def find_and_report_problems(self):
4032 """Returns True if there was at least one problem, else False."""
4033 found = False
4034 bad_hosts = set()
4035 for title, sublines, hosts in self._find_problems():
4036 if not found:
4037 found = True
4038 print('\n\n.gitcookies problem report:\n')
4039 bad_hosts.update(hosts or [])
4040 print(' %s%s' % (title , (':' if sublines else '')))
4041 if sublines:
4042 print()
4043 print(' %s' % '\n '.join(sublines))
4044 print()
4045
4046 if bad_hosts:
4047 assert found
4048 print(' You can manually remove corresponding lines in your %s file and '
4049 'visit the following URLs with correct account to generate '
4050 'correct credential lines:\n' %
4051 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4052 print(' %s' % '\n '.join(sorted(set(
4053 gerrit_util.CookiesAuthenticator().get_new_password_url(
4054 self._canonical_git_googlesource_host(host))
4055 for host in bad_hosts
4056 ))))
4057 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004058
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004059
4060def CMDcreds_check(parser, args):
4061 """Checks credentials and suggests changes."""
4062 _, _ = parser.parse_args(args)
4063
4064 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004065 DieWithError(
4066 'This command is not designed for GCE, are you on a bot?\n'
4067 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004068
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004069 checker = _GitCookiesChecker()
4070 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004071
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004072 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004073 checker.print_current_creds(include_netrc=True)
4074
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004075 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004076 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004077 return 0
4078 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004079
4080
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004081@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004082def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004083 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004085 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004086 # TODO(tandrii): remove this once we switch to Gerrit.
4087 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004088 parser.add_option('--activate-update', action='store_true',
4089 help='activate auto-updating [rietveld] section in '
4090 '.git/config')
4091 parser.add_option('--deactivate-update', action='store_true',
4092 help='deactivate auto-updating [rietveld] section in '
4093 '.git/config')
4094 options, args = parser.parse_args(args)
4095
4096 if options.deactivate_update:
4097 RunGit(['config', 'rietveld.autoupdate', 'false'])
4098 return
4099
4100 if options.activate_update:
4101 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4102 return
4103
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004104 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004105 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004106 return 0
4107
4108 url = args[0]
4109 if not url.endswith('codereview.settings'):
4110 url = os.path.join(url, 'codereview.settings')
4111
4112 # Load code review settings and download hooks (if available).
4113 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4114 return 0
4115
4116
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004117def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004118 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004119 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4120 branch = ShortBranchName(branchref)
4121 _, args = parser.parse_args(args)
4122 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004124 return RunGit(['config', 'branch.%s.base-url' % branch],
4125 error_ok=False).strip()
4126 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004127 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004128 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4129 error_ok=False).strip()
4130
4131
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004132def color_for_status(status):
4133 """Maps a Changelist status to color, for CMDstatus and other tools."""
4134 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004135 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004136 'waiting': Fore.BLUE,
4137 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004138 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004139 'lgtm': Fore.GREEN,
4140 'commit': Fore.MAGENTA,
4141 'closed': Fore.CYAN,
4142 'error': Fore.WHITE,
4143 }.get(status, Fore.WHITE)
4144
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004145
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004146def get_cl_statuses(changes, fine_grained, max_processes=None):
4147 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004148
4149 If fine_grained is true, this will fetch CL statuses from the server.
4150 Otherwise, simply indicate if there's a matching url for the given branches.
4151
4152 If max_processes is specified, it is used as the maximum number of processes
4153 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4154 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004155
4156 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004157 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004158 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004159 upload.verbosity = 0
4160
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004161 if not changes:
4162 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004163
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004164 if not fine_grained:
4165 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004166 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004167 for cl in changes:
4168 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004169 return
4170
4171 # First, sort out authentication issues.
4172 logging.debug('ensuring credentials exist')
4173 for cl in changes:
4174 cl.EnsureAuthenticated(force=False, refresh=True)
4175
4176 def fetch(cl):
4177 try:
4178 return (cl, cl.GetStatus())
4179 except:
4180 # See http://crbug.com/629863.
4181 logging.exception('failed to fetch status for %s:', cl)
4182 raise
4183
4184 threads_count = len(changes)
4185 if max_processes:
4186 threads_count = max(1, min(threads_count, max_processes))
4187 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4188
4189 pool = ThreadPool(threads_count)
4190 fetched_cls = set()
4191 try:
4192 it = pool.imap_unordered(fetch, changes).__iter__()
4193 while True:
4194 try:
4195 cl, status = it.next(timeout=5)
4196 except multiprocessing.TimeoutError:
4197 break
4198 fetched_cls.add(cl)
4199 yield cl, status
4200 finally:
4201 pool.close()
4202
4203 # Add any branches that failed to fetch.
4204 for cl in set(changes) - fetched_cls:
4205 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004206
rmistry@google.com2dd99862015-06-22 12:22:18 +00004207
4208def upload_branch_deps(cl, args):
4209 """Uploads CLs of local branches that are dependents of the current branch.
4210
4211 If the local branch dependency tree looks like:
4212 test1 -> test2.1 -> test3.1
4213 -> test3.2
4214 -> test2.2 -> test3.3
4215
4216 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4217 run on the dependent branches in this order:
4218 test2.1, test3.1, test3.2, test2.2, test3.3
4219
4220 Note: This function does not rebase your local dependent branches. Use it when
4221 you make a change to the parent branch that will not conflict with its
4222 dependent branches, and you would like their dependencies updated in
4223 Rietveld.
4224 """
4225 if git_common.is_dirty_git_tree('upload-branch-deps'):
4226 return 1
4227
4228 root_branch = cl.GetBranch()
4229 if root_branch is None:
4230 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4231 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004232 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004233 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4234 'patchset dependencies without an uploaded CL.')
4235
4236 branches = RunGit(['for-each-ref',
4237 '--format=%(refname:short) %(upstream:short)',
4238 'refs/heads'])
4239 if not branches:
4240 print('No local branches found.')
4241 return 0
4242
4243 # Create a dictionary of all local branches to the branches that are dependent
4244 # on it.
4245 tracked_to_dependents = collections.defaultdict(list)
4246 for b in branches.splitlines():
4247 tokens = b.split()
4248 if len(tokens) == 2:
4249 branch_name, tracked = tokens
4250 tracked_to_dependents[tracked].append(branch_name)
4251
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print()
4253 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004254 dependents = []
4255 def traverse_dependents_preorder(branch, padding=''):
4256 dependents_to_process = tracked_to_dependents.get(branch, [])
4257 padding += ' '
4258 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004259 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004260 dependents.append(dependent)
4261 traverse_dependents_preorder(dependent, padding)
4262 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004264
4265 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004266 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004267 return 0
4268
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004269 confirm_or_exit('This command will checkout all dependent branches and run '
4270 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004271
andybons@chromium.org962f9462016-02-03 20:00:42 +00004272 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004273 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004274 args.extend(['-t', 'Updated patchset dependency'])
4275
rmistry@google.com2dd99862015-06-22 12:22:18 +00004276 # Record all dependents that failed to upload.
4277 failures = {}
4278 # Go through all dependents, checkout the branch and upload.
4279 try:
4280 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004281 print()
4282 print('--------------------------------------')
4283 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004284 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004285 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004286 try:
4287 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004288 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004289 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004290 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004291 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004292 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004293 finally:
4294 # Swap back to the original root branch.
4295 RunGit(['checkout', '-q', root_branch])
4296
vapiera7fbd5a2016-06-16 09:17:49 -07004297 print()
4298 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004299 for dependent_branch in dependents:
4300 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004301 print(' %s : %s' % (dependent_branch, upload_status))
4302 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004303
4304 return 0
4305
4306
kmarshall3bff56b2016-06-06 18:31:47 -07004307def CMDarchive(parser, args):
4308 """Archives and deletes branches associated with closed changelists."""
4309 parser.add_option(
4310 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004311 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004312 parser.add_option(
4313 '-f', '--force', action='store_true',
4314 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004315 parser.add_option(
4316 '-d', '--dry-run', action='store_true',
4317 help='Skip the branch tagging and removal steps.')
4318 parser.add_option(
4319 '-t', '--notags', action='store_true',
4320 help='Do not tag archived branches. '
4321 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004322
4323 auth.add_auth_options(parser)
4324 options, args = parser.parse_args(args)
4325 if args:
4326 parser.error('Unsupported args: %s' % ' '.join(args))
4327 auth_config = auth.extract_auth_config_from_options(options)
4328
4329 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4330 if not branches:
4331 return 0
4332
vapiera7fbd5a2016-06-16 09:17:49 -07004333 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004334 changes = [Changelist(branchref=b, auth_config=auth_config)
4335 for b in branches.splitlines()]
4336 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4337 statuses = get_cl_statuses(changes,
4338 fine_grained=True,
4339 max_processes=options.maxjobs)
4340 proposal = [(cl.GetBranch(),
4341 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4342 for cl, status in statuses
4343 if status == 'closed']
4344 proposal.sort()
4345
4346 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004347 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004348 return 0
4349
4350 current_branch = GetCurrentBranch()
4351
vapiera7fbd5a2016-06-16 09:17:49 -07004352 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004353 if options.notags:
4354 for next_item in proposal:
4355 print(' ' + next_item[0])
4356 else:
4357 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4358 for next_item in proposal:
4359 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004360
kmarshall9249e012016-08-23 12:02:16 -07004361 # Quit now on precondition failure or if instructed by the user, either
4362 # via an interactive prompt or by command line flags.
4363 if options.dry_run:
4364 print('\nNo changes were made (dry run).\n')
4365 return 0
4366 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004367 print('You are currently on a branch \'%s\' which is associated with a '
4368 'closed codereview issue, so archive cannot proceed. Please '
4369 'checkout another branch and run this command again.' %
4370 current_branch)
4371 return 1
kmarshall9249e012016-08-23 12:02:16 -07004372 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004373 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4374 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004375 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004376 return 1
4377
4378 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004379 if not options.notags:
4380 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004381 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004382
vapiera7fbd5a2016-06-16 09:17:49 -07004383 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004384
4385 return 0
4386
4387
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004388def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004389 """Show status of changelists.
4390
4391 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004392 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004393 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004394 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004395 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004396 - Magenta in the commit queue
4397 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004398 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004399
4400 Also see 'git cl comments'.
4401 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004402 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004403 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004404 parser.add_option('-f', '--fast', action='store_true',
4405 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004406 parser.add_option(
4407 '-j', '--maxjobs', action='store', type=int,
4408 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004409
4410 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004411 _add_codereview_issue_select_options(
4412 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004413 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004414 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004415 if args:
4416 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004417 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004418
iannuccie53c9352016-08-17 14:40:40 -07004419 if options.issue is not None and not options.field:
4420 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004421
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004422 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004423 cl = Changelist(auth_config=auth_config, issue=options.issue,
4424 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004425 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004426 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427 elif options.field == 'id':
4428 issueid = cl.GetIssue()
4429 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004430 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004432 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004435 elif options.field == 'status':
4436 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 elif options.field == 'url':
4438 url = cl.GetIssueURL()
4439 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004440 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004441 return 0
4442
4443 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4444 if not branches:
4445 print('No local branch found.')
4446 return 0
4447
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004448 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004449 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004450 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004451 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004452 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004453 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004454 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004455
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004456 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004457 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4458 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4459 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004460 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004461 c, status = output.next()
4462 branch_statuses[c.GetBranch()] = status
4463 status = branch_statuses.pop(branch)
4464 url = cl.GetIssueURL()
4465 if url and (not status or status == 'error'):
4466 # The issue probably doesn't exist anymore.
4467 url += ' (broken)'
4468
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004469 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004470 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004471 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004472 color = ''
4473 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004474 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004475 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004476 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004477 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004478
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004479
4480 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004481 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004482 print('Current branch: %s' % branch)
4483 for cl in changes:
4484 if cl.GetBranch() == branch:
4485 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004486 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004487 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004488 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004489 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004490 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004491 print('Issue description:')
4492 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493 return 0
4494
4495
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004496def colorize_CMDstatus_doc():
4497 """To be called once in main() to add colors to git cl status help."""
4498 colors = [i for i in dir(Fore) if i[0].isupper()]
4499
4500 def colorize_line(line):
4501 for color in colors:
4502 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004503 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004504 indent = len(line) - len(line.lstrip(' ')) + 1
4505 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4506 return line
4507
4508 lines = CMDstatus.__doc__.splitlines()
4509 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4510
4511
phajdan.jre328cf92016-08-22 04:12:17 -07004512def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004513 if path == '-':
4514 json.dump(contents, sys.stdout)
4515 else:
4516 with open(path, 'w') as f:
4517 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004518
4519
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004520@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004521def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004522 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523
4524 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004525 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004526 parser.add_option('-r', '--reverse', action='store_true',
4527 help='Lookup the branch(es) for the specified issues. If '
4528 'no issues are specified, all branches with mapped '
4529 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004530 parser.add_option('--json',
4531 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004532 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004533 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004534 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004535
dnj@chromium.org406c4402015-03-03 17:22:28 +00004536 if options.reverse:
4537 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004538 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004539 # Reverse issue lookup.
4540 issue_branch_map = {}
4541 for branch in branches:
4542 cl = Changelist(branchref=branch)
4543 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4544 if not args:
4545 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004546 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004547 for issue in args:
4548 if not issue:
4549 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004550 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004551 print('Branch for issue number %s: %s' % (
4552 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004553 if options.json:
4554 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004555 return 0
4556
4557 if len(args) > 0:
4558 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4559 if not issue.valid:
4560 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4561 'or no argument to list it.\n'
4562 'Maybe you want to run git cl status?')
4563 cl = Changelist(codereview=issue.codereview)
4564 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004565 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004566 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004567 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4568 if options.json:
4569 write_json(options.json, {
4570 'issue': cl.GetIssue(),
4571 'issue_url': cl.GetIssueURL(),
4572 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004573 return 0
4574
4575
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004576def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004577 """Shows or posts review comments for any changelist."""
4578 parser.add_option('-a', '--add-comment', dest='comment',
4579 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004580 parser.add_option('-i', '--issue', dest='issue',
4581 help='review issue id (defaults to current issue). '
4582 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004583 parser.add_option('-m', '--machine-readable', dest='readable',
4584 action='store_false', default=True,
4585 help='output comments in a format compatible with '
4586 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004587 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004588 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004589 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004590 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004591 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004592 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004593 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004594
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004595 issue = None
4596 if options.issue:
4597 try:
4598 issue = int(options.issue)
4599 except ValueError:
4600 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004601 if not options.forced_codereview:
4602 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004603
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004604 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004605 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004606 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004607
4608 if options.comment:
4609 cl.AddComment(options.comment)
4610 return 0
4611
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004612 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4613 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004614 for comment in summary:
4615 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004616 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004617 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004618 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004619 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004620 color = Fore.MAGENTA
4621 else:
4622 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004623 print('\n%s%s %s%s\n%s' % (
4624 color,
4625 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4626 comment.sender,
4627 Fore.RESET,
4628 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4629
smut@google.comc85ac942015-09-15 16:34:43 +00004630 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004631 def pre_serialize(c):
4632 dct = c.__dict__.copy()
4633 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4634 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004635 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004636 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004637 return 0
4638
4639
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004640@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004641def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004642 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004643 parser.add_option('-d', '--display', action='store_true',
4644 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004645 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004646 help='New description to set for this issue (- for stdin, '
4647 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004648 parser.add_option('-f', '--force', action='store_true',
4649 help='Delete any unpublished Gerrit edits for this issue '
4650 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004651
4652 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004653 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004654 options, args = parser.parse_args(args)
4655 _process_codereview_select_options(parser, options)
4656
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004657 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004658 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004659 target_issue_arg = ParseIssueNumberArgument(args[0],
4660 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004661 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004662 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004663
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004664 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004665
martiniss6eda05f2016-06-30 10:18:35 -07004666 kwargs = {
4667 'auth_config': auth_config,
4668 'codereview': options.forced_codereview,
4669 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004670 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004671 if target_issue_arg:
4672 kwargs['issue'] = target_issue_arg.issue
4673 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004674 if target_issue_arg.codereview and not options.forced_codereview:
4675 detected_codereview_from_url = True
4676 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004677
4678 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004679 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004680 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004681 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004682
4683 if detected_codereview_from_url:
4684 logging.info('canonical issue/change URL: %s (type: %s)\n',
4685 cl.GetIssueURL(), target_issue_arg.codereview)
4686
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004687 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004688
smut@google.com34fb6b12015-07-13 20:03:26 +00004689 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004690 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004691 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004692
4693 if options.new_description:
4694 text = options.new_description
4695 if text == '-':
4696 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004697 elif text == '+':
4698 base_branch = cl.GetCommonAncestorWithUpstream()
4699 change = cl.GetChange(base_branch, None, local_description=True)
4700 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004701
4702 description.set_description(text)
4703 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004704 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004705
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004706 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004707 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004708 return 0
4709
4710
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004711def CreateDescriptionFromLog(args):
4712 """Pulls out the commit log to use as a base for the CL description."""
4713 log_args = []
4714 if len(args) == 1 and not args[0].endswith('.'):
4715 log_args = [args[0] + '..']
4716 elif len(args) == 1 and args[0].endswith('...'):
4717 log_args = [args[0][:-1]]
4718 elif len(args) == 2:
4719 log_args = [args[0] + '..' + args[1]]
4720 else:
4721 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004722 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004723
4724
thestig@chromium.org44202a22014-03-11 19:22:18 +00004725def CMDlint(parser, args):
4726 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004727 parser.add_option('--filter', action='append', metavar='-x,+y',
4728 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004729 auth.add_auth_options(parser)
4730 options, args = parser.parse_args(args)
4731 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004732
4733 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004734 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004735 try:
4736 import cpplint
4737 import cpplint_chromium
4738 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004739 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004740 return 1
4741
4742 # Change the current working directory before calling lint so that it
4743 # shows the correct base.
4744 previous_cwd = os.getcwd()
4745 os.chdir(settings.GetRoot())
4746 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004747 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004748 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4749 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004750 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004751 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004752 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004753
4754 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004755 command = args + files
4756 if options.filter:
4757 command = ['--filter=' + ','.join(options.filter)] + command
4758 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004759
4760 white_regex = re.compile(settings.GetLintRegex())
4761 black_regex = re.compile(settings.GetLintIgnoreRegex())
4762 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4763 for filename in filenames:
4764 if white_regex.match(filename):
4765 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004766 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004767 else:
4768 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4769 extra_check_functions)
4770 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004771 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004772 finally:
4773 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004774 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004775 if cpplint._cpplint_state.error_count != 0:
4776 return 1
4777 return 0
4778
4779
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004780def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004781 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004782 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004783 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004784 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004785 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004786 parser.add_option('--all', action='store_true',
4787 help='Run checks against all files, not just modified ones')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004788 auth.add_auth_options(parser)
4789 options, args = parser.parse_args(args)
4790 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791
sbc@chromium.org71437c02015-04-09 19:29:40 +00004792 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004793 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004794 return 1
4795
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004796 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797 if args:
4798 base_branch = args[0]
4799 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004800 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004801 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004802
Aaron Gable8076c282017-11-29 14:39:41 -08004803 if options.all:
4804 base_change = cl.GetChange(base_branch, None)
4805 files = [('M', f) for f in base_change.AllFiles()]
4806 change = presubmit_support.GitChange(
4807 base_change.Name(),
4808 base_change.FullDescriptionText(),
4809 base_change.RepositoryRoot(),
4810 files,
4811 base_change.issue,
4812 base_change.patchset,
4813 base_change.author_email,
4814 base_change._upstream)
4815 else:
4816 change = cl.GetChange(base_branch, None)
4817
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004818 cl.RunHook(
4819 committing=not options.upload,
4820 may_prompt=False,
4821 verbose=options.verbose,
Aaron Gable8076c282017-11-29 14:39:41 -08004822 change=change)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004823 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004824
4825
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004826def GenerateGerritChangeId(message):
4827 """Returns Ixxxxxx...xxx change id.
4828
4829 Works the same way as
4830 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4831 but can be called on demand on all platforms.
4832
4833 The basic idea is to generate git hash of a state of the tree, original commit
4834 message, author/committer info and timestamps.
4835 """
4836 lines = []
4837 tree_hash = RunGitSilent(['write-tree'])
4838 lines.append('tree %s' % tree_hash.strip())
4839 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4840 if code == 0:
4841 lines.append('parent %s' % parent.strip())
4842 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4843 lines.append('author %s' % author.strip())
4844 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4845 lines.append('committer %s' % committer.strip())
4846 lines.append('')
4847 # Note: Gerrit's commit-hook actually cleans message of some lines and
4848 # whitespace. This code is not doing this, but it clearly won't decrease
4849 # entropy.
4850 lines.append(message)
4851 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4852 stdin='\n'.join(lines))
4853 return 'I%s' % change_hash.strip()
4854
4855
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004856def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004857 """Computes the remote branch ref to use for the CL.
4858
4859 Args:
4860 remote (str): The git remote for the CL.
4861 remote_branch (str): The git remote branch for the CL.
4862 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004863 """
4864 if not (remote and remote_branch):
4865 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004866
wittman@chromium.org455dc922015-01-26 20:15:50 +00004867 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004868 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004869 # refs, which are then translated into the remote full symbolic refs
4870 # below.
4871 if '/' not in target_branch:
4872 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4873 else:
4874 prefix_replacements = (
4875 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4876 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4877 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4878 )
4879 match = None
4880 for regex, replacement in prefix_replacements:
4881 match = re.search(regex, target_branch)
4882 if match:
4883 remote_branch = target_branch.replace(match.group(0), replacement)
4884 break
4885 if not match:
4886 # This is a branch path but not one we recognize; use as-is.
4887 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004888 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4889 # Handle the refs that need to land in different refs.
4890 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004891
wittman@chromium.org455dc922015-01-26 20:15:50 +00004892 # Create the true path to the remote branch.
4893 # Does the following translation:
4894 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4895 # * refs/remotes/origin/master -> refs/heads/master
4896 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4897 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4898 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4899 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4900 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4901 'refs/heads/')
4902 elif remote_branch.startswith('refs/remotes/branch-heads'):
4903 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004904
wittman@chromium.org455dc922015-01-26 20:15:50 +00004905 return remote_branch
4906
4907
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004908def cleanup_list(l):
4909 """Fixes a list so that comma separated items are put as individual items.
4910
4911 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4912 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4913 """
4914 items = sum((i.split(',') for i in l), [])
4915 stripped_items = (i.strip() for i in items)
4916 return sorted(filter(None, stripped_items))
4917
4918
Aaron Gable4db38df2017-11-03 14:59:07 -07004919@subcommand.usage('[flags]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004920def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004921 """Uploads the current changelist to codereview.
4922
4923 Can skip dependency patchset uploads for a branch by running:
4924 git config branch.branch_name.skip-deps-uploads True
4925 To unset run:
4926 git config --unset branch.branch_name.skip-deps-uploads
4927 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004928
4929 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4930 a bug number, this bug number is automatically populated in the CL
4931 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004932
4933 If subject contains text in square brackets or has "<text>: " prefix, such
4934 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4935 [git-cl] add support for hashtags
4936 Foo bar: implement foo
4937 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004938 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004939 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4940 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004941 parser.add_option('--bypass-watchlists', action='store_true',
4942 dest='bypass_watchlists',
4943 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004944 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004945 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004946 parser.add_option('--message', '-m', dest='message',
4947 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004948 parser.add_option('-b', '--bug',
4949 help='pre-populate the bug number(s) for this issue. '
4950 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004951 parser.add_option('--message-file', dest='message_file',
4952 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004953 parser.add_option('--title', '-t', dest='title',
4954 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004955 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004956 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004957 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004958 parser.add_option('--tbrs',
4959 action='append', default=[],
4960 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004961 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004962 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004963 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004964 parser.add_option('--hashtag', dest='hashtags',
4965 action='append', default=[],
4966 help=('Gerrit hashtag for new CL; '
4967 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004968 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004969 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004970 parser.add_option('--emulate_svn_auto_props',
4971 '--emulate-svn-auto-props',
4972 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004973 dest="emulate_svn_auto_props",
4974 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004975 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004976 help='tell the commit queue to commit this patchset; '
4977 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004978 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004979 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004980 metavar='TARGET',
4981 help='Apply CL to remote ref TARGET. ' +
4982 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004983 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004984 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004985 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004986 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004987 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004988 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004989 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4990 const='TBR', help='add a set of OWNERS to TBR')
4991 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4992 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004993 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4994 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004995 help='Send the patchset to do a CQ dry run right after '
4996 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004997 parser.add_option('--dependencies', action='store_true',
4998 help='Uploads CLs of all the local branches that depend on '
4999 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00005000
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005001 # TODO: remove Rietveld flags
5002 parser.add_option('--private', action='store_true',
5003 help='set the review private (rietveld only)')
5004 parser.add_option('--email', default=None,
5005 help='email address to use to connect to Rietveld')
5006
rmistry@google.com2dd99862015-06-22 12:22:18 +00005007 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00005008 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005009 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005010 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005011 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005012 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005013 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005014
sbc@chromium.org71437c02015-04-09 19:29:40 +00005015 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005016 return 1
5017
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005018 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005019 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005020 options.cc = cleanup_list(options.cc)
5021
tandriib80458a2016-06-23 12:20:07 -07005022 if options.message_file:
5023 if options.message:
5024 parser.error('only one of --message and --message-file allowed.')
5025 options.message = gclient_utils.FileRead(options.message_file)
5026 options.message_file = None
5027
tandrii4d0545a2016-07-06 03:56:49 -07005028 if options.cq_dry_run and options.use_commit_queue:
5029 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5030
Aaron Gableedbc4132017-09-11 13:22:28 -07005031 if options.use_commit_queue:
5032 options.send_mail = True
5033
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005034 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5035 settings.GetIsGerrit()
5036
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005037 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005038 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005039
5040
Francois Dorayd42c6812017-05-30 15:10:20 -04005041@subcommand.usage('--description=<description file>')
5042def CMDsplit(parser, args):
5043 """Splits a branch into smaller branches and uploads CLs.
5044
5045 Creates a branch and uploads a CL for each group of files modified in the
5046 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005047 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005048 the shared OWNERS file.
5049 """
5050 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005051 help="A text file containing a CL description in which "
5052 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005053 parser.add_option("-c", "--comment", dest="comment_file",
5054 help="A text file containing a CL comment.")
5055 options, _ = parser.parse_args(args)
5056
5057 if not options.description_file:
5058 parser.error('No --description flag specified.')
5059
5060 def WrappedCMDupload(args):
5061 return CMDupload(OptionParser(), args)
5062
5063 return split_cl.SplitCl(options.description_file, options.comment_file,
5064 Changelist, WrappedCMDupload)
5065
5066
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005067@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005068def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005069 """DEPRECATED: Used to commit the current changelist via git-svn."""
5070 message = ('git-cl no longer supports committing to SVN repositories via '
5071 'git-svn. You probably want to use `git cl land` instead.')
5072 print(message)
5073 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005074
5075
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005076# Two special branches used by git cl land.
5077MERGE_BRANCH = 'git-cl-commit'
5078CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5079
5080
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005081@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005082def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005083 """Commits the current changelist via git.
5084
5085 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5086 upstream and closes the issue automatically and atomically.
5087
5088 Otherwise (in case of Rietveld):
5089 Squashes branch into a single commit.
5090 Updates commit message with metadata (e.g. pointer to review).
5091 Pushes the code upstream.
5092 Updates review and closes.
5093 """
5094 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5095 help='bypass upload presubmit hook')
5096 parser.add_option('-m', dest='message',
5097 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005098 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005099 help="force yes to questions (don't prompt)")
5100 parser.add_option('-c', dest='contributor',
5101 help="external contributor for patch (appended to " +
5102 "description and used as author for git). Should be " +
5103 "formatted as 'First Last <email@example.com>'")
5104 add_git_similarity(parser)
5105 auth.add_auth_options(parser)
5106 (options, args) = parser.parse_args(args)
5107 auth_config = auth.extract_auth_config_from_options(options)
5108
5109 cl = Changelist(auth_config=auth_config)
5110
5111 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5112 if cl.IsGerrit():
5113 if options.message:
5114 # This could be implemented, but it requires sending a new patch to
5115 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5116 # Besides, Gerrit has the ability to change the commit message on submit
5117 # automatically, thus there is no need to support this option (so far?).
5118 parser.error('-m MESSAGE option is not supported for Gerrit.')
5119 if options.contributor:
5120 parser.error(
5121 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5122 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5123 'the contributor\'s "name <email>". If you can\'t upload such a '
5124 'commit for review, contact your repository admin and request'
5125 '"Forge-Author" permission.')
5126 if not cl.GetIssue():
5127 DieWithError('You must upload the change first to Gerrit.\n'
5128 ' If you would rather have `git cl land` upload '
5129 'automatically for you, see http://crbug.com/642759')
5130 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5131 options.verbose)
5132
5133 current = cl.GetBranch()
5134 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5135 if remote == '.':
5136 print()
5137 print('Attempting to push branch %r into another local branch!' % current)
5138 print()
5139 print('Either reparent this branch on top of origin/master:')
5140 print(' git reparent-branch --root')
5141 print()
5142 print('OR run `git rebase-update` if you think the parent branch is ')
5143 print('already committed.')
5144 print()
5145 print(' Current parent: %r' % upstream_branch)
5146 return 1
5147
5148 if not args:
5149 # Default to merging against our best guess of the upstream branch.
5150 args = [cl.GetUpstreamBranch()]
5151
5152 if options.contributor:
5153 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005154 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155 return 1
5156
5157 base_branch = args[0]
5158
5159 if git_common.is_dirty_git_tree('land'):
5160 return 1
5161
5162 # This rev-list syntax means "show all commits not in my branch that
5163 # are in base_branch".
5164 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5165 base_branch]).splitlines()
5166 if upstream_commits:
5167 print('Base branch "%s" has %d commits '
5168 'not in this branch.' % (base_branch, len(upstream_commits)))
5169 print('Run "git merge %s" before attempting to land.' % base_branch)
5170 return 1
5171
5172 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5173 if not options.bypass_hooks:
5174 author = None
5175 if options.contributor:
5176 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5177 hook_results = cl.RunHook(
5178 committing=True,
5179 may_prompt=not options.force,
5180 verbose=options.verbose,
5181 change=cl.GetChange(merge_base, author))
5182 if not hook_results.should_continue():
5183 return 1
5184
5185 # Check the tree status if the tree status URL is set.
5186 status = GetTreeStatus()
5187 if 'closed' == status:
5188 print('The tree is closed. Please wait for it to reopen. Use '
5189 '"git cl land --bypass-hooks" to commit on a closed tree.')
5190 return 1
5191 elif 'unknown' == status:
5192 print('Unable to determine tree status. Please verify manually and '
5193 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5194 return 1
5195
5196 change_desc = ChangeDescription(options.message)
5197 if not change_desc.description and cl.GetIssue():
5198 change_desc = ChangeDescription(cl.GetDescription())
5199
5200 if not change_desc.description:
5201 if not cl.GetIssue() and options.bypass_hooks:
5202 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5203 else:
5204 print('No description set.')
5205 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5206 return 1
5207
5208 # Keep a separate copy for the commit message, because the commit message
5209 # contains the link to the Rietveld issue, while the Rietveld message contains
5210 # the commit viewvc url.
5211 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005212 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005213 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005214
5215 commit_desc = ChangeDescription(change_desc.description)
5216 if cl.GetIssue():
5217 # Xcode won't linkify this URL unless there is a non-whitespace character
5218 # after it. Add a period on a new line to circumvent this. Also add a space
5219 # before the period to make sure that Gitiles continues to correctly resolve
5220 # the URL.
5221 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5222 if options.contributor:
5223 commit_desc.append_footer('Patch from %s.' % options.contributor)
5224
5225 print('Description:')
5226 print(commit_desc.description)
5227
5228 branches = [merge_base, cl.GetBranchRef()]
5229 if not options.force:
5230 print_stats(options.similarity, options.find_copies, branches)
5231
5232 # We want to squash all this branch's commits into one commit with the proper
5233 # description. We do this by doing a "reset --soft" to the base branch (which
5234 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005235 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005236 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5237 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5238 result = RunGitWithCode(showref_cmd)
5239 if result[0] == 0:
5240 RunGit(['branch', '-D', branch])
5241
5242 # We might be in a directory that's present in this branch but not in the
5243 # trunk. Move up to the top of the tree so that git commands that expect a
5244 # valid CWD won't fail after we check out the merge branch.
5245 rel_base_path = settings.GetRelativeRoot()
5246 if rel_base_path:
5247 os.chdir(rel_base_path)
5248
5249 # Stuff our change into the merge branch.
5250 # We wrap in a try...finally block so if anything goes wrong,
5251 # we clean up the branches.
5252 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005253 revision = None
5254 try:
5255 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5256 RunGit(['reset', '--soft', merge_base])
5257 if options.contributor:
5258 RunGit(
5259 [
5260 'commit', '--author', options.contributor,
5261 '-m', commit_desc.description,
5262 ])
5263 else:
5264 RunGit(['commit', '-m', commit_desc.description])
5265
5266 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5267 mirror = settings.GetGitMirror(remote)
5268 if mirror:
5269 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005270 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005271 else:
5272 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005273 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005274 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5275
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005276 retcode = PushToGitWithAutoRebase(
5277 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005278 if retcode == 0:
5279 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005280 if git_numberer_enabled:
5281 change_desc = ChangeDescription(
5282 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005283 except: # pylint: disable=bare-except
5284 if _IS_BEING_TESTED:
5285 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5286 + '-' * 30 + '8<' + '-' * 30)
5287 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5288 raise
5289 finally:
5290 # And then swap back to the original branch and clean up.
5291 RunGit(['checkout', '-q', cl.GetBranch()])
5292 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005293 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005294
5295 if not revision:
5296 print('Failed to push. If this persists, please file a bug.')
5297 return 1
5298
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005299 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005300 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005301 if viewvc_url and revision:
5302 change_desc.append_footer(
5303 'Committed: %s%s' % (viewvc_url, revision))
5304 elif revision:
5305 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005306 print('Closing issue '
5307 '(you may be prompted for your codereview password)...')
5308 cl.UpdateDescription(change_desc.description)
5309 cl.CloseIssue()
5310 props = cl.GetIssueProperties()
5311 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005312 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5313 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005314 if options.bypass_hooks:
5315 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5316 else:
5317 comment += ' (presubmit successful).'
5318 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5319
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005320 if os.path.isfile(POSTUPSTREAM_HOOK):
5321 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5322
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005323 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005324
5325
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005326def PushToGitWithAutoRebase(remote, branch, original_description,
5327 git_numberer_enabled, max_attempts=3):
5328 """Pushes current HEAD commit on top of remote's branch.
5329
5330 Attempts to fetch and autorebase on push failures.
5331 Adds git number footers on the fly.
5332
5333 Returns integer code from last command.
5334 """
5335 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5336 code = 0
5337 attempts_left = max_attempts
5338 while attempts_left:
5339 attempts_left -= 1
5340 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5341
5342 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5343 # If fetch fails, retry.
5344 print('Fetching %s/%s...' % (remote, branch))
5345 code, out = RunGitWithCode(
5346 ['retry', 'fetch', remote,
5347 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5348 if code:
5349 print('Fetch failed with exit code %d.' % code)
5350 print(out.strip())
5351 continue
5352
5353 print('Cherry-picking commit on top of latest %s' % branch)
5354 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5355 suppress_stderr=True)
5356 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5357 code, out = RunGitWithCode(['cherry-pick', cherry])
5358 if code:
5359 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5360 'the following files have merge conflicts:' %
5361 (branch, parent_hash))
Aaron Gable9219d352017-12-07 13:39:11 -08005362 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5363 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005364 print('Please rebase your patch and try again.')
5365 RunGitWithCode(['cherry-pick', '--abort'])
5366 break
5367
5368 commit_desc = ChangeDescription(original_description)
5369 if git_numberer_enabled:
5370 logging.debug('Adding git number footers')
5371 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5372 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5373 branch)
5374 # Ensure timestamps are monotonically increasing.
5375 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5376 _get_committer_timestamp('HEAD'))
5377 _git_amend_head(commit_desc.description, timestamp)
5378
5379 code, out = RunGitWithCode(
5380 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5381 print(out)
5382 if code == 0:
5383 break
5384 if IsFatalPushFailure(out):
5385 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005386 'user.email are correct and you have push access to the repo.\n'
5387 'Hint: run command below to diangose common Git/Gerrit credential '
5388 'problems:\n'
5389 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005390 break
5391 return code
5392
5393
5394def IsFatalPushFailure(push_stdout):
5395 """True if retrying push won't help."""
5396 return '(prohibited by Gerrit)' in push_stdout
5397
5398
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005399@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005400def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005401 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005402 parser.add_option('-b', dest='newbranch',
5403 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005404 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005405 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005406 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005407 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005408 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005409 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005410 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005411 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005412 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005413 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005414
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005415
5416 group = optparse.OptionGroup(
5417 parser,
5418 'Options for continuing work on the current issue uploaded from a '
5419 'different clone (e.g. different machine). Must be used independently '
5420 'from the other options. No issue number should be specified, and the '
5421 'branch must have an issue number associated with it')
5422 group.add_option('--reapply', action='store_true', dest='reapply',
5423 help='Reset the branch and reapply the issue.\n'
5424 'CAUTION: This will undo any local changes in this '
5425 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005426
5427 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005428 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005429 parser.add_option_group(group)
5430
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005431 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005432 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005433 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005434 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005435 auth_config = auth.extract_auth_config_from_options(options)
5436
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005437 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005438 if options.newbranch:
5439 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005440 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005441 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005442
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005443 cl = Changelist(auth_config=auth_config,
5444 codereview=options.forced_codereview)
5445 if not cl.GetIssue():
5446 parser.error('current branch must have an associated issue')
5447
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005448 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005449 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005450 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005451
5452 RunGit(['reset', '--hard', upstream])
5453 if options.pull:
5454 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005455
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005456 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5457 options.directory)
5458
5459 if len(args) != 1 or not args[0]:
5460 parser.error('Must specify issue number or url')
5461
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005462 target_issue_arg = ParseIssueNumberArgument(args[0],
5463 options.forced_codereview)
5464 if not target_issue_arg.valid:
5465 parser.error('invalid codereview url or CL id')
5466
5467 cl_kwargs = {
5468 'auth_config': auth_config,
5469 'codereview_host': target_issue_arg.hostname,
5470 'codereview': options.forced_codereview,
5471 }
5472 detected_codereview_from_url = False
5473 if target_issue_arg.codereview and not options.forced_codereview:
5474 detected_codereview_from_url = True
5475 cl_kwargs['codereview'] = target_issue_arg.codereview
5476 cl_kwargs['issue'] = target_issue_arg.issue
5477
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005478 # We don't want uncommitted changes mixed up with the patch.
5479 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005480 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005481
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005482 if options.newbranch:
5483 if options.force:
5484 RunGit(['branch', '-D', options.newbranch],
5485 stderr=subprocess2.PIPE, error_ok=True)
5486 RunGit(['new-branch', options.newbranch])
5487
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005488 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005489
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005490 if cl.IsGerrit():
5491 if options.reject:
5492 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005493 if options.directory:
5494 parser.error('--directory is not supported with Gerrit codereview.')
5495
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005496 if detected_codereview_from_url:
5497 print('canonical issue/change URL: %s (type: %s)\n' %
5498 (cl.GetIssueURL(), target_issue_arg.codereview))
5499
5500 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005501 options.nocommit, options.directory,
5502 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005503
5504
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005505def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005506 """Fetches the tree status and returns either 'open', 'closed',
5507 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005508 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005509 if url:
5510 status = urllib2.urlopen(url).read().lower()
5511 if status.find('closed') != -1 or status == '0':
5512 return 'closed'
5513 elif status.find('open') != -1 or status == '1':
5514 return 'open'
5515 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005516 return 'unset'
5517
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005518
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005519def GetTreeStatusReason():
5520 """Fetches the tree status from a json url and returns the message
5521 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005522 url = settings.GetTreeStatusUrl()
5523 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005524 connection = urllib2.urlopen(json_url)
5525 status = json.loads(connection.read())
5526 connection.close()
5527 return status['message']
5528
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005529
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005530def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005531 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005532 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005533 status = GetTreeStatus()
5534 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005535 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005536 return 2
5537
vapiera7fbd5a2016-06-16 09:17:49 -07005538 print('The tree is %s' % status)
5539 print()
5540 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005541 if status != 'open':
5542 return 1
5543 return 0
5544
5545
maruel@chromium.org15192402012-09-06 12:38:29 +00005546def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005547 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005548 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005549 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005550 '-b', '--bot', action='append',
5551 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5552 'times to specify multiple builders. ex: '
5553 '"-b win_rel -b win_layout". See '
5554 'the try server waterfall for the builders name and the tests '
5555 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005556 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005557 '-B', '--bucket', default='',
5558 help=('Buildbucket bucket to send the try requests.'))
5559 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005560 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005561 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005562 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005563 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005564 help='Revision to use for the try job; default: the revision will '
5565 'be determined by the try recipe that builder runs, which usually '
5566 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005567 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005568 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005569 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005570 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005571 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005572 '--project',
5573 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005574 'in recipe to determine to which repository or directory to '
5575 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005576 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005577 '-p', '--property', dest='properties', action='append', default=[],
5578 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005579 'key2=value2 etc. The value will be treated as '
5580 'json if decodable, or as string otherwise. '
5581 'NOTE: using this may make your try job not usable for CQ, '
5582 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005583 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005584 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5585 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005586 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005587 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005588 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005589 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005590
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005591 if options.master and options.master.startswith('luci.'):
5592 parser.error(
5593 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005594 # Make sure that all properties are prop=value pairs.
5595 bad_params = [x for x in options.properties if '=' not in x]
5596 if bad_params:
5597 parser.error('Got properties with missing "=": %s' % bad_params)
5598
maruel@chromium.org15192402012-09-06 12:38:29 +00005599 if args:
5600 parser.error('Unknown arguments: %s' % args)
5601
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005602 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005603 if not cl.GetIssue():
5604 parser.error('Need to upload first')
5605
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005606 if cl.IsGerrit():
5607 # HACK: warm up Gerrit change detail cache to save on RPCs.
5608 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5609
tandriie113dfd2016-10-11 10:20:12 -07005610 error_message = cl.CannotTriggerTryJobReason()
5611 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005612 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005613
borenet6c0efe62016-10-19 08:13:29 -07005614 if options.bucket and options.master:
5615 parser.error('Only one of --bucket and --master may be used.')
5616
qyearsley1fdfcb62016-10-24 13:22:03 -07005617 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005618
qyearsleydd49f942016-10-28 11:57:22 -07005619 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5620 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005621 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005622 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005623 print('git cl try with no bots now defaults to CQ dry run.')
5624 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5625 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005626
borenet6c0efe62016-10-19 08:13:29 -07005627 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005628 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005629 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005630 'of bot requires an initial job from a parent (usually a builder). '
5631 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005632 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005633 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005634
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005635 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005636 # TODO(tandrii): Checking local patchset against remote patchset is only
5637 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5638 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005639 print('Warning: Codereview server has newer patchsets (%s) than most '
5640 'recent upload from local checkout (%s). Did a previous upload '
5641 'fail?\n'
5642 'By default, git cl try uses the latest patchset from '
5643 'codereview, continuing to use patchset %s.\n' %
5644 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005645
tandrii568043b2016-10-11 07:49:18 -07005646 try:
borenet6c0efe62016-10-19 08:13:29 -07005647 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5648 patchset)
tandrii568043b2016-10-11 07:49:18 -07005649 except BuildbucketResponseException as ex:
5650 print('ERROR: %s' % ex)
5651 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005652 return 0
5653
5654
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005655def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005656 """Prints info about try jobs associated with current CL."""
5657 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005658 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005659 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005660 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005661 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005662 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005663 '--color', action='store_true', default=setup_color.IS_TTY,
5664 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005665 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005666 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5667 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005668 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005669 '--json', help=('Path of JSON output file to write try job results to,'
5670 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005671 parser.add_option_group(group)
5672 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005673 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005674 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005675 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005676 if args:
5677 parser.error('Unrecognized args: %s' % ' '.join(args))
5678
5679 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005680 cl = Changelist(
5681 issue=options.issue, codereview=options.forced_codereview,
5682 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005683 if not cl.GetIssue():
5684 parser.error('Need to upload first')
5685
tandrii221ab252016-10-06 08:12:04 -07005686 patchset = options.patchset
5687 if not patchset:
5688 patchset = cl.GetMostRecentPatchset()
5689 if not patchset:
5690 parser.error('Codereview doesn\'t know about issue %s. '
5691 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005692 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005693 cl.GetIssue())
5694
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005695 # TODO(tandrii): Checking local patchset against remote patchset is only
5696 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5697 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005698 print('Warning: Codereview server has newer patchsets (%s) than most '
5699 'recent upload from local checkout (%s). Did a previous upload '
5700 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005701 'By default, git cl try-results uses the latest patchset from '
5702 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005703 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005704 try:
tandrii221ab252016-10-06 08:12:04 -07005705 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005706 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005707 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005708 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005709 if options.json:
5710 write_try_results_json(options.json, jobs)
5711 else:
5712 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005713 return 0
5714
5715
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005716@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005717def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005718 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005719 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005720 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005721 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005722
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005723 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005724 if args:
5725 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005726 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005727 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005728 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005729 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005730
5731 # Clear configured merge-base, if there is one.
5732 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005733 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005734 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005735 return 0
5736
5737
thestig@chromium.org00858c82013-12-02 23:08:03 +00005738def CMDweb(parser, args):
5739 """Opens the current CL in the web browser."""
5740 _, args = parser.parse_args(args)
5741 if args:
5742 parser.error('Unrecognized args: %s' % ' '.join(args))
5743
5744 issue_url = Changelist().GetIssueURL()
5745 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005746 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005747 return 1
5748
5749 webbrowser.open(issue_url)
5750 return 0
5751
5752
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005753def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005754 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005755 parser.add_option('-d', '--dry-run', action='store_true',
5756 help='trigger in dry run mode')
5757 parser.add_option('-c', '--clear', action='store_true',
5758 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005759 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005760 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005761 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005762 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005763 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005764 if args:
5765 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005766 if options.dry_run and options.clear:
5767 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5768
iannuccie53c9352016-08-17 14:40:40 -07005769 cl = Changelist(auth_config=auth_config, issue=options.issue,
5770 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005771 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005772 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005773 elif options.dry_run:
5774 state = _CQState.DRY_RUN
5775 else:
5776 state = _CQState.COMMIT
5777 if not cl.GetIssue():
5778 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005779 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005780 return 0
5781
5782
groby@chromium.org411034a2013-02-26 15:12:01 +00005783def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005784 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005785 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005786 auth.add_auth_options(parser)
5787 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005788 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005789 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005790 if args:
5791 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005792 cl = Changelist(auth_config=auth_config, issue=options.issue,
5793 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005794 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005795 if not cl.GetIssue():
5796 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005797 cl.CloseIssue()
5798 return 0
5799
5800
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005801def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005802 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005803 parser.add_option(
5804 '--stat',
5805 action='store_true',
5806 dest='stat',
5807 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005808 auth.add_auth_options(parser)
5809 options, args = parser.parse_args(args)
5810 auth_config = auth.extract_auth_config_from_options(options)
5811 if args:
5812 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005813
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005814 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005815 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005816 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005817 if not issue:
5818 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005819
Aaron Gablea718c3e2017-08-28 17:47:28 -07005820 base = cl._GitGetBranchConfigValue('last-upload-hash')
5821 if not base:
5822 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5823 if not base:
5824 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5825 revision_info = detail['revisions'][detail['current_revision']]
5826 fetch_info = revision_info['fetch']['http']
5827 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5828 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005829
Aaron Gablea718c3e2017-08-28 17:47:28 -07005830 cmd = ['git', 'diff']
5831 if options.stat:
5832 cmd.append('--stat')
5833 cmd.append(base)
5834 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005835
5836 return 0
5837
5838
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005839def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005840 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005841 parser.add_option(
5842 '--no-color',
5843 action='store_true',
5844 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005845 parser.add_option(
5846 '--batch',
5847 action='store_true',
5848 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005849 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005850 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005851 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005852
5853 author = RunGit(['config', 'user.email']).strip() or None
5854
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005855 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005856
5857 if args:
5858 if len(args) > 1:
5859 parser.error('Unknown args')
5860 base_branch = args[0]
5861 else:
5862 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005863 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005864
5865 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005866 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5867
5868 if options.batch:
5869 db = owners.Database(change.RepositoryRoot(), file, os.path)
5870 print('\n'.join(db.reviewers_for(affected_files, author)))
5871 return 0
5872
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005873 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005874 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005875 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005876 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005877 disable_color=options.no_color,
5878 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005879
5880
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005881def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005882 """Generates a diff command."""
5883 # Generate diff for the current branch's changes.
5884 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005885 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005886
5887 if args:
5888 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005889 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005890 diff_cmd.append(arg)
5891 else:
5892 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005893
5894 return diff_cmd
5895
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005896
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005897def MatchingFileType(file_name, extensions):
5898 """Returns true if the file name ends with one of the given extensions."""
5899 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005900
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005901
enne@chromium.org555cfe42014-01-29 18:21:39 +00005902@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005903def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005904 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005905 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005906 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005907 parser.add_option('--full', action='store_true',
5908 help='Reformat the full content of all touched files')
5909 parser.add_option('--dry-run', action='store_true',
5910 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005911 parser.add_option('--python', action='store_true',
5912 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005913 parser.add_option('--js', action='store_true',
5914 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005915 parser.add_option('--diff', action='store_true',
5916 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005917 parser.add_option('--presubmit', action='store_true',
5918 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005919 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005920
Daniel Chengc55eecf2016-12-30 03:11:02 -08005921 # Normalize any remaining args against the current path, so paths relative to
5922 # the current directory are still resolved as expected.
5923 args = [os.path.join(os.getcwd(), arg) for arg in args]
5924
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005925 # git diff generates paths against the root of the repository. Change
5926 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005927 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005928 if rel_base_path:
5929 os.chdir(rel_base_path)
5930
digit@chromium.org29e47272013-05-17 17:01:46 +00005931 # Grab the merge-base commit, i.e. the upstream commit of the current
5932 # branch when it was created or the last time it was rebased. This is
5933 # to cover the case where the user may have called "git fetch origin",
5934 # moving the origin branch to a newer commit, but hasn't rebased yet.
5935 upstream_commit = None
5936 cl = Changelist()
5937 upstream_branch = cl.GetUpstreamBranch()
5938 if upstream_branch:
5939 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5940 upstream_commit = upstream_commit.strip()
5941
5942 if not upstream_commit:
5943 DieWithError('Could not find base commit for this branch. '
5944 'Are you in detached state?')
5945
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005946 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5947 diff_output = RunGit(changed_files_cmd)
5948 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005949 # Filter out files deleted by this CL
5950 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005951
Christopher Lamc5ba6922017-01-24 11:19:14 +11005952 if opts.js:
5953 CLANG_EXTS.append('.js')
5954
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005955 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5956 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5957 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005958 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005959
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005960 top_dir = os.path.normpath(
5961 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5962
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005963 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5964 # formatted. This is used to block during the presubmit.
5965 return_value = 0
5966
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005967 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005968 # Locate the clang-format binary in the checkout
5969 try:
5970 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005971 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005972 DieWithError(e)
5973
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005974 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005975 cmd = [clang_format_tool]
5976 if not opts.dry_run and not opts.diff:
5977 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005978 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005979 if opts.diff:
5980 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005981 else:
5982 env = os.environ.copy()
5983 env['PATH'] = str(os.path.dirname(clang_format_tool))
5984 try:
5985 script = clang_format.FindClangFormatScriptInChromiumTree(
5986 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005987 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005988 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005989
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005990 cmd = [sys.executable, script, '-p0']
5991 if not opts.dry_run and not opts.diff:
5992 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005993
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005994 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5995 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005996
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005997 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5998 if opts.diff:
5999 sys.stdout.write(stdout)
6000 if opts.dry_run and len(stdout) > 0:
6001 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006002
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006003 # Similar code to above, but using yapf on .py files rather than clang-format
6004 # on C/C++ files
6005 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006006 yapf_tool = gclient_utils.FindExecutable('yapf')
6007 if yapf_tool is None:
6008 DieWithError('yapf not found in PATH')
6009
6010 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006011 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006012 cmd = [yapf_tool]
6013 if not opts.dry_run and not opts.diff:
6014 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006015 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006016 if opts.diff:
6017 sys.stdout.write(stdout)
6018 else:
6019 # TODO(sbc): yapf --lines mode still has some issues.
6020 # https://github.com/google/yapf/issues/154
6021 DieWithError('--python currently only works with --full')
6022
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006023 # Dart's formatter does not have the nice property of only operating on
6024 # modified chunks, so hard code full.
6025 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006026 try:
6027 command = [dart_format.FindDartFmtToolInChromiumTree()]
6028 if not opts.dry_run and not opts.diff:
6029 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006030 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006031
ppi@chromium.org6593d932016-03-03 15:41:15 +00006032 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006033 if opts.dry_run and stdout:
6034 return_value = 2
6035 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07006036 print('Warning: Unable to check Dart code formatting. Dart SDK not '
6037 'found in this checkout. Files in other languages are still '
6038 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006039
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006040 # Format GN build files. Always run on full build files for canonical form.
6041 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006042 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006043 if opts.dry_run or opts.diff:
6044 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006045 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006046 gn_ret = subprocess2.call(cmd + [gn_diff_file],
6047 shell=sys.platform == 'win32',
6048 cwd=top_dir)
6049 if opts.dry_run and gn_ret == 2:
6050 return_value = 2 # Not formatted.
6051 elif opts.diff and gn_ret == 2:
6052 # TODO this should compute and print the actual diff.
6053 print("This change has GN build file diff for " + gn_diff_file)
6054 elif gn_ret != 0:
6055 # For non-dry run cases (and non-2 return values for dry-run), a
6056 # nonzero error code indicates a failure, probably because the file
6057 # doesn't parse.
6058 DieWithError("gn format failed on " + gn_diff_file +
6059 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006060
Ilya Shermane081cbe2017-08-15 17:51:04 -07006061 # Skip the metrics formatting from the global presubmit hook. These files have
6062 # a separate presubmit hook that issues an error if the files need formatting,
6063 # whereas the top-level presubmit script merely issues a warning. Formatting
6064 # these files is somewhat slow, so it's important not to duplicate the work.
6065 if not opts.presubmit:
6066 for xml_dir in GetDirtyMetricsDirs(diff_files):
6067 tool_dir = os.path.join(top_dir, xml_dir)
6068 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
6069 if opts.dry_run or opts.diff:
6070 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006071 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006072 if opts.diff:
6073 sys.stdout.write(stdout)
6074 if opts.dry_run and stdout:
6075 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006076
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006077 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006078
Steven Holte2e664bf2017-04-21 13:10:47 -07006079def GetDirtyMetricsDirs(diff_files):
6080 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6081 metrics_xml_dirs = [
6082 os.path.join('tools', 'metrics', 'actions'),
6083 os.path.join('tools', 'metrics', 'histograms'),
6084 os.path.join('tools', 'metrics', 'rappor'),
6085 os.path.join('tools', 'metrics', 'ukm')]
6086 for xml_dir in metrics_xml_dirs:
6087 if any(file.startswith(xml_dir) for file in xml_diff_files):
6088 yield xml_dir
6089
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006090
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006091@subcommand.usage('<codereview url or issue id>')
6092def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006093 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006094 _, args = parser.parse_args(args)
6095
6096 if len(args) != 1:
6097 parser.print_help()
6098 return 1
6099
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006100 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006101 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006102 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006103
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006104 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006105
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006106 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006107 output = RunGit(['config', '--local', '--get-regexp',
6108 r'branch\..*\.%s' % issueprefix],
6109 error_ok=True)
6110 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006111 if issue == target_issue:
6112 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006113
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006114 branches = []
6115 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006116 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006117 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006118 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006119 return 1
6120 if len(branches) == 1:
6121 RunGit(['checkout', branches[0]])
6122 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006123 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006124 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006125 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006126 which = raw_input('Choose by index: ')
6127 try:
6128 RunGit(['checkout', branches[int(which)]])
6129 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006130 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006131 return 1
6132
6133 return 0
6134
6135
maruel@chromium.org29404b52014-09-08 22:58:00 +00006136def CMDlol(parser, args):
6137 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006138 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006139 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6140 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6141 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006142 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006143 return 0
6144
6145
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006146class OptionParser(optparse.OptionParser):
6147 """Creates the option parse and add --verbose support."""
6148 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006149 optparse.OptionParser.__init__(
6150 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006151 self.add_option(
6152 '-v', '--verbose', action='count', default=0,
6153 help='Use 2 times for more debugging info')
6154
6155 def parse_args(self, args=None, values=None):
6156 options, args = optparse.OptionParser.parse_args(self, args, values)
6157 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006158 logging.basicConfig(
6159 level=levels[min(options.verbose, len(levels) - 1)],
6160 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6161 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006162 return options, args
6163
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006164
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006165def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006166 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006167 print('\nYour python version %s is unsupported, please upgrade.\n' %
6168 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006169 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006170
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006171 # Reload settings.
6172 global settings
6173 settings = Settings()
6174
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006175 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006176 dispatcher = subcommand.CommandDispatcher(__name__)
6177 try:
6178 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006179 except auth.AuthenticationError as e:
6180 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006181 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006182 if e.code != 500:
6183 raise
6184 DieWithError(
6185 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6186 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006187 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006188
6189
6190if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006191 # These affect sys.stdout so do it outside of main() to simplify mocks in
6192 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006193 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006194 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006195 try:
6196 sys.exit(main(sys.argv[1:]))
6197 except KeyboardInterrupt:
6198 sys.stderr.write('interrupted\n')
6199 sys.exit(1)