blob: c28cc1a2dcc749fc0b4fcba78cd80fcc6ff5971f [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
machenbach@chromium.org45453142015-09-15 08:45:22 +0000297def _get_properties_from_options(options):
298 properties = dict(x.split('=', 1) for x in options.properties)
299 for key, val in properties.iteritems():
300 try:
301 properties[key] = json.loads(val)
302 except ValueError:
303 pass # If a value couldn't be evaluated, treat it as a string.
304 return properties
305
306
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000307def _prefix_master(master):
308 """Convert user-specified master name to full master name.
309
310 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
311 name, while the developers always use shortened master name
312 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
313 function does the conversion for buildbucket migration.
314 """
borenet6c0efe62016-10-19 08:13:29 -0700315 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000316 return master
borenet6c0efe62016-10-19 08:13:29 -0700317 return '%s%s' % (MASTER_PREFIX, master)
318
319
320def _unprefix_master(bucket):
321 """Convert bucket name to shortened master name.
322
323 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
324 name, while the developers always use shortened master name
325 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
326 function does the conversion for buildbucket migration.
327 """
328 if bucket.startswith(MASTER_PREFIX):
329 return bucket[len(MASTER_PREFIX):]
330 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000331
332
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000333def _buildbucket_retry(operation_name, http, *args, **kwargs):
334 """Retries requests to buildbucket service and returns parsed json content."""
335 try_count = 0
336 while True:
337 response, content = http.request(*args, **kwargs)
338 try:
339 content_json = json.loads(content)
340 except ValueError:
341 content_json = None
342
343 # Buildbucket could return an error even if status==200.
344 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000345 error = content_json.get('error')
346 if error.get('code') == 403:
347 raise BuildbucketResponseException(
348 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000349 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000350 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000351 raise BuildbucketResponseException(msg)
352
353 if response.status == 200:
354 if not content_json:
355 raise BuildbucketResponseException(
356 'Buildbucket returns invalid json content: %s.\n'
357 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
358 content)
359 return content_json
360 if response.status < 500 or try_count >= 2:
361 raise httplib2.HttpLib2Error(content)
362
363 # status >= 500 means transient failures.
364 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700365 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 try_count += 1
367 assert False, 'unreachable'
368
369
qyearsley1fdfcb62016-10-24 13:22:03 -0700370def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700371 """Returns a dict mapping bucket names to builders and tests,
372 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700373 """
qyearsleydd49f942016-10-28 11:57:22 -0700374 # If no bots are listed, we try to get a set of builders and tests based
375 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700376 if not options.bot:
377 change = changelist.GetChange(
378 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700379 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700380 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700381 change=change,
382 changed_files=change.LocalPaths(),
383 repository_root=settings.GetRoot(),
384 default_presubmit=None,
385 project=None,
386 verbose=options.verbose,
387 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700388 if masters is None:
389 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100390 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700391
qyearsley1fdfcb62016-10-24 13:22:03 -0700392 if options.bucket:
393 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700394 if options.master:
395 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700396
qyearsleydd49f942016-10-28 11:57:22 -0700397 # If bots are listed but no master or bucket, then we need to find out
398 # the corresponding master for each bot.
399 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
400 if error_message:
401 option_parser.error(
402 'Tryserver master cannot be found because: %s\n'
403 'Please manually specify the tryserver master, e.g. '
404 '"-m tryserver.chromium.linux".' % error_message)
405 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700406
407
qyearsley123a4682016-10-26 09:12:17 -0700408def _get_bucket_map_for_builders(builders):
409 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 map_url = 'https://builders-map.appspot.com/'
411 try:
qyearsley123a4682016-10-26 09:12:17 -0700412 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 except urllib2.URLError as e:
414 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
415 (map_url, e))
416 except ValueError as e:
417 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700418 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 return None, 'Failed to build master map.'
420
qyearsley123a4682016-10-26 09:12:17 -0700421 bucket_map = {}
422 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800423 bucket = builders_map.get(builder, {}).get('bucket')
424 if bucket:
425 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700426 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700427
428
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800429def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700430 """Sends a request to Buildbucket to trigger try jobs for a changelist.
431
432 Args:
433 auth_config: AuthConfig for Rietveld.
434 changelist: Changelist that the try jobs are associated with.
435 buckets: A nested dict mapping bucket names to builders to tests.
436 options: Command-line options.
437 """
tandriide281ae2016-10-12 06:02:30 -0700438 assert changelist.GetIssue(), 'CL must be uploaded first'
439 codereview_url = changelist.GetCodereviewServer()
440 assert codereview_url, 'CL must be uploaded first'
441 patchset = patchset or changelist.GetMostRecentPatchset()
442 assert patchset, 'CL must be uploaded first'
443
444 codereview_host = urlparse.urlparse(codereview_url).hostname
445 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000446 http = authenticator.authorize(httplib2.Http())
447 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700448
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000449 buildbucket_put_url = (
450 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000451 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700452 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
453 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
454 hostname=codereview_host,
455 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700457
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700458 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800459 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700460 if options.clobber:
461 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700462 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700463 if extra_properties:
464 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000465
466 batch_req_body = {'builds': []}
467 print_text = []
468 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700469 for bucket, builders_and_tests in sorted(buckets.iteritems()):
470 print_text.append('Bucket: %s' % bucket)
471 master = None
472 if bucket.startswith(MASTER_PREFIX):
473 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000474 for builder, tests in sorted(builders_and_tests.iteritems()):
475 print_text.append(' %s: %s' % (builder, tests))
476 parameters = {
477 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000478 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100479 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000480 'revision': options.revision,
481 }],
tandrii8c5a3532016-11-04 07:52:02 -0700482 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000483 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000484 if 'presubmit' in builder.lower():
485 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000486 if tests:
487 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700488
489 tags = [
490 'builder:%s' % builder,
491 'buildset:%s' % buildset,
492 'user_agent:git_cl_try',
493 ]
494 if master:
495 parameters['properties']['master'] = master
496 tags.append('master:%s' % master)
497
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000498 batch_req_body['builds'].append(
499 {
500 'bucket': bucket,
501 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000502 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700503 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000504 }
505 )
506
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000507 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700508 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000509 http,
510 buildbucket_put_url,
511 'PUT',
512 body=json.dumps(batch_req_body),
513 headers={'Content-Type': 'application/json'}
514 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000515 print_text.append('To see results here, run: git cl try-results')
516 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700517 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000518
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000519
tandrii221ab252016-10-06 08:12:04 -0700520def fetch_try_jobs(auth_config, changelist, buildbucket_host,
521 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700522 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523
qyearsley53f48a12016-09-01 10:45:13 -0700524 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000525 """
tandrii221ab252016-10-06 08:12:04 -0700526 assert buildbucket_host
527 assert changelist.GetIssue(), 'CL must be uploaded first'
528 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
529 patchset = patchset or changelist.GetMostRecentPatchset()
530 assert patchset, 'CL must be uploaded first'
531
532 codereview_url = changelist.GetCodereviewServer()
533 codereview_host = urlparse.urlparse(codereview_url).hostname
534 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 if authenticator.has_cached_credentials():
536 http = authenticator.authorize(httplib2.Http())
537 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700538 print('Warning: Some results might be missing because %s' %
539 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700540 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541 http = httplib2.Http()
542
543 http.force_exception_to_status_code = True
544
tandrii221ab252016-10-06 08:12:04 -0700545 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
546 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
547 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700549 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 params = {'tag': 'buildset:%s' % buildset}
551
552 builds = {}
553 while True:
554 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700555 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700557 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 for build in content.get('builds', []):
559 builds[build['id']] = build
560 if 'next_cursor' in content:
561 params['start_cursor'] = content['next_cursor']
562 else:
563 break
564 return builds
565
566
qyearsleyeab3c042016-08-24 09:18:28 -0700567def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 """Prints nicely result of fetch_try_jobs."""
569 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700570 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000571 return
572
573 # Make a copy, because we'll be modifying builds dictionary.
574 builds = builds.copy()
575 builder_names_cache = {}
576
577 def get_builder(b):
578 try:
579 return builder_names_cache[b['id']]
580 except KeyError:
581 try:
582 parameters = json.loads(b['parameters_json'])
583 name = parameters['builder_name']
584 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700585 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700586 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587 name = None
588 builder_names_cache[b['id']] = name
589 return name
590
591 def get_bucket(b):
592 bucket = b['bucket']
593 if bucket.startswith('master.'):
594 return bucket[len('master.'):]
595 return bucket
596
597 if options.print_master:
598 name_fmt = '%%-%ds %%-%ds' % (
599 max(len(str(get_bucket(b))) for b in builds.itervalues()),
600 max(len(str(get_builder(b))) for b in builds.itervalues()))
601 def get_name(b):
602 return name_fmt % (get_bucket(b), get_builder(b))
603 else:
604 name_fmt = '%%-%ds' % (
605 max(len(str(get_builder(b))) for b in builds.itervalues()))
606 def get_name(b):
607 return name_fmt % get_builder(b)
608
609 def sort_key(b):
610 return b['status'], b.get('result'), get_name(b), b.get('url')
611
612 def pop(title, f, color=None, **kwargs):
613 """Pop matching builds from `builds` dict and print them."""
614
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000615 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616 colorize = str
617 else:
618 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
619
620 result = []
621 for b in builds.values():
622 if all(b.get(k) == v for k, v in kwargs.iteritems()):
623 builds.pop(b['id'])
624 result.append(b)
625 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700626 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000627 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700628 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000629
630 total = len(builds)
631 pop(status='COMPLETED', result='SUCCESS',
632 title='Successes:', color=Fore.GREEN,
633 f=lambda b: (get_name(b), b.get('url')))
634 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
635 title='Infra Failures:', color=Fore.MAGENTA,
636 f=lambda b: (get_name(b), b.get('url')))
637 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
638 title='Failures:', color=Fore.RED,
639 f=lambda b: (get_name(b), b.get('url')))
640 pop(status='COMPLETED', result='CANCELED',
641 title='Canceled:', color=Fore.MAGENTA,
642 f=lambda b: (get_name(b),))
643 pop(status='COMPLETED', result='FAILURE',
644 failure_reason='INVALID_BUILD_DEFINITION',
645 title='Wrong master/builder name:', color=Fore.MAGENTA,
646 f=lambda b: (get_name(b),))
647 pop(status='COMPLETED', result='FAILURE',
648 title='Other failures:',
649 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
650 pop(status='COMPLETED',
651 title='Other finished:',
652 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
653 pop(status='STARTED',
654 title='Started:', color=Fore.YELLOW,
655 f=lambda b: (get_name(b), b.get('url')))
656 pop(status='SCHEDULED',
657 title='Scheduled:',
658 f=lambda b: (get_name(b), 'id=%s' % b['id']))
659 # The last section is just in case buildbucket API changes OR there is a bug.
660 pop(title='Other:',
661 f=lambda b: (get_name(b), 'id=%s' % b['id']))
662 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700663 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000664
665
qyearsley53f48a12016-09-01 10:45:13 -0700666def write_try_results_json(output_file, builds):
667 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
668
669 The input |builds| dict is assumed to be generated by Buildbucket.
670 Buildbucket documentation: http://goo.gl/G0s101
671 """
672
673 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800674 """Extracts some of the information from one build dict."""
675 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700676 return {
677 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700678 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800679 'builder_name': parameters.get('builder_name'),
680 'created_ts': build.get('created_ts'),
681 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700682 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800683 'result': build.get('result'),
684 'status': build.get('status'),
685 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700686 'url': build.get('url'),
687 }
688
689 converted = []
690 for _, build in sorted(builds.items()):
691 converted.append(convert_build_dict(build))
692 write_json(output_file, converted)
693
694
Aaron Gable13101a62018-02-09 13:20:41 -0800695def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000696 """Prints statistics about the change to the user."""
697 # --no-ext-diff is broken in some versions of Git, so try to work around
698 # this by overriding the environment (but there is still a problem if the
699 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000700 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000701 if 'GIT_EXTERNAL_DIFF' in env:
702 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000703
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000704 try:
705 stdout = sys.stdout.fileno()
706 except AttributeError:
707 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000708 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800709 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000710 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000711
712
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000713class BuildbucketResponseException(Exception):
714 pass
715
716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000717class Settings(object):
718 def __init__(self):
719 self.default_server = None
720 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000721 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000722 self.tree_status_url = None
723 self.viewvc_url = None
724 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000725 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000726 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000727 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000728 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000729 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000730 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000731
732 def LazyUpdateIfNeeded(self):
733 """Updates the settings from a codereview.settings file, if available."""
734 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000735 # The only value that actually changes the behavior is
736 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000737 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000738 error_ok=True
739 ).strip().lower()
740
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000742 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000743 LoadCodereviewSettingsFromFile(cr_settings_file)
744 self.updated = True
745
746 def GetDefaultServerUrl(self, error_ok=False):
747 if not self.default_server:
748 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000749 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000750 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751 if error_ok:
752 return self.default_server
753 if not self.default_server:
754 error_message = ('Could not find settings file. You must configure '
755 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000756 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000757 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 return self.default_server
759
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000760 @staticmethod
761 def GetRelativeRoot():
762 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000763
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000765 if self.root is None:
766 self.root = os.path.abspath(self.GetRelativeRoot())
767 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000769 def GetGitMirror(self, remote='origin'):
770 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000771 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000772 if not os.path.isdir(local_url):
773 return None
774 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
775 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100776 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100777 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000778 if mirror.exists():
779 return mirror
780 return None
781
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000782 def GetTreeStatusUrl(self, error_ok=False):
783 if not self.tree_status_url:
784 error_message = ('You must configure your tree status URL by running '
785 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000786 self.tree_status_url = self._GetRietveldConfig(
787 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 return self.tree_status_url
789
790 def GetViewVCUrl(self):
791 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000792 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 return self.viewvc_url
794
rmistry@google.com90752582014-01-14 21:04:50 +0000795 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000797
rmistry@google.com78948ed2015-07-08 23:09:57 +0000798 def GetIsSkipDependencyUpload(self, branch_name):
799 """Returns true if specified branch should skip dep uploads."""
800 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
801 error_ok=True)
802
rmistry@google.com5626a922015-02-26 14:03:30 +0000803 def GetRunPostUploadHook(self):
804 run_post_upload_hook = self._GetRietveldConfig(
805 'run-post-upload-hook', error_ok=True)
806 return run_post_upload_hook == "True"
807
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000808 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000810
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000811 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000812 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000813
ukai@chromium.orge8077812012-02-03 03:41:46 +0000814 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700815 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000816 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700817 self.is_gerrit = (
818 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000819 return self.is_gerrit
820
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000821 def GetSquashGerritUploads(self):
822 """Return true if uploads to Gerrit should be squashed by default."""
823 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700824 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
825 if self.squash_gerrit_uploads is None:
826 # Default is squash now (http://crbug.com/611892#c23).
827 self.squash_gerrit_uploads = not (
828 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
829 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000830 return self.squash_gerrit_uploads
831
tandriia60502f2016-06-20 02:01:53 -0700832 def GetSquashGerritUploadsOverride(self):
833 """Return True or False if codereview.settings should be overridden.
834
835 Returns None if no override has been defined.
836 """
837 # See also http://crbug.com/611892#c23
838 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
839 error_ok=True).strip()
840 if result == 'true':
841 return True
842 if result == 'false':
843 return False
844 return None
845
tandrii@chromium.org28253532016-04-14 13:46:56 +0000846 def GetGerritSkipEnsureAuthenticated(self):
847 """Return True if EnsureAuthenticated should not be done for Gerrit
848 uploads."""
849 if self.gerrit_skip_ensure_authenticated is None:
850 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000851 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000852 error_ok=True).strip() == 'true')
853 return self.gerrit_skip_ensure_authenticated
854
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000855 def GetGitEditor(self):
856 """Return the editor specified in the git config, or None if none is."""
857 if self.git_editor is None:
858 self.git_editor = self._GetConfig('core.editor', error_ok=True)
859 return self.git_editor or None
860
thestig@chromium.org44202a22014-03-11 19:22:18 +0000861 def GetLintRegex(self):
862 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
863 DEFAULT_LINT_REGEX)
864
865 def GetLintIgnoreRegex(self):
866 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
867 DEFAULT_LINT_IGNORE_REGEX)
868
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000869 def GetProject(self):
870 if not self.project:
871 self.project = self._GetRietveldConfig('project', error_ok=True)
872 return self.project
873
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000874 def _GetRietveldConfig(self, param, **kwargs):
875 return self._GetConfig('rietveld.' + param, **kwargs)
876
rmistry@google.com78948ed2015-07-08 23:09:57 +0000877 def _GetBranchConfig(self, branch_name, param, **kwargs):
878 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
879
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000880 def _GetConfig(self, param, **kwargs):
881 self.LazyUpdateIfNeeded()
882 return RunGit(['config', param], **kwargs).strip()
883
884
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100885@contextlib.contextmanager
886def _get_gerrit_project_config_file(remote_url):
887 """Context manager to fetch and store Gerrit's project.config from
888 refs/meta/config branch and store it in temp file.
889
890 Provides a temporary filename or None if there was error.
891 """
892 error, _ = RunGitWithCode([
893 'fetch', remote_url,
894 '+refs/meta/config:refs/git_cl/meta/config'])
895 if error:
896 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700897 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100898 (remote_url, error))
899 yield None
900 return
901
902 error, project_config_data = RunGitWithCode(
903 ['show', 'refs/git_cl/meta/config:project.config'])
904 if error:
905 print('WARNING: project.config file not found')
906 yield None
907 return
908
909 with gclient_utils.temporary_directory() as tempdir:
910 project_config_file = os.path.join(tempdir, 'project.config')
911 gclient_utils.FileWrite(project_config_file, project_config_data)
912 yield project_config_file
913
914
915def _is_git_numberer_enabled(remote_url, remote_ref):
916 """Returns True if Git Numberer is enabled on this ref."""
917 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100918 KNOWN_PROJECTS_WHITELIST = [
919 'chromium/src',
920 'external/webrtc',
921 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100922 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200923 # For webrtc.googlesource.com/src.
924 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100925 ]
926
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100927 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
928 url_parts = urlparse.urlparse(remote_url)
929 project_name = url_parts.path.lstrip('/').rstrip('git./')
930 for known in KNOWN_PROJECTS_WHITELIST:
931 if project_name.endswith(known):
932 break
933 else:
934 # Early exit to avoid extra fetches for repos that aren't using Git
935 # Numberer.
936 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100937
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100938 with _get_gerrit_project_config_file(remote_url) as project_config_file:
939 if project_config_file is None:
940 # Failed to fetch project.config, which shouldn't happen on open source
941 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100942 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100943 def get_opts(x):
944 code, out = RunGitWithCode(
945 ['config', '-f', project_config_file, '--get-all',
946 'plugin.git-numberer.validate-%s-refglob' % x])
947 if code == 0:
948 return out.strip().splitlines()
949 return []
950 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100951
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100952 logging.info('validator config enabled %s disabled %s refglobs for '
953 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000954
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100955 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100956 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100957 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100958 return True
959 return False
960
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100961 if match_refglobs(disabled):
962 return False
963 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100964
965
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000966def ShortBranchName(branch):
967 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000968 return branch.replace('refs/heads/', '', 1)
969
970
971def GetCurrentBranchRef():
972 """Returns branch ref (e.g., refs/heads/master) or None."""
973 return RunGit(['symbolic-ref', 'HEAD'],
974 stderr=subprocess2.VOID, error_ok=True).strip() or None
975
976
977def GetCurrentBranch():
978 """Returns current branch or None.
979
980 For refs/heads/* branches, returns just last part. For others, full ref.
981 """
982 branchref = GetCurrentBranchRef()
983 if branchref:
984 return ShortBranchName(branchref)
985 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000986
987
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000988class _CQState(object):
989 """Enum for states of CL with respect to Commit Queue."""
990 NONE = 'none'
991 DRY_RUN = 'dry_run'
992 COMMIT = 'commit'
993
994 ALL_STATES = [NONE, DRY_RUN, COMMIT]
995
996
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000997class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200998 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000999 self.issue = issue
1000 self.patchset = patchset
1001 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001002 assert codereview in (None, 'rietveld', 'gerrit')
1003 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001004
1005 @property
1006 def valid(self):
1007 return self.issue is not None
1008
1009
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001010def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001011 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1012 fail_result = _ParsedIssueNumberArgument()
1013
1014 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001015 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 if not arg.startswith('http'):
1017 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001018
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001019 url = gclient_utils.UpgradeToHttps(arg)
1020 try:
1021 parsed_url = urlparse.urlparse(url)
1022 except ValueError:
1023 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001024
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001025 if codereview is not None:
1026 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1027 return parsed or fail_result
1028
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001029 results = {}
1030 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1031 parsed = cls.ParseIssueURL(parsed_url)
1032 if parsed is not None:
1033 results[name] = parsed
1034
1035 if not results:
1036 return fail_result
1037 if len(results) == 1:
1038 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001039
1040 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1041 # This is likely Gerrit.
1042 return results['gerrit']
1043 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001044 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001045
1046
Aaron Gablea45ee112016-11-22 15:14:38 -08001047class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001048 def __init__(self, issue, url):
1049 self.issue = issue
1050 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001051 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001052
1053 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001054 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001055 self.issue, self.url)
1056
1057
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001058_CommentSummary = collections.namedtuple(
1059 '_CommentSummary', ['date', 'message', 'sender',
1060 # TODO(tandrii): these two aren't known in Gerrit.
1061 'approval', 'disapproval'])
1062
1063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001064class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001065 """Changelist works with one changelist in local branch.
1066
1067 Supports two codereview backends: Rietveld or Gerrit, selected at object
1068 creation.
1069
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001070 Notes:
1071 * Not safe for concurrent multi-{thread,process} use.
1072 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001073 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001074 """
1075
1076 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1077 """Create a new ChangeList instance.
1078
1079 If issue is given, the codereview must be given too.
1080
1081 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1082 Otherwise, it's decided based on current configuration of the local branch,
1083 with default being 'rietveld' for backwards compatibility.
1084 See _load_codereview_impl for more details.
1085
1086 **kwargs will be passed directly to codereview implementation.
1087 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001089 global settings
1090 if not settings:
1091 # Happens when git_cl.py is used as a utility library.
1092 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001093
1094 if issue:
1095 assert codereview, 'codereview must be known, if issue is known'
1096
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 self.branchref = branchref
1098 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001099 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100 self.branch = ShortBranchName(self.branchref)
1101 else:
1102 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001104 self.lookedup_issue = False
1105 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106 self.has_description = False
1107 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001108 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001110 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001111 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001112 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001113
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001114 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001115 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001116 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001117 assert self._codereview_impl
1118 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001119
1120 def _load_codereview_impl(self, codereview=None, **kwargs):
1121 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001122 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1123 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1124 self._codereview = codereview
1125 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001126 return
1127
1128 # Automatic selection based on issue number set for a current branch.
1129 # Rietveld takes precedence over Gerrit.
1130 assert not self.issue
1131 # Whether we find issue or not, we are doing the lookup.
1132 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001133 if self.GetBranch():
1134 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1135 issue = _git_get_branch_config_value(
1136 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1137 if issue:
1138 self._codereview = codereview
1139 self._codereview_impl = cls(self, **kwargs)
1140 self.issue = int(issue)
1141 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001142
1143 # No issue is set for this branch, so decide based on repo-wide settings.
1144 return self._load_codereview_impl(
1145 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1146 **kwargs)
1147
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001148 def IsGerrit(self):
1149 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001150
1151 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001152 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001153
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001154 The return value is a string suitable for passing to git cl with the --cc
1155 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001156 """
1157 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001158 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001159 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001160 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1161 return self.cc
1162
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001163 def GetCCListWithoutDefault(self):
1164 """Return the users cc'd on this CL excluding default ones."""
1165 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001166 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001167 return self.cc
1168
Daniel Cheng7227d212017-11-17 08:12:37 -08001169 def ExtendCC(self, more_cc):
1170 """Extends the list of users to cc on this CL based on the changed files."""
1171 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172
1173 def GetBranch(self):
1174 """Returns the short branch name, e.g. 'master'."""
1175 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001177 if not branchref:
1178 return None
1179 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 self.branch = ShortBranchName(self.branchref)
1181 return self.branch
1182
1183 def GetBranchRef(self):
1184 """Returns the full branch name, e.g. 'refs/heads/master'."""
1185 self.GetBranch() # Poke the lazy loader.
1186 return self.branchref
1187
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001188 def ClearBranch(self):
1189 """Clears cached branch data of this object."""
1190 self.branch = self.branchref = None
1191
tandrii5d48c322016-08-18 16:19:37 -07001192 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1193 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1194 kwargs['branch'] = self.GetBranch()
1195 return _git_get_branch_config_value(key, default, **kwargs)
1196
1197 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1198 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1199 assert self.GetBranch(), (
1200 'this CL must have an associated branch to %sset %s%s' %
1201 ('un' if value is None else '',
1202 key,
1203 '' if value is None else ' to %r' % value))
1204 kwargs['branch'] = self.GetBranch()
1205 return _git_set_branch_config_value(key, value, **kwargs)
1206
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001207 @staticmethod
1208 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001209 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 e.g. 'origin', 'refs/heads/master'
1211 """
1212 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001213 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1214
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001216 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001218 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1219 error_ok=True).strip()
1220 if upstream_branch:
1221 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001223 # Else, try to guess the origin remote.
1224 remote_branches = RunGit(['branch', '-r']).split()
1225 if 'origin/master' in remote_branches:
1226 # Fall back on origin/master if it exits.
1227 remote = 'origin'
1228 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001229 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001230 DieWithError(
1231 'Unable to determine default branch to diff against.\n'
1232 'Either pass complete "git diff"-style arguments, like\n'
1233 ' git cl upload origin/master\n'
1234 'or verify this branch is set up to track another \n'
1235 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236
1237 return remote, upstream_branch
1238
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001239 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001240 upstream_branch = self.GetUpstreamBranch()
1241 if not BranchExists(upstream_branch):
1242 DieWithError('The upstream for the current branch (%s) does not exist '
1243 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001244 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001245 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 def GetUpstreamBranch(self):
1248 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001251 upstream_branch = upstream_branch.replace('refs/heads/',
1252 'refs/remotes/%s/' % remote)
1253 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1254 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 self.upstream_branch = upstream_branch
1256 return self.upstream_branch
1257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001259 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001260 remote, branch = None, self.GetBranch()
1261 seen_branches = set()
1262 while branch not in seen_branches:
1263 seen_branches.add(branch)
1264 remote, branch = self.FetchUpstreamTuple(branch)
1265 branch = ShortBranchName(branch)
1266 if remote != '.' or branch.startswith('refs/remotes'):
1267 break
1268 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001269 remotes = RunGit(['remote'], error_ok=True).split()
1270 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001271 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001272 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001273 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001274 logging.warn('Could not determine which remote this change is '
1275 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001276 else:
1277 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001278 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001279 branch = 'HEAD'
1280 if branch.startswith('refs/remotes'):
1281 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001282 elif branch.startswith('refs/branch-heads/'):
1283 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001284 else:
1285 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001286 return self._remote
1287
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001288 def GitSanityChecks(self, upstream_git_obj):
1289 """Checks git repo status and ensures diff is from local commits."""
1290
sbc@chromium.org79706062015-01-14 21:18:12 +00001291 if upstream_git_obj is None:
1292 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001293 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001294 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001295 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001296 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001297 return False
1298
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001299 # Verify the commit we're diffing against is in our current branch.
1300 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1301 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1302 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001303 print('ERROR: %s is not in the current branch. You may need to rebase '
1304 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001305 return False
1306
1307 # List the commits inside the diff, and verify they are all local.
1308 commits_in_diff = RunGit(
1309 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1310 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1311 remote_branch = remote_branch.strip()
1312 if code != 0:
1313 _, remote_branch = self.GetRemoteBranch()
1314
1315 commits_in_remote = RunGit(
1316 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1317
1318 common_commits = set(commits_in_diff) & set(commits_in_remote)
1319 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001320 print('ERROR: Your diff contains %d commits already in %s.\n'
1321 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1322 'the diff. If you are using a custom git flow, you can override'
1323 ' the reference used for this check with "git config '
1324 'gitcl.remotebranch <git-ref>".' % (
1325 len(common_commits), remote_branch, upstream_git_obj),
1326 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001327 return False
1328 return True
1329
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001330 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001331 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001332
1333 Returns None if it is not set.
1334 """
tandrii5d48c322016-08-18 16:19:37 -07001335 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001336
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001337 def GetRemoteUrl(self):
1338 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1339
1340 Returns None if there is no remote.
1341 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001342 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001343 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1344
1345 # If URL is pointing to a local directory, it is probably a git cache.
1346 if os.path.isdir(url):
1347 url = RunGit(['config', 'remote.%s.url' % remote],
1348 error_ok=True,
1349 cwd=url).strip()
1350 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001351
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001352 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001353 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001354 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001355 self.issue = self._GitGetBranchConfigValue(
1356 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001357 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001358 return self.issue
1359
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001360 def GetIssueURL(self):
1361 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001362 issue = self.GetIssue()
1363 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001364 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001365 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001366
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001367 def GetDescription(self, pretty=False, force=False):
1368 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001370 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371 self.has_description = True
1372 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001373 # Set width to 72 columns + 2 space indent.
1374 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001376 lines = self.description.splitlines()
1377 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001378 return self.description
1379
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001380 def GetDescriptionFooters(self):
1381 """Returns (non_footer_lines, footers) for the commit message.
1382
1383 Returns:
1384 non_footer_lines (list(str)) - Simple list of description lines without
1385 any footer. The lines do not contain newlines, nor does the list contain
1386 the empty line between the message and the footers.
1387 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1388 [("Change-Id", "Ideadbeef...."), ...]
1389 """
1390 raw_description = self.GetDescription()
1391 msg_lines, _, footers = git_footers.split_footers(raw_description)
1392 if footers:
1393 msg_lines = msg_lines[:len(msg_lines)-1]
1394 return msg_lines, footers
1395
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001397 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001398 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001399 self.patchset = self._GitGetBranchConfigValue(
1400 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001401 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001402 return self.patchset
1403
1404 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001405 """Set this branch's patchset. If patchset=0, clears the patchset."""
1406 assert self.GetBranch()
1407 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001408 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001409 else:
1410 self.patchset = int(patchset)
1411 self._GitSetBranchConfigValue(
1412 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001414 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001415 """Set this branch's issue. If issue isn't given, clears the issue."""
1416 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001418 issue = int(issue)
1419 self._GitSetBranchConfigValue(
1420 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001421 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001422 codereview_server = self._codereview_impl.GetCodereviewServer()
1423 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001424 self._GitSetBranchConfigValue(
1425 self._codereview_impl.CodereviewServerConfigKey(),
1426 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 else:
tandrii5d48c322016-08-18 16:19:37 -07001428 # Reset all of these just to be clean.
1429 reset_suffixes = [
1430 'last-upload-hash',
1431 self._codereview_impl.IssueConfigKey(),
1432 self._codereview_impl.PatchsetConfigKey(),
1433 self._codereview_impl.CodereviewServerConfigKey(),
1434 ] + self._PostUnsetIssueProperties()
1435 for prop in reset_suffixes:
1436 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001437 msg = RunGit(['log', '-1', '--format=%B']).strip()
1438 if msg and git_footers.get_footer_change_id(msg):
1439 print('WARNING: The change patched into this branch has a Change-Id. '
1440 'Removing it.')
1441 RunGit(['commit', '--amend', '-m',
1442 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001443 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001444 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001445
dnjba1b0f32016-09-02 12:37:42 -07001446 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001447 if not self.GitSanityChecks(upstream_branch):
1448 DieWithError('\nGit sanity check failure')
1449
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001450 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001451 if not root:
1452 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001453 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001454
1455 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001456 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001457 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001458 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001459 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001460 except subprocess2.CalledProcessError:
1461 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001462 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001463 'This branch probably doesn\'t exist anymore. To reset the\n'
1464 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001465 ' git branch --set-upstream-to origin/master %s\n'
1466 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001467 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001468
maruel@chromium.org52424302012-08-29 15:14:30 +00001469 issue = self.GetIssue()
1470 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001471 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001472 description = self.GetDescription()
1473 else:
1474 # If the change was never uploaded, use the log messages of all commits
1475 # up to the branch point, as git cl upload will prefill the description
1476 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001477 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1478 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001479
1480 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001481 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001482 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483 name,
1484 description,
1485 absroot,
1486 files,
1487 issue,
1488 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001489 author,
1490 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491
dsansomee2d6fd92016-09-08 00:10:47 -07001492 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001493 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001494 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001495 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001496
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001497 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1498 """Sets the description for this CL remotely.
1499
1500 You can get description_lines and footers with GetDescriptionFooters.
1501
1502 Args:
1503 description_lines (list(str)) - List of CL description lines without
1504 newline characters.
1505 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1506 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1507 `List-Of-Tokens`). It will be case-normalized so that each token is
1508 title-cased.
1509 """
1510 new_description = '\n'.join(description_lines)
1511 if footers:
1512 new_description += '\n'
1513 for k, v in footers:
1514 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1515 if not git_footers.FOOTER_PATTERN.match(foot):
1516 raise ValueError('Invalid footer %r' % foot)
1517 new_description += foot + '\n'
1518 self.UpdateDescription(new_description, force)
1519
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001520 def RunHook(self, committing, may_prompt, verbose, change):
1521 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1522 try:
1523 return presubmit_support.DoPresubmitChecks(change, committing,
1524 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1525 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001526 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001527 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001528 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001529
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001530 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1531 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001532 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1533 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001534 else:
1535 # Assume url.
1536 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1537 urlparse.urlparse(issue_arg))
1538 if not parsed_issue_arg or not parsed_issue_arg.valid:
1539 DieWithError('Failed to parse issue argument "%s". '
1540 'Must be an issue number or a valid URL.' % issue_arg)
1541 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001542 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001543
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 def CMDUpload(self, options, git_diff_args, orig_args):
1545 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001546 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001548 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549 else:
1550 if self.GetBranch() is None:
1551 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1552
1553 # Default to diffing against common ancestor of upstream branch
1554 base_branch = self.GetCommonAncestorWithUpstream()
1555 git_diff_args = [base_branch, 'HEAD']
1556
Aaron Gablec4c40d12017-05-22 11:49:53 -07001557 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1558 if not self.IsGerrit() and not self.GetIssue():
1559 print('=====================================')
1560 print('NOTICE: Rietveld is being deprecated. '
1561 'You can upload changes to Gerrit with')
1562 print(' git cl upload --gerrit')
1563 print('or set Gerrit to be your default code review tool with')
1564 print(' git config gerrit.host true')
1565 print('=====================================')
1566
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001567 # Fast best-effort checks to abort before running potentially
1568 # expensive hooks if uploading is likely to fail anyway. Passing these
1569 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001570 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001571 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572
1573 # Apply watchlists on upload.
1574 change = self.GetChange(base_branch, None)
1575 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1576 files = [f.LocalPath() for f in change.AffectedFiles()]
1577 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001578 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579
1580 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001581 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001582 # Set the reviewer list now so that presubmit checks can access it.
1583 change_description = ChangeDescription(change.FullDescriptionText())
1584 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001585 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001586 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 change)
1588 change.SetDescriptionText(change_description.description)
1589 hook_results = self.RunHook(committing=False,
1590 may_prompt=not options.force,
1591 verbose=options.verbose,
1592 change=change)
1593 if not hook_results.should_continue():
1594 return 1
1595 if not options.reviewers and hook_results.reviewers:
1596 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001597 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001599 # TODO(tandrii): Checking local patchset against remote patchset is only
1600 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1601 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602 latest_patchset = self.GetMostRecentPatchset()
1603 local_patchset = self.GetPatchset()
1604 if (latest_patchset and local_patchset and
1605 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001606 print('The last upload made from this repository was patchset #%d but '
1607 'the most recent patchset on the server is #%d.'
1608 % (local_patchset, latest_patchset))
1609 print('Uploading will still work, but if you\'ve uploaded to this '
1610 'issue from another machine or branch the patch you\'re '
1611 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001612 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001613
Aaron Gable13101a62018-02-09 13:20:41 -08001614 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001615 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616 if not ret:
Ravi Mistry31e7d562018-04-02 12:53:57 -04001617 if self.IsGerrit():
1618 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
1619 options.cq_dry_run);
1620 else:
1621 if options.use_commit_queue:
1622 self.SetCQState(_CQState.COMMIT)
1623 elif options.cq_dry_run:
1624 self.SetCQState(_CQState.DRY_RUN)
tandrii4d0545a2016-07-06 03:56:49 -07001625
tandrii5d48c322016-08-18 16:19:37 -07001626 _git_set_branch_config_value('last-upload-hash',
1627 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001628 # Run post upload hooks, if specified.
1629 if settings.GetRunPostUploadHook():
1630 presubmit_support.DoPostUploadExecuter(
1631 change,
1632 self,
1633 settings.GetRoot(),
1634 options.verbose,
1635 sys.stdout)
1636
1637 # Upload all dependencies if specified.
1638 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001639 print()
1640 print('--dependencies has been specified.')
1641 print('All dependent local branches will be re-uploaded.')
1642 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001643 # Remove the dependencies flag from args so that we do not end up in a
1644 # loop.
1645 orig_args.remove('--dependencies')
1646 ret = upload_branch_deps(self, orig_args)
1647 return ret
1648
Ravi Mistry31e7d562018-04-02 12:53:57 -04001649 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1650 """Sets labels on the change based on the provided flags.
1651
1652 Sets labels if issue is already uploaded and known, else returns without
1653 doing anything.
1654
1655 Args:
1656 enable_auto_submit: Sets Auto-Submit+1 on the change.
1657 use_commit_queue: Sets Commit-Queue+2 on the change.
1658 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1659 both use_commit_queue and cq_dry_run are true.
1660 """
1661 if not self.GetIssue():
1662 return
1663 try:
1664 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1665 cq_dry_run)
1666 return 0
1667 except KeyboardInterrupt:
1668 raise
1669 except:
1670 labels = []
1671 if enable_auto_submit:
1672 labels.append('Auto-Submit')
1673 if use_commit_queue or cq_dry_run:
1674 labels.append('Commit-Queue')
1675 print('WARNING: Failed to set label(s) on your change: %s\n'
1676 'Either:\n'
1677 ' * Your project does not have the above label(s),\n'
1678 ' * You don\'t have permission to set the above label(s),\n'
1679 ' * There\'s a bug in this code (see stack trace below).\n' %
1680 (', '.join(labels)))
1681 # Still raise exception so that stack trace is printed.
1682 raise
1683
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001684 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001685 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001686
1687 Issue must have been already uploaded and known.
1688 """
1689 assert new_state in _CQState.ALL_STATES
1690 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001691 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001692 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001693 return 0
1694 except KeyboardInterrupt:
1695 raise
1696 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001697 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001698 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001699 ' * Your project has no CQ,\n'
1700 ' * You don\'t have permission to change the CQ state,\n'
1701 ' * There\'s a bug in this code (see stack trace below).\n'
1702 'Consider specifying which bots to trigger manually or asking your '
1703 'project owners for permissions or contacting Chrome Infra at:\n'
1704 'https://www.chromium.org/infra\n\n' %
1705 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001706 # Still raise exception so that stack trace is printed.
1707 raise
1708
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001709 # Forward methods to codereview specific implementation.
1710
Aaron Gable636b13f2017-07-14 10:42:48 -07001711 def AddComment(self, message, publish=None):
1712 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001713
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001714 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001715 """Returns list of _CommentSummary for each comment.
1716
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001717 args:
1718 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001719 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001720 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001721
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001722 def CloseIssue(self):
1723 return self._codereview_impl.CloseIssue()
1724
1725 def GetStatus(self):
1726 return self._codereview_impl.GetStatus()
1727
1728 def GetCodereviewServer(self):
1729 return self._codereview_impl.GetCodereviewServer()
1730
tandriide281ae2016-10-12 06:02:30 -07001731 def GetIssueOwner(self):
1732 """Get owner from codereview, which may differ from this checkout."""
1733 return self._codereview_impl.GetIssueOwner()
1734
Edward Lemur707d70b2018-02-07 00:50:14 +01001735 def GetReviewers(self):
1736 return self._codereview_impl.GetReviewers()
1737
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738 def GetMostRecentPatchset(self):
1739 return self._codereview_impl.GetMostRecentPatchset()
1740
tandriide281ae2016-10-12 06:02:30 -07001741 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001742 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001743 return self._codereview_impl.CannotTriggerTryJobReason()
1744
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001745 def GetTryJobProperties(self, patchset=None):
1746 """Returns dictionary of properties to launch try job."""
1747 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001748
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749 def __getattr__(self, attr):
1750 # This is because lots of untested code accesses Rietveld-specific stuff
1751 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001752 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001753 # Note that child method defines __getattr__ as well, and forwards it here,
1754 # because _RietveldChangelistImpl is not cleaned up yet, and given
1755 # deprecation of Rietveld, it should probably be just removed.
1756 # Until that time, avoid infinite recursion by bypassing __getattr__
1757 # of implementation class.
1758 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001759
1760
1761class _ChangelistCodereviewBase(object):
1762 """Abstract base class encapsulating codereview specifics of a changelist."""
1763 def __init__(self, changelist):
1764 self._changelist = changelist # instance of Changelist
1765
1766 def __getattr__(self, attr):
1767 # Forward methods to changelist.
1768 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1769 # _RietveldChangelistImpl to avoid this hack?
1770 return getattr(self._changelist, attr)
1771
1772 def GetStatus(self):
1773 """Apply a rough heuristic to give a simple summary of an issue's review
1774 or CQ status, assuming adherence to a common workflow.
1775
1776 Returns None if no issue for this branch, or specific string keywords.
1777 """
1778 raise NotImplementedError()
1779
1780 def GetCodereviewServer(self):
1781 """Returns server URL without end slash, like "https://codereview.com"."""
1782 raise NotImplementedError()
1783
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001784 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001785 """Fetches and returns description from the codereview server."""
1786 raise NotImplementedError()
1787
tandrii5d48c322016-08-18 16:19:37 -07001788 @classmethod
1789 def IssueConfigKey(cls):
1790 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 raise NotImplementedError()
1792
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001793 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001794 def PatchsetConfigKey(cls):
1795 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 raise NotImplementedError()
1797
tandrii5d48c322016-08-18 16:19:37 -07001798 @classmethod
1799 def CodereviewServerConfigKey(cls):
1800 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 raise NotImplementedError()
1802
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001803 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001804 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001805 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001806
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001807 def GetGerritObjForPresubmit(self):
1808 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1809 return None
1810
dsansomee2d6fd92016-09-08 00:10:47 -07001811 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812 """Update the description on codereview site."""
1813 raise NotImplementedError()
1814
Aaron Gable636b13f2017-07-14 10:42:48 -07001815 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001816 """Posts a comment to the codereview site."""
1817 raise NotImplementedError()
1818
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001819 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001820 raise NotImplementedError()
1821
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822 def CloseIssue(self):
1823 """Closes the issue."""
1824 raise NotImplementedError()
1825
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826 def GetMostRecentPatchset(self):
1827 """Returns the most recent patchset number from the codereview site."""
1828 raise NotImplementedError()
1829
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001830 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001831 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001832 """Fetches and applies the issue.
1833
1834 Arguments:
1835 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1836 reject: if True, reject the failed patch instead of switching to 3-way
1837 merge. Rietveld only.
1838 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1839 only.
1840 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001841 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001842 """
1843 raise NotImplementedError()
1844
1845 @staticmethod
1846 def ParseIssueURL(parsed_url):
1847 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1848 failed."""
1849 raise NotImplementedError()
1850
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001851 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001852 """Best effort check that user is authenticated with codereview server.
1853
1854 Arguments:
1855 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001856 refresh: whether to attempt to refresh credentials. Ignored if not
1857 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001858 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001859 raise NotImplementedError()
1860
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001861 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001862 """Best effort check that uploading isn't supposed to fail for predictable
1863 reasons.
1864
1865 This method should raise informative exception if uploading shouldn't
1866 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001867
1868 Arguments:
1869 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001870 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001871 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001872
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001873 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001874 """Uploads a change to codereview."""
1875 raise NotImplementedError()
1876
Ravi Mistry31e7d562018-04-02 12:53:57 -04001877 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1878 """Sets labels on the change based on the provided flags.
1879
1880 Issue must have been already uploaded and known.
1881 """
1882 raise NotImplementedError()
1883
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001884 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001885 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001886
1887 Issue must have been already uploaded and known.
1888 """
1889 raise NotImplementedError()
1890
tandriie113dfd2016-10-11 10:20:12 -07001891 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001892 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001893 raise NotImplementedError()
1894
tandriide281ae2016-10-12 06:02:30 -07001895 def GetIssueOwner(self):
1896 raise NotImplementedError()
1897
Edward Lemur707d70b2018-02-07 00:50:14 +01001898 def GetReviewers(self):
1899 raise NotImplementedError()
1900
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001901 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001902 raise NotImplementedError()
1903
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001904
1905class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001906
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001907 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908 super(_RietveldChangelistImpl, self).__init__(changelist)
1909 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001911 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001912
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001913 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001914 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915 self._props = None
1916 self._rpc_server = None
1917
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918 def GetCodereviewServer(self):
1919 if not self._rietveld_server:
1920 # If we're on a branch then get the server potentially associated
1921 # with that branch.
1922 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001923 self._rietveld_server = gclient_utils.UpgradeToHttps(
1924 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 if not self._rietveld_server:
1926 self._rietveld_server = settings.GetDefaultServerUrl()
1927 return self._rietveld_server
1928
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001929 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001930 """Best effort check that user is authenticated with Rietveld server."""
1931 if self._auth_config.use_oauth2:
1932 authenticator = auth.get_authenticator_for_host(
1933 self.GetCodereviewServer(), self._auth_config)
1934 if not authenticator.has_cached_credentials():
1935 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001936 if refresh:
1937 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001938
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001939 def EnsureCanUploadPatchset(self, force):
1940 # No checks for Rietveld because we are deprecating Rietveld.
1941 pass
1942
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001943 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001944 issue = self.GetIssue()
1945 assert issue
1946 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001947 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948 except urllib2.HTTPError as e:
1949 if e.code == 404:
1950 DieWithError(
1951 ('\nWhile fetching the description for issue %d, received a '
1952 '404 (not found)\n'
1953 'error. It is likely that you deleted this '
1954 'issue on the server. If this is the\n'
1955 'case, please run\n\n'
1956 ' git cl issue 0\n\n'
1957 'to clear the association with the deleted issue. Then run '
1958 'this command again.') % issue)
1959 else:
1960 DieWithError(
1961 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1962 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001963 print('Warning: Failed to retrieve CL description due to network '
1964 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965 return ''
1966
1967 def GetMostRecentPatchset(self):
1968 return self.GetIssueProperties()['patchsets'][-1]
1969
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001970 def GetIssueProperties(self):
1971 if self._props is None:
1972 issue = self.GetIssue()
1973 if not issue:
1974 self._props = {}
1975 else:
1976 self._props = self.RpcServer().get_issue_properties(issue, True)
1977 return self._props
1978
tandriie113dfd2016-10-11 10:20:12 -07001979 def CannotTriggerTryJobReason(self):
1980 props = self.GetIssueProperties()
1981 if not props:
1982 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1983 if props.get('closed'):
1984 return 'CL %s is closed' % self.GetIssue()
1985 if props.get('private'):
1986 return 'CL %s is private' % self.GetIssue()
1987 return None
1988
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001989 def GetTryJobProperties(self, patchset=None):
1990 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001991 project = (self.GetIssueProperties() or {}).get('project')
1992 return {
1993 'issue': self.GetIssue(),
1994 'patch_project': project,
1995 'patch_storage': 'rietveld',
1996 'patchset': patchset or self.GetPatchset(),
1997 'rietveld': self.GetCodereviewServer(),
1998 }
1999
tandriide281ae2016-10-12 06:02:30 -07002000 def GetIssueOwner(self):
2001 return (self.GetIssueProperties() or {}).get('owner_email')
2002
Edward Lemur707d70b2018-02-07 00:50:14 +01002003 def GetReviewers(self):
2004 return (self.GetIssueProperties() or {}).get('reviewers')
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
Ravi Mistry31e7d562018-04-02 12:53:57 -04002124 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2125 raise NotImplementedError()
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
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002272 # Include the upstream repo's URL in the change -- this is useful for
2273 # projects that have their source spread across multiple repos.
2274 remote_url = self.GetGitBaseUrlFromConfig()
2275 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002276 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2277 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2278 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002279 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002280 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002281 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002282 if target_ref:
2283 upload_args.extend(['--target_ref', target_ref])
2284
2285 # Look for dependent patchsets. See crbug.com/480453 for more details.
2286 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2287 upstream_branch = ShortBranchName(upstream_branch)
2288 if remote is '.':
2289 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002290 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002292 print()
2293 print('Skipping dependency patchset upload because git config '
2294 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2295 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002296 else:
2297 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002298 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002299 auth_config=auth_config)
2300 branch_cl_issue_url = branch_cl.GetIssueURL()
2301 branch_cl_issue = branch_cl.GetIssue()
2302 branch_cl_patchset = branch_cl.GetPatchset()
2303 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2304 upload_args.extend(
2305 ['--depends_on_patchset', '%s:%s' % (
2306 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002307 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002308 '\n'
2309 'The current branch (%s) is tracking a local branch (%s) with '
2310 'an associated CL.\n'
2311 'Adding %s/#ps%s as a dependency patchset.\n'
2312 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2313 branch_cl_patchset))
2314
2315 project = settings.GetProject()
2316 if project:
2317 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002318 else:
2319 print()
2320 print('WARNING: Uploading without a project specified. Please ensure '
2321 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2322 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002323
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002324 try:
2325 upload_args = ['upload'] + upload_args + args
2326 logging.info('upload.RealMain(%s)', upload_args)
2327 issue, patchset = upload.RealMain(upload_args)
2328 issue = int(issue)
2329 patchset = int(patchset)
2330 except KeyboardInterrupt:
2331 sys.exit(1)
2332 except:
2333 # If we got an exception after the user typed a description for their
2334 # change, back up the description before re-raising.
2335 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002336 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002337 raise
2338
2339 if not self.GetIssue():
2340 self.SetIssue(issue)
2341 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 return 0
2343
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002344
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002345class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002346 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002347 # auth_config is Rietveld thing, kept here to preserve interface only.
2348 super(_GerritChangelistImpl, self).__init__(changelist)
2349 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002350 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002351 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002352 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002353 # Map from change number (issue) to its detail cache.
2354 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002355
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002356 if codereview_host is not None:
2357 assert not codereview_host.startswith('https://'), codereview_host
2358 self._gerrit_host = codereview_host
2359 self._gerrit_server = 'https://%s' % codereview_host
2360
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002361 def _GetGerritHost(self):
2362 # Lazy load of configs.
2363 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002364 if self._gerrit_host and '.' not in self._gerrit_host:
2365 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2366 # This happens for internal stuff http://crbug.com/614312.
2367 parsed = urlparse.urlparse(self.GetRemoteUrl())
2368 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002369 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002370 ' Your current remote is: %s' % self.GetRemoteUrl())
2371 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2372 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002373 return self._gerrit_host
2374
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002375 def _GetGitHost(self):
2376 """Returns git host to be used when uploading change to Gerrit."""
2377 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2378
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002379 def GetCodereviewServer(self):
2380 if not self._gerrit_server:
2381 # If we're on a branch then get the server potentially associated
2382 # with that branch.
2383 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002384 self._gerrit_server = self._GitGetBranchConfigValue(
2385 self.CodereviewServerConfigKey())
2386 if self._gerrit_server:
2387 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002388 if not self._gerrit_server:
2389 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2390 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002391 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002392 parts[0] = parts[0] + '-review'
2393 self._gerrit_host = '.'.join(parts)
2394 self._gerrit_server = 'https://%s' % self._gerrit_host
2395 return self._gerrit_server
2396
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002397 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002398 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002399 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002400
tandrii5d48c322016-08-18 16:19:37 -07002401 @classmethod
2402 def PatchsetConfigKey(cls):
2403 return 'gerritpatchset'
2404
2405 @classmethod
2406 def CodereviewServerConfigKey(cls):
2407 return 'gerritserver'
2408
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002409 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002410 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002411 if settings.GetGerritSkipEnsureAuthenticated():
2412 # For projects with unusual authentication schemes.
2413 # See http://crbug.com/603378.
2414 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002415 # Lazy-loader to identify Gerrit and Git hosts.
2416 if gerrit_util.GceAuthenticator.is_gce():
2417 return
2418 self.GetCodereviewServer()
2419 git_host = self._GetGitHost()
2420 assert self._gerrit_server and self._gerrit_host
2421 cookie_auth = gerrit_util.CookiesAuthenticator()
2422
2423 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2424 git_auth = cookie_auth.get_auth_header(git_host)
2425 if gerrit_auth and git_auth:
2426 if gerrit_auth == git_auth:
2427 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002428 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002429 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002430 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002431 ' %s\n'
2432 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002433 ' Consider running the following command:\n'
2434 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002435 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002436 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002437 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002438 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002439 cookie_auth.get_new_password_message(git_host)))
2440 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002441 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002442 return
2443 else:
2444 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002445 ([] if gerrit_auth else [self._gerrit_host]) +
2446 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002447 DieWithError('Credentials for the following hosts are required:\n'
2448 ' %s\n'
2449 'These are read from %s (or legacy %s)\n'
2450 '%s' % (
2451 '\n '.join(missing),
2452 cookie_auth.get_gitcookies_path(),
2453 cookie_auth.get_netrc_path(),
2454 cookie_auth.get_new_password_message(git_host)))
2455
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002456 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002457 if not self.GetIssue():
2458 return
2459
2460 # Warm change details cache now to avoid RPCs later, reducing latency for
2461 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002462 self._GetChangeDetail(
2463 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002464
2465 status = self._GetChangeDetail()['status']
2466 if status in ('MERGED', 'ABANDONED'):
2467 DieWithError('Change %s has been %s, new uploads are not allowed' %
2468 (self.GetIssueURL(),
2469 'submitted' if status == 'MERGED' else 'abandoned'))
2470
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002471 if gerrit_util.GceAuthenticator.is_gce():
2472 return
2473 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2474 self._GetGerritHost())
2475 if self.GetIssueOwner() == cookies_user:
2476 return
2477 logging.debug('change %s owner is %s, cookies user is %s',
2478 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002479 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002480 # so ask what Gerrit thinks of this user.
2481 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2482 if details['email'] == self.GetIssueOwner():
2483 return
2484 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002485 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002486 'as %s.\n'
2487 'Uploading may fail due to lack of permissions.' %
2488 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2489 confirm_or_exit(action='upload')
2490
2491
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002492 def _PostUnsetIssueProperties(self):
2493 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002494 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002495
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002496 def GetGerritObjForPresubmit(self):
2497 return presubmit_support.GerritAccessor(self._GetGerritHost())
2498
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002499 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002500 """Apply a rough heuristic to give a simple summary of an issue's review
2501 or CQ status, assuming adherence to a common workflow.
2502
2503 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002504 * 'error' - error from review tool (including deleted issues)
2505 * 'unsent' - no reviewers added
2506 * 'waiting' - waiting for review
2507 * 'reply' - waiting for uploader to reply to review
2508 * 'lgtm' - Code-Review label has been set
2509 * 'commit' - in the commit queue
2510 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002511 """
2512 if not self.GetIssue():
2513 return None
2514
2515 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002516 data = self._GetChangeDetail([
2517 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002518 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002519 return 'error'
2520
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002521 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 return 'closed'
2523
Aaron Gable9ab38c62017-04-06 14:36:33 -07002524 if data['labels'].get('Commit-Queue', {}).get('approved'):
2525 # The section will have an "approved" subsection if anyone has voted
2526 # the maximum value on the label.
2527 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002528
Aaron Gable9ab38c62017-04-06 14:36:33 -07002529 if data['labels'].get('Code-Review', {}).get('approved'):
2530 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531
2532 if not data.get('reviewers', {}).get('REVIEWER', []):
2533 return 'unsent'
2534
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002535 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002536 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2537 last_message_author = messages.pop().get('author', {})
2538 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002539 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2540 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002541 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002542 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002543 if last_message_author.get('_account_id') == owner:
2544 # Most recent message was by owner.
2545 return 'waiting'
2546 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002547 # Some reply from non-owner.
2548 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002549
2550 # Somehow there are no messages even though there are reviewers.
2551 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002552
2553 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002555 patchset = data['revisions'][data['current_revision']]['_number']
2556 self.SetPatchset(patchset)
2557 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002558
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002559 def FetchDescription(self, force=False):
2560 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2561 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002562 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002563 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002564
dsansomee2d6fd92016-09-08 00:10:47 -07002565 def UpdateDescriptionRemote(self, description, force=False):
2566 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2567 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002568 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002569 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002570 'unpublished edit. Either publish the edit in the Gerrit web UI '
2571 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002572
2573 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2574 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002575 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002576 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002577
Aaron Gable636b13f2017-07-14 10:42:48 -07002578 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002579 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002580 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002581
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002582 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002583 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002584 messages = self._GetChangeDetail(
2585 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2586 file_comments = gerrit_util.GetChangeComments(
2587 self._GetGerritHost(), self.GetIssue())
2588
2589 # Build dictionary of file comments for easy access and sorting later.
2590 # {author+date: {path: {patchset: {line: url+message}}}}
2591 comments = collections.defaultdict(
2592 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2593 for path, line_comments in file_comments.iteritems():
2594 for comment in line_comments:
2595 if comment.get('tag', '').startswith('autogenerated'):
2596 continue
2597 key = (comment['author']['email'], comment['updated'])
2598 if comment.get('side', 'REVISION') == 'PARENT':
2599 patchset = 'Base'
2600 else:
2601 patchset = 'PS%d' % comment['patch_set']
2602 line = comment.get('line', 0)
2603 url = ('https://%s/c/%s/%s/%s#%s%s' %
2604 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2605 'b' if comment.get('side') == 'PARENT' else '',
2606 str(line) if line else ''))
2607 comments[key][path][patchset][line] = (url, comment['message'])
2608
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002609 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002610 for msg in messages:
2611 # Don't bother showing autogenerated messages.
2612 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2613 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002614 # Gerrit spits out nanoseconds.
2615 assert len(msg['date'].split('.')[-1]) == 9
2616 date = datetime.datetime.strptime(msg['date'][:-3],
2617 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002618 message = msg['message']
2619 key = (msg['author']['email'], msg['date'])
2620 if key in comments:
2621 message += '\n'
2622 for path, patchsets in sorted(comments.get(key, {}).items()):
2623 if readable:
2624 message += '\n%s' % path
2625 for patchset, lines in sorted(patchsets.items()):
2626 for line, (url, content) in sorted(lines.items()):
2627 if line:
2628 line_str = 'Line %d' % line
2629 path_str = '%s:%d:' % (path, line)
2630 else:
2631 line_str = 'File comment'
2632 path_str = '%s:0:' % path
2633 if readable:
2634 message += '\n %s, %s: %s' % (patchset, line_str, url)
2635 message += '\n %s\n' % content
2636 else:
2637 message += '\n%s ' % path_str
2638 message += '\n%s\n' % content
2639
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002640 summary.append(_CommentSummary(
2641 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002642 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002643 sender=msg['author']['email'],
2644 # These could be inferred from the text messages and correlated with
2645 # Code-Review label maximum, however this is not reliable.
2646 # Leaving as is until the need arises.
2647 approval=False,
2648 disapproval=False,
2649 ))
2650 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002651
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002652 def CloseIssue(self):
2653 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2654
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002655 def SubmitIssue(self, wait_for_merge=True):
2656 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2657 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002658
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002659 def _GetChangeDetail(self, options=None, issue=None,
2660 no_cache=False):
2661 """Returns details of the issue by querying Gerrit and caching results.
2662
2663 If fresh data is needed, set no_cache=True which will clear cache and
2664 thus new data will be fetched from Gerrit.
2665 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002666 options = options or []
2667 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002668 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002669
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002670 # Optimization to avoid multiple RPCs:
2671 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2672 'CURRENT_COMMIT' not in options):
2673 options.append('CURRENT_COMMIT')
2674
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002675 # Normalize issue and options for consistent keys in cache.
2676 issue = str(issue)
2677 options = [o.upper() for o in options]
2678
2679 # Check in cache first unless no_cache is True.
2680 if no_cache:
2681 self._detail_cache.pop(issue, None)
2682 else:
2683 options_set = frozenset(options)
2684 for cached_options_set, data in self._detail_cache.get(issue, []):
2685 # Assumption: data fetched before with extra options is suitable
2686 # for return for a smaller set of options.
2687 # For example, if we cached data for
2688 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2689 # and request is for options=[CURRENT_REVISION],
2690 # THEN we can return prior cached data.
2691 if options_set.issubset(cached_options_set):
2692 return data
2693
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002694 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002695 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002696 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002697 except gerrit_util.GerritError as e:
2698 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002699 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002700 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002701
2702 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002703 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002704
agable32978d92016-11-01 12:55:02 -07002705 def _GetChangeCommit(self, issue=None):
2706 issue = issue or self.GetIssue()
2707 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002708 try:
2709 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2710 except gerrit_util.GerritError as e:
2711 if e.http_status == 404:
2712 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2713 raise
agable32978d92016-11-01 12:55:02 -07002714 return data
2715
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002716 def CMDLand(self, force, bypass_hooks, verbose):
2717 if git_common.is_dirty_git_tree('land'):
2718 return 1
tandriid60367b2016-06-22 05:25:12 -07002719 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2720 if u'Commit-Queue' in detail.get('labels', {}):
2721 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002722 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2723 'which can test and land changes for you. '
2724 'Are you sure you wish to bypass it?\n',
2725 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002726
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002727 differs = True
tandriic4344b52016-08-29 06:04:54 -07002728 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002729 # Note: git diff outputs nothing if there is no diff.
2730 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002731 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002732 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002733 if detail['current_revision'] == last_upload:
2734 differs = False
2735 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002736 print('WARNING: Local branch contents differ from latest uploaded '
2737 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002738 if differs:
2739 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002740 confirm_or_exit(
2741 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2742 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002743 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002744 elif not bypass_hooks:
2745 hook_results = self.RunHook(
2746 committing=True,
2747 may_prompt=not force,
2748 verbose=verbose,
2749 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2750 if not hook_results.should_continue():
2751 return 1
2752
2753 self.SubmitIssue(wait_for_merge=True)
2754 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002755 links = self._GetChangeCommit().get('web_links', [])
2756 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002757 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002758 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002759 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002760 return 0
2761
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002762 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002763 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002764 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002765 assert not directory
2766 assert parsed_issue_arg.valid
2767
2768 self._changelist.issue = parsed_issue_arg.issue
2769
2770 if parsed_issue_arg.hostname:
2771 self._gerrit_host = parsed_issue_arg.hostname
2772 self._gerrit_server = 'https://%s' % self._gerrit_host
2773
tandriic2405f52016-10-10 08:13:15 -07002774 try:
2775 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002776 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002777 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002778
2779 if not parsed_issue_arg.patchset:
2780 # Use current revision by default.
2781 revision_info = detail['revisions'][detail['current_revision']]
2782 patchset = int(revision_info['_number'])
2783 else:
2784 patchset = parsed_issue_arg.patchset
2785 for revision_info in detail['revisions'].itervalues():
2786 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2787 break
2788 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002789 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002790 (parsed_issue_arg.patchset, self.GetIssue()))
2791
Aaron Gable697a91b2018-01-19 15:20:15 -08002792 remote_url = self._changelist.GetRemoteUrl()
2793 if remote_url.endswith('.git'):
2794 remote_url = remote_url[:-len('.git')]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002795 fetch_info = revision_info['fetch']['http']
Aaron Gable697a91b2018-01-19 15:20:15 -08002796
2797 if remote_url != fetch_info['url']:
2798 DieWithError('Trying to patch a change from %s but this repo appears '
2799 'to be %s.' % (fetch_info['url'], remote_url))
2800
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002801 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002802
Aaron Gable62619a32017-06-16 08:22:09 -07002803 if force:
2804 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2805 print('Checked out commit for change %i patchset %i locally' %
2806 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002807 elif nocommit:
2808 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2809 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002810 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002811 RunGit(['cherry-pick', 'FETCH_HEAD'])
2812 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002813 (parsed_issue_arg.issue, patchset))
2814 print('Note: this created a local commit which does not have '
2815 'the same hash as the one uploaded for review. This will make '
2816 'uploading changes based on top of this branch difficult.\n'
2817 'If you want to do that, use "git cl patch --force" instead.')
2818
Stefan Zagerd08043c2017-10-12 12:07:02 -07002819 if self.GetBranch():
2820 self.SetIssue(parsed_issue_arg.issue)
2821 self.SetPatchset(patchset)
2822 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2823 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2824 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2825 else:
2826 print('WARNING: You are in detached HEAD state.\n'
2827 'The patch has been applied to your checkout, but you will not be '
2828 'able to upload a new patch set to the gerrit issue.\n'
2829 'Try using the \'-b\' option if you would like to work on a '
2830 'branch and/or upload a new patch set.')
2831
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002832 return 0
2833
2834 @staticmethod
2835 def ParseIssueURL(parsed_url):
2836 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2837 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002838 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2839 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002840 # Short urls like https://domain/<issue_number> can be used, but don't allow
2841 # specifying the patchset (you'd 404), but we allow that here.
2842 if parsed_url.path == '/':
2843 part = parsed_url.fragment
2844 else:
2845 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002846 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002847 if match:
2848 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002849 issue=int(match.group(3)),
2850 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002851 hostname=parsed_url.netloc,
2852 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002853 return None
2854
tandrii16e0b4e2016-06-07 10:34:28 -07002855 def _GerritCommitMsgHookCheck(self, offer_removal):
2856 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2857 if not os.path.exists(hook):
2858 return
2859 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2860 # custom developer made one.
2861 data = gclient_utils.FileRead(hook)
2862 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2863 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002864 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002865 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002866 'and may interfere with it in subtle ways.\n'
2867 'We recommend you remove the commit-msg hook.')
2868 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002869 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002870 gclient_utils.rm_file_or_tree(hook)
2871 print('Gerrit commit-msg hook removed.')
2872 else:
2873 print('OK, will keep Gerrit commit-msg hook in place.')
2874
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002875 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002877 if options.squash and options.no_squash:
2878 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002879
2880 if not options.squash and not options.no_squash:
2881 # Load default for user, repo, squash=true, in this order.
2882 options.squash = settings.GetSquashGerritUploads()
2883 elif options.no_squash:
2884 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002885
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002887 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888
Aaron Gableb56ad332017-01-06 15:24:31 -08002889 # This may be None; default fallback value is determined in logic below.
2890 title = options.title
2891
Dominic Battre7d1c4842017-10-27 09:17:28 +02002892 # Extract bug number from branch name.
2893 bug = options.bug
2894 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2895 if not bug and match:
2896 bug = match.group(1)
2897
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002898 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002899 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002900 if self.GetIssue():
2901 # Try to get the message from a previous upload.
2902 message = self.GetDescription()
2903 if not message:
2904 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002905 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002907 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002908 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002909 # When uploading a subsequent patchset, -m|--message is taken
2910 # as the patchset title if --title was not provided.
2911 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002912 else:
2913 default_title = RunGit(
2914 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002915 if options.force:
2916 title = default_title
2917 else:
2918 title = ask_for_data(
2919 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002920 change_id = self._GetChangeDetail()['change_id']
2921 while True:
2922 footer_change_ids = git_footers.get_footer_change_id(message)
2923 if footer_change_ids == [change_id]:
2924 break
2925 if not footer_change_ids:
2926 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002927 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002928 continue
2929 # There is already a valid footer but with different or several ids.
2930 # Doing this automatically is non-trivial as we don't want to lose
2931 # existing other footers, yet we want to append just 1 desired
2932 # Change-Id. Thus, just create a new footer, but let user verify the
2933 # new description.
2934 message = '%s\n\nChange-Id: %s' % (message, change_id)
2935 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002936 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002937 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002938 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002939 'Please, check the proposed correction to the description, '
2940 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2941 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2942 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002943 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002944 if not options.force:
2945 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002946 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002947 message = change_desc.description
2948 if not message:
2949 DieWithError("Description is empty. Aborting...")
2950 # Continue the while loop.
2951 # Sanity check of this code - we should end up with proper message
2952 # footer.
2953 assert [change_id] == git_footers.get_footer_change_id(message)
2954 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002955 else: # if not self.GetIssue()
2956 if options.message:
2957 message = options.message
2958 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002959 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002960 if options.title:
2961 message = options.title + '\n\n' + message
2962 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002963
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002964 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002965 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002966 # On first upload, patchset title is always this string, while
2967 # --title flag gets converted to first line of message.
2968 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002969 if not change_desc.description:
2970 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002971 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002972 if len(change_ids) > 1:
2973 DieWithError('too many Change-Id footers, at most 1 allowed.')
2974 if not change_ids:
2975 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002976 change_desc.set_description(git_footers.add_footer_change_id(
2977 change_desc.description,
2978 GenerateGerritChangeId(change_desc.description)))
2979 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002980 assert len(change_ids) == 1
2981 change_id = change_ids[0]
2982
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002983 if options.reviewers or options.tbrs or options.add_owners_to:
2984 change_desc.update_reviewers(options.reviewers, options.tbrs,
2985 options.add_owners_to, change)
2986
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002987 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002988 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2989 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002991 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2992 desc_tempfile.write(change_desc.description)
2993 desc_tempfile.close()
2994 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2995 '-F', desc_tempfile.name]).strip()
2996 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002997 else:
2998 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002999 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003000 if not change_desc.description:
3001 DieWithError("Description is empty. Aborting...")
3002
3003 if not git_footers.get_footer_change_id(change_desc.description):
3004 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003005 change_desc.set_description(
3006 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003007 if options.reviewers or options.tbrs or options.add_owners_to:
3008 change_desc.update_reviewers(options.reviewers, options.tbrs,
3009 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003010 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003011 # For no-squash mode, we assume the remote called "origin" is the one we
3012 # want. It is not worthwhile to support different workflows for
3013 # no-squash mode.
3014 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003015 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3016
3017 assert change_desc
3018 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3019 ref_to_push)]).splitlines()
3020 if len(commits) > 1:
3021 print('WARNING: This will upload %d commits. Run the following command '
3022 'to see which commits will be uploaded: ' % len(commits))
3023 print('git log %s..%s' % (parent, ref_to_push))
3024 print('You can also use `git squash-branch` to squash these into a '
3025 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003026 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003027
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003028 if options.reviewers or options.tbrs or options.add_owners_to:
3029 change_desc.update_reviewers(options.reviewers, options.tbrs,
3030 options.add_owners_to, change)
3031
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003032 # Extra options that can be specified at push time. Doc:
3033 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003034 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003035
Aaron Gable844cf292017-06-28 11:32:59 -07003036 # By default, new changes are started in WIP mode, and subsequent patchsets
3037 # don't send email. At any time, passing --send-mail will mark the change
3038 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003039 if options.send_mail:
3040 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003041 refspec_opts.append('notify=ALL')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003042 elif not self.GetIssue():
3043 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07003044 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003045 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003046
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003047 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003048 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003049
Aaron Gable9b713dd2016-12-14 16:04:21 -08003050 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003051 # Punctuation and whitespace in |title| must be percent-encoded.
3052 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003053
agablec6787972016-09-09 16:13:34 -07003054 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003055 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003056
rmistry9eadede2016-09-19 11:22:43 -07003057 if options.topic:
3058 # Documentation on Gerrit topics is here:
3059 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003060 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003061
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003062 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08003063 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003064 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08003065 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003066 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
3067
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003068 refspec_suffix = ''
3069 if refspec_opts:
3070 refspec_suffix = '%' + ','.join(refspec_opts)
3071 assert ' ' not in refspec_suffix, (
3072 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3073 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3074
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003075 try:
3076 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003077 ['git', 'push', self.GetRemoteUrl(), refspec],
3078 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003079 # Flush after every line: useful for seeing progress when running as
3080 # recipe.
3081 filter_fn=lambda _: sys.stdout.flush())
3082 except subprocess2.CalledProcessError:
3083 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003084 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003085 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003086 'credential problems:\n'
3087 ' git cl creds-check\n',
3088 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003089
3090 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003091 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003092 change_numbers = [m.group(1)
3093 for m in map(regex.match, push_stdout.splitlines())
3094 if m]
3095 if len(change_numbers) != 1:
3096 DieWithError(
3097 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003098 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003099 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003100 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003101
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003102 reviewers = sorted(change_desc.get_reviewers())
3103
tandrii88189772016-09-29 04:29:57 -07003104 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003105 if not options.private:
3106 cc = self.GetCCList().split(',')
3107 else:
3108 cc = []
tandrii88189772016-09-29 04:29:57 -07003109 if options.cc:
3110 cc.extend(options.cc)
3111 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003112 if change_desc.get_cced():
3113 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003114
3115 gerrit_util.AddReviewers(
3116 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3117 notify=bool(options.send_mail))
3118
Aaron Gablefd238082017-06-07 13:42:34 -07003119 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003120 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3121 score = 1
3122 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3123 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3124 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003125 gerrit_util.SetReview(
3126 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003127 msg='Self-approving for TBR',
3128 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003129
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003130 return 0
3131
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003132 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3133 change_desc):
3134 """Computes parent of the generated commit to be uploaded to Gerrit.
3135
3136 Returns revision or a ref name.
3137 """
3138 if custom_cl_base:
3139 # Try to avoid creating additional unintended CLs when uploading, unless
3140 # user wants to take this risk.
3141 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3142 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3143 local_ref_of_target_remote])
3144 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003145 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003146 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3147 'If you proceed with upload, more than 1 CL may be created by '
3148 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3149 'If you are certain that specified base `%s` has already been '
3150 'uploaded to Gerrit as another CL, you may proceed.\n' %
3151 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3152 if not force:
3153 confirm_or_exit(
3154 'Do you take responsibility for cleaning up potential mess '
3155 'resulting from proceeding with upload?',
3156 action='upload')
3157 return custom_cl_base
3158
Aaron Gablef97e33d2017-03-30 15:44:27 -07003159 if remote != '.':
3160 return self.GetCommonAncestorWithUpstream()
3161
3162 # If our upstream branch is local, we base our squashed commit on its
3163 # squashed version.
3164 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3165
Aaron Gablef97e33d2017-03-30 15:44:27 -07003166 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003167 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003168
3169 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003170 # TODO(tandrii): consider checking parent change in Gerrit and using its
3171 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3172 # the tree hash of the parent branch. The upside is less likely bogus
3173 # requests to reupload parent change just because it's uploadhash is
3174 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003175 parent = RunGit(['config',
3176 'branch.%s.gerritsquashhash' % upstream_branch_name],
3177 error_ok=True).strip()
3178 # Verify that the upstream branch has been uploaded too, otherwise
3179 # Gerrit will create additional CLs when uploading.
3180 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3181 RunGitSilent(['rev-parse', parent + ':'])):
3182 DieWithError(
3183 '\nUpload upstream branch %s first.\n'
3184 'It is likely that this branch has been rebased since its last '
3185 'upload, so you just need to upload it again.\n'
3186 '(If you uploaded it with --no-squash, then branch dependencies '
3187 'are not supported, and you should reupload with --squash.)'
3188 % upstream_branch_name,
3189 change_desc)
3190 return parent
3191
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003192 def _AddChangeIdToCommitMessage(self, options, args):
3193 """Re-commits using the current message, assumes the commit hook is in
3194 place.
3195 """
3196 log_desc = options.message or CreateDescriptionFromLog(args)
3197 git_command = ['commit', '--amend', '-m', log_desc]
3198 RunGit(git_command)
3199 new_log_desc = CreateDescriptionFromLog(args)
3200 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003201 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003202 return new_log_desc
3203 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003204 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003205
Ravi Mistry31e7d562018-04-02 12:53:57 -04003206 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3207 """Sets labels on the change based on the provided flags."""
3208 labels = {}
3209 notify = None;
3210 if enable_auto_submit:
3211 labels['Auto-Submit'] = 1
3212 if use_commit_queue:
3213 labels['Commit-Queue'] = 2
3214 elif cq_dry_run:
3215 labels['Commit-Queue'] = 1
3216 notify = False
3217 if labels:
3218 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3219 labels=labels, notify=notify)
3220
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003221 def SetCQState(self, new_state):
3222 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003223 vote_map = {
3224 _CQState.NONE: 0,
3225 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003226 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003227 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003228 labels = {'Commit-Queue': vote_map[new_state]}
3229 notify = False if new_state == _CQState.DRY_RUN else None
3230 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3231 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003232
tandriie113dfd2016-10-11 10:20:12 -07003233 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003234 try:
3235 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003236 except GerritChangeNotExists:
3237 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003238
3239 if data['status'] in ('ABANDONED', 'MERGED'):
3240 return 'CL %s is closed' % self.GetIssue()
3241
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003242 def GetTryJobProperties(self, patchset=None):
3243 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003244 data = self._GetChangeDetail(['ALL_REVISIONS'])
3245 patchset = int(patchset or self.GetPatchset())
3246 assert patchset
3247 revision_data = None # Pylint wants it to be defined.
3248 for revision_data in data['revisions'].itervalues():
3249 if int(revision_data['_number']) == patchset:
3250 break
3251 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003252 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003253 (patchset, self.GetIssue()))
3254 return {
3255 'patch_issue': self.GetIssue(),
3256 'patch_set': patchset or self.GetPatchset(),
3257 'patch_project': data['project'],
3258 'patch_storage': 'gerrit',
3259 'patch_ref': revision_data['fetch']['http']['ref'],
3260 'patch_repository_url': revision_data['fetch']['http']['url'],
3261 'patch_gerrit_url': self.GetCodereviewServer(),
3262 }
tandriie113dfd2016-10-11 10:20:12 -07003263
tandriide281ae2016-10-12 06:02:30 -07003264 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003265 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003266
Edward Lemur707d70b2018-02-07 00:50:14 +01003267 def GetReviewers(self):
3268 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3269 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3270
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003271
3272_CODEREVIEW_IMPLEMENTATIONS = {
3273 'rietveld': _RietveldChangelistImpl,
3274 'gerrit': _GerritChangelistImpl,
3275}
3276
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003277
iannuccie53c9352016-08-17 14:40:40 -07003278def _add_codereview_issue_select_options(parser, extra=""):
3279 _add_codereview_select_options(parser)
3280
3281 text = ('Operate on this issue number instead of the current branch\'s '
3282 'implicit issue.')
3283 if extra:
3284 text += ' '+extra
3285 parser.add_option('-i', '--issue', type=int, help=text)
3286
3287
3288def _process_codereview_issue_select_options(parser, options):
3289 _process_codereview_select_options(parser, options)
3290 if options.issue is not None and not options.forced_codereview:
3291 parser.error('--issue must be specified with either --rietveld or --gerrit')
3292
3293
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003294def _add_codereview_select_options(parser):
3295 """Appends --gerrit and --rietveld options to force specific codereview."""
3296 parser.codereview_group = optparse.OptionGroup(
3297 parser, 'EXPERIMENTAL! Codereview override options')
3298 parser.add_option_group(parser.codereview_group)
3299 parser.codereview_group.add_option(
3300 '--gerrit', action='store_true',
3301 help='Force the use of Gerrit for codereview')
3302 parser.codereview_group.add_option(
3303 '--rietveld', action='store_true',
3304 help='Force the use of Rietveld for codereview')
3305
3306
3307def _process_codereview_select_options(parser, options):
3308 if options.gerrit and options.rietveld:
3309 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3310 options.forced_codereview = None
3311 if options.gerrit:
3312 options.forced_codereview = 'gerrit'
3313 elif options.rietveld:
3314 options.forced_codereview = 'rietveld'
3315
3316
tandriif9aefb72016-07-01 09:06:51 -07003317def _get_bug_line_values(default_project, bugs):
3318 """Given default_project and comma separated list of bugs, yields bug line
3319 values.
3320
3321 Each bug can be either:
3322 * a number, which is combined with default_project
3323 * string, which is left as is.
3324
3325 This function may produce more than one line, because bugdroid expects one
3326 project per line.
3327
3328 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3329 ['v8:123', 'chromium:789']
3330 """
3331 default_bugs = []
3332 others = []
3333 for bug in bugs.split(','):
3334 bug = bug.strip()
3335 if bug:
3336 try:
3337 default_bugs.append(int(bug))
3338 except ValueError:
3339 others.append(bug)
3340
3341 if default_bugs:
3342 default_bugs = ','.join(map(str, default_bugs))
3343 if default_project:
3344 yield '%s:%s' % (default_project, default_bugs)
3345 else:
3346 yield default_bugs
3347 for other in sorted(others):
3348 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3349 yield other
3350
3351
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003352class ChangeDescription(object):
3353 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003354 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003355 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003356 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003357 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003358 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3359 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3360 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3361 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003362
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003363 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003364 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003365
agable@chromium.org42c20792013-09-12 17:34:49 +00003366 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003367 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003368 return '\n'.join(self._description_lines)
3369
3370 def set_description(self, desc):
3371 if isinstance(desc, basestring):
3372 lines = desc.splitlines()
3373 else:
3374 lines = [line.rstrip() for line in desc]
3375 while lines and not lines[0]:
3376 lines.pop(0)
3377 while lines and not lines[-1]:
3378 lines.pop(-1)
3379 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003380
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003381 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3382 """Rewrites the R=/TBR= line(s) as a single line each.
3383
3384 Args:
3385 reviewers (list(str)) - list of additional emails to use for reviewers.
3386 tbrs (list(str)) - list of additional emails to use for TBRs.
3387 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3388 the change that are missing OWNER coverage. If this is not None, you
3389 must also pass a value for `change`.
3390 change (Change) - The Change that should be used for OWNERS lookups.
3391 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003392 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003393 assert isinstance(tbrs, list), tbrs
3394
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003395 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003396 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003397
3398 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003399 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003400
3401 reviewers = set(reviewers)
3402 tbrs = set(tbrs)
3403 LOOKUP = {
3404 'TBR': tbrs,
3405 'R': reviewers,
3406 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003407
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003408 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003409 regexp = re.compile(self.R_LINE)
3410 matches = [regexp.match(line) for line in self._description_lines]
3411 new_desc = [l for i, l in enumerate(self._description_lines)
3412 if not matches[i]]
3413 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003414
agable@chromium.org42c20792013-09-12 17:34:49 +00003415 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003416
3417 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003418 for match in matches:
3419 if not match:
3420 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003421 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3422
3423 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003424 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003425 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003426 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003427 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003428 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003429 LOOKUP[add_owners_to].update(
3430 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003431
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003432 # If any folks ended up in both groups, remove them from tbrs.
3433 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003434
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003435 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3436 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003437
3438 # Put the new lines in the description where the old first R= line was.
3439 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3440 if 0 <= line_loc < len(self._description_lines):
3441 if new_tbr_line:
3442 self._description_lines.insert(line_loc, new_tbr_line)
3443 if new_r_line:
3444 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003445 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003446 if new_r_line:
3447 self.append_footer(new_r_line)
3448 if new_tbr_line:
3449 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003450
Aaron Gable3a16ed12017-03-23 10:51:55 -07003451 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003452 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003453 self.set_description([
3454 '# Enter a description of the change.',
3455 '# This will be displayed on the codereview site.',
3456 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003457 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003458 '--------------------',
3459 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003460
agable@chromium.org42c20792013-09-12 17:34:49 +00003461 regexp = re.compile(self.BUG_LINE)
3462 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003463 prefix = settings.GetBugPrefix()
3464 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003465 if git_footer:
3466 self.append_footer('Bug: %s' % ', '.join(values))
3467 else:
3468 for value in values:
3469 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003470
agable@chromium.org42c20792013-09-12 17:34:49 +00003471 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003472 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003473 if not content:
3474 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003475 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003476
Bruce Dawson2377b012018-01-11 16:46:49 -08003477 # Strip off comments and default inserted "Bug:" line.
3478 clean_lines = [line.rstrip() for line in lines if not
3479 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003480 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003481 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003482 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003483
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003484 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003485 """Adds a footer line to the description.
3486
3487 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3488 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3489 that Gerrit footers are always at the end.
3490 """
3491 parsed_footer_line = git_footers.parse_footer(line)
3492 if parsed_footer_line:
3493 # Line is a gerrit footer in the form: Footer-Key: any value.
3494 # Thus, must be appended observing Gerrit footer rules.
3495 self.set_description(
3496 git_footers.add_footer(self.description,
3497 key=parsed_footer_line[0],
3498 value=parsed_footer_line[1]))
3499 return
3500
3501 if not self._description_lines:
3502 self._description_lines.append(line)
3503 return
3504
3505 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3506 if gerrit_footers:
3507 # git_footers.split_footers ensures that there is an empty line before
3508 # actual (gerrit) footers, if any. We have to keep it that way.
3509 assert top_lines and top_lines[-1] == ''
3510 top_lines, separator = top_lines[:-1], top_lines[-1:]
3511 else:
3512 separator = [] # No need for separator if there are no gerrit_footers.
3513
3514 prev_line = top_lines[-1] if top_lines else ''
3515 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3516 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3517 top_lines.append('')
3518 top_lines.append(line)
3519 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003520
tandrii99a72f22016-08-17 14:33:24 -07003521 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003522 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003523 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003524 reviewers = [match.group(2).strip()
3525 for match in matches
3526 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003527 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003528
bradnelsond975b302016-10-23 12:20:23 -07003529 def get_cced(self):
3530 """Retrieves the list of reviewers."""
3531 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3532 cced = [match.group(2).strip() for match in matches if match]
3533 return cleanup_list(cced)
3534
Nodir Turakulov23b82142017-11-16 11:04:25 -08003535 def get_hash_tags(self):
3536 """Extracts and sanitizes a list of Gerrit hashtags."""
3537 subject = (self._description_lines or ('',))[0]
3538 subject = re.sub(
3539 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3540
3541 tags = []
3542 start = 0
3543 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3544 while True:
3545 m = bracket_exp.match(subject, start)
3546 if not m:
3547 break
3548 tags.append(self.sanitize_hash_tag(m.group(1)))
3549 start = m.end()
3550
3551 if not tags:
3552 # Try "Tag: " prefix.
3553 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3554 if m:
3555 tags.append(self.sanitize_hash_tag(m.group(1)))
3556 return tags
3557
3558 @classmethod
3559 def sanitize_hash_tag(cls, tag):
3560 """Returns a sanitized Gerrit hash tag.
3561
3562 A sanitized hashtag can be used as a git push refspec parameter value.
3563 """
3564 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3565
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003566 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3567 """Updates this commit description given the parent.
3568
3569 This is essentially what Gnumbd used to do.
3570 Consult https://goo.gl/WMmpDe for more details.
3571 """
3572 assert parent_msg # No, orphan branch creation isn't supported.
3573 assert parent_hash
3574 assert dest_ref
3575 parent_footer_map = git_footers.parse_footers(parent_msg)
3576 # This will also happily parse svn-position, which GnumbD is no longer
3577 # supporting. While we'd generate correct footers, the verifier plugin
3578 # installed in Gerrit will block such commit (ie git push below will fail).
3579 parent_position = git_footers.get_position(parent_footer_map)
3580
3581 # Cherry-picks may have last line obscuring their prior footers,
3582 # from git_footers perspective. This is also what Gnumbd did.
3583 cp_line = None
3584 if (self._description_lines and
3585 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3586 cp_line = self._description_lines.pop()
3587
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003588 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003589
3590 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3591 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003592 for i, line in enumerate(footer_lines):
3593 k, v = git_footers.parse_footer(line) or (None, None)
3594 if k and k.startswith('Cr-'):
3595 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003596
3597 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003598 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003599 if parent_position[0] == dest_ref:
3600 # Same branch as parent.
3601 number = int(parent_position[1]) + 1
3602 else:
3603 number = 1 # New branch, and extra lineage.
3604 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3605 int(parent_position[1])))
3606
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003607 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3608 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003609
3610 self._description_lines = top_lines
3611 if cp_line:
3612 self._description_lines.append(cp_line)
3613 if self._description_lines[-1] != '':
3614 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003615 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003616
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003617
Aaron Gablea1bab272017-04-11 16:38:18 -07003618def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003619 """Retrieves the reviewers that approved a CL from the issue properties with
3620 messages.
3621
3622 Note that the list may contain reviewers that are not committer, thus are not
3623 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003624
3625 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003626 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003627 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003628 return sorted(
3629 set(
3630 message['sender']
3631 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003632 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003633 )
3634 )
3635
3636
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003637def FindCodereviewSettingsFile(filename='codereview.settings'):
3638 """Finds the given file starting in the cwd and going up.
3639
3640 Only looks up to the top of the repository unless an
3641 'inherit-review-settings-ok' file exists in the root of the repository.
3642 """
3643 inherit_ok_file = 'inherit-review-settings-ok'
3644 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003645 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003646 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3647 root = '/'
3648 while True:
3649 if filename in os.listdir(cwd):
3650 if os.path.isfile(os.path.join(cwd, filename)):
3651 return open(os.path.join(cwd, filename))
3652 if cwd == root:
3653 break
3654 cwd = os.path.dirname(cwd)
3655
3656
3657def LoadCodereviewSettingsFromFile(fileobj):
3658 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003659 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003660
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003661 def SetProperty(name, setting, unset_error_ok=False):
3662 fullname = 'rietveld.' + name
3663 if setting in keyvals:
3664 RunGit(['config', fullname, keyvals[setting]])
3665 else:
3666 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3667
tandrii48df5812016-10-17 03:55:37 -07003668 if not keyvals.get('GERRIT_HOST', False):
3669 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003670 # Only server setting is required. Other settings can be absent.
3671 # In that case, we ignore errors raised during option deletion attempt.
3672 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003673 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003674 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3675 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003676 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003677 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3678 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003679 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003680 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3681 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003682
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003683 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003684 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003685
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003686 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003687 RunGit(['config', 'gerrit.squash-uploads',
3688 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003689
tandrii@chromium.org28253532016-04-14 13:46:56 +00003690 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003691 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003692 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3693
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003694 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003695 # should be of the form
3696 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3697 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003698 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3699 keyvals['ORIGIN_URL_CONFIG']])
3700
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003701
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003702def urlretrieve(source, destination):
3703 """urllib is broken for SSL connections via a proxy therefore we
3704 can't use urllib.urlretrieve()."""
3705 with open(destination, 'w') as f:
3706 f.write(urllib2.urlopen(source).read())
3707
3708
ukai@chromium.org712d6102013-11-27 00:52:58 +00003709def hasSheBang(fname):
3710 """Checks fname is a #! script."""
3711 with open(fname) as f:
3712 return f.read(2).startswith('#!')
3713
3714
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003715# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3716def DownloadHooks(*args, **kwargs):
3717 pass
3718
3719
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003720def DownloadGerritHook(force):
3721 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003722
3723 Args:
3724 force: True to update hooks. False to install hooks if not present.
3725 """
3726 if not settings.GetIsGerrit():
3727 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003728 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003729 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3730 if not os.access(dst, os.X_OK):
3731 if os.path.exists(dst):
3732 if not force:
3733 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003734 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003735 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003736 if not hasSheBang(dst):
3737 DieWithError('Not a script: %s\n'
3738 'You need to download from\n%s\n'
3739 'into .git/hooks/commit-msg and '
3740 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003741 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3742 except Exception:
3743 if os.path.exists(dst):
3744 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003745 DieWithError('\nFailed to download hooks.\n'
3746 'You need to download from\n%s\n'
3747 'into .git/hooks/commit-msg and '
3748 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003749
3750
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003751def GetRietveldCodereviewSettingsInteractively():
3752 """Prompt the user for settings."""
3753 server = settings.GetDefaultServerUrl(error_ok=True)
3754 prompt = 'Rietveld server (host[:port])'
3755 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3756 newserver = ask_for_data(prompt + ':')
3757 if not server and not newserver:
3758 newserver = DEFAULT_SERVER
3759 if newserver:
3760 newserver = gclient_utils.UpgradeToHttps(newserver)
3761 if newserver != server:
3762 RunGit(['config', 'rietveld.server', newserver])
3763
3764 def SetProperty(initial, caption, name, is_url):
3765 prompt = caption
3766 if initial:
3767 prompt += ' ("x" to clear) [%s]' % initial
3768 new_val = ask_for_data(prompt + ':')
3769 if new_val == 'x':
3770 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3771 elif new_val:
3772 if is_url:
3773 new_val = gclient_utils.UpgradeToHttps(new_val)
3774 if new_val != initial:
3775 RunGit(['config', 'rietveld.' + name, new_val])
3776
3777 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3778 SetProperty(settings.GetDefaultPrivateFlag(),
3779 'Private flag (rietveld only)', 'private', False)
3780 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3781 'tree-status-url', False)
3782 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3783 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3784 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3785 'run-post-upload-hook', False)
3786
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003787
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003788class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003789 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003790
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003791 _GOOGLESOURCE = 'googlesource.com'
3792
3793 def __init__(self):
3794 # Cached list of [host, identity, source], where source is either
3795 # .gitcookies or .netrc.
3796 self._all_hosts = None
3797
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003798 def ensure_configured_gitcookies(self):
3799 """Runs checks and suggests fixes to make git use .gitcookies from default
3800 path."""
3801 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3802 configured_path = RunGitSilent(
3803 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003804 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003805 if configured_path:
3806 self._ensure_default_gitcookies_path(configured_path, default)
3807 else:
3808 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003809
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003810 @staticmethod
3811 def _ensure_default_gitcookies_path(configured_path, default_path):
3812 assert configured_path
3813 if configured_path == default_path:
3814 print('git is already configured to use your .gitcookies from %s' %
3815 configured_path)
3816 return
3817
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003818 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003819 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3820 (configured_path, default_path))
3821
3822 if not os.path.exists(configured_path):
3823 print('However, your configured .gitcookies file is missing.')
3824 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3825 action='reconfigure')
3826 RunGit(['config', '--global', 'http.cookiefile', default_path])
3827 return
3828
3829 if os.path.exists(default_path):
3830 print('WARNING: default .gitcookies file already exists %s' %
3831 default_path)
3832 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3833 default_path)
3834
3835 confirm_or_exit('Move existing .gitcookies to default location?',
3836 action='move')
3837 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003838 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003839 print('Moved and reconfigured git to use .gitcookies from %s' %
3840 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003841
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003842 @staticmethod
3843 def _configure_gitcookies_path(default_path):
3844 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3845 if os.path.exists(netrc_path):
3846 print('You seem to be using outdated .netrc for git credentials: %s' %
3847 netrc_path)
3848 print('This tool will guide you through setting up recommended '
3849 '.gitcookies store for git credentials.\n'
3850 '\n'
3851 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3852 ' git config --global --unset http.cookiefile\n'
3853 ' mv %s %s.backup\n\n' % (default_path, default_path))
3854 confirm_or_exit(action='setup .gitcookies')
3855 RunGit(['config', '--global', 'http.cookiefile', default_path])
3856 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003857
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003858 def get_hosts_with_creds(self, include_netrc=False):
3859 if self._all_hosts is None:
3860 a = gerrit_util.CookiesAuthenticator()
3861 self._all_hosts = [
3862 (h, u, s)
3863 for h, u, s in itertools.chain(
3864 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3865 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3866 )
3867 if h.endswith(self._GOOGLESOURCE)
3868 ]
3869
3870 if include_netrc:
3871 return self._all_hosts
3872 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3873
3874 def print_current_creds(self, include_netrc=False):
3875 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3876 if not hosts:
3877 print('No Git/Gerrit credentials found')
3878 return
3879 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3880 header = [('Host', 'User', 'Which file'),
3881 ['=' * l for l in lengths]]
3882 for row in (header + hosts):
3883 print('\t'.join((('%%+%ds' % l) % s)
3884 for l, s in zip(lengths, row)))
3885
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003886 @staticmethod
3887 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003888 """Parses identity "git-<username>.domain" into <username> and domain."""
3889 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003890 # distinguishable from sub-domains. But we do know typical domains:
3891 if identity.endswith('.chromium.org'):
3892 domain = 'chromium.org'
3893 username = identity[:-len('.chromium.org')]
3894 else:
3895 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003896 if username.startswith('git-'):
3897 username = username[len('git-'):]
3898 return username, domain
3899
3900 def _get_usernames_of_domain(self, domain):
3901 """Returns list of usernames referenced by .gitcookies in a given domain."""
3902 identities_by_domain = {}
3903 for _, identity, _ in self.get_hosts_with_creds():
3904 username, domain = self._parse_identity(identity)
3905 identities_by_domain.setdefault(domain, []).append(username)
3906 return identities_by_domain.get(domain)
3907
3908 def _canonical_git_googlesource_host(self, host):
3909 """Normalizes Gerrit hosts (with '-review') to Git host."""
3910 assert host.endswith(self._GOOGLESOURCE)
3911 # Prefix doesn't include '.' at the end.
3912 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3913 if prefix.endswith('-review'):
3914 prefix = prefix[:-len('-review')]
3915 return prefix + '.' + self._GOOGLESOURCE
3916
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003917 def _canonical_gerrit_googlesource_host(self, host):
3918 git_host = self._canonical_git_googlesource_host(host)
3919 prefix = git_host.split('.', 1)[0]
3920 return prefix + '-review.' + self._GOOGLESOURCE
3921
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003922 def _get_counterpart_host(self, host):
3923 assert host.endswith(self._GOOGLESOURCE)
3924 git = self._canonical_git_googlesource_host(host)
3925 gerrit = self._canonical_gerrit_googlesource_host(git)
3926 return git if gerrit == host else gerrit
3927
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003928 def has_generic_host(self):
3929 """Returns whether generic .googlesource.com has been configured.
3930
3931 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3932 """
3933 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3934 if host == '.' + self._GOOGLESOURCE:
3935 return True
3936 return False
3937
3938 def _get_git_gerrit_identity_pairs(self):
3939 """Returns map from canonic host to pair of identities (Git, Gerrit).
3940
3941 One of identities might be None, meaning not configured.
3942 """
3943 host_to_identity_pairs = {}
3944 for host, identity, _ in self.get_hosts_with_creds():
3945 canonical = self._canonical_git_googlesource_host(host)
3946 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3947 idx = 0 if canonical == host else 1
3948 pair[idx] = identity
3949 return host_to_identity_pairs
3950
3951 def get_partially_configured_hosts(self):
3952 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003953 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3954 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3955 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003956
3957 def get_conflicting_hosts(self):
3958 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003959 host
3960 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003961 if None not in (i1, i2) and i1 != i2)
3962
3963 def get_duplicated_hosts(self):
3964 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3965 return set(host for host, count in counters.iteritems() if count > 1)
3966
3967 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3968 'chromium.googlesource.com': 'chromium.org',
3969 'chrome-internal.googlesource.com': 'google.com',
3970 }
3971
3972 def get_hosts_with_wrong_identities(self):
3973 """Finds hosts which **likely** reference wrong identities.
3974
3975 Note: skips hosts which have conflicting identities for Git and Gerrit.
3976 """
3977 hosts = set()
3978 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3979 pair = self._get_git_gerrit_identity_pairs().get(host)
3980 if pair and pair[0] == pair[1]:
3981 _, domain = self._parse_identity(pair[0])
3982 if domain != expected:
3983 hosts.add(host)
3984 return hosts
3985
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003986 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003987 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003988 hosts = sorted(hosts)
3989 assert hosts
3990 if extra_column_func is None:
3991 extras = [''] * len(hosts)
3992 else:
3993 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003994 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3995 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003996 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003997 lines.append(tmpl % he)
3998 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003999
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004000 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004001 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004002 yield ('.googlesource.com wildcard record detected',
4003 ['Chrome Infrastructure team recommends to list full host names '
4004 'explicitly.'],
4005 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004006
4007 dups = self.get_duplicated_hosts()
4008 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004009 yield ('The following hosts were defined twice',
4010 self._format_hosts(dups),
4011 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004012
4013 partial = self.get_partially_configured_hosts()
4014 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004015 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
4016 'These hosts are missing',
4017 self._format_hosts(partial, lambda host: 'but %s defined' %
4018 self._get_counterpart_host(host)),
4019 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004020
4021 conflicting = self.get_conflicting_hosts()
4022 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004023 yield ('The following Git hosts have differing credentials from their '
4024 'Gerrit counterparts',
4025 self._format_hosts(conflicting, lambda host: '%s vs %s' %
4026 tuple(self._get_git_gerrit_identity_pairs()[host])),
4027 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004028
4029 wrong = self.get_hosts_with_wrong_identities()
4030 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004031 yield ('These hosts likely use wrong identity',
4032 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
4033 (self._get_git_gerrit_identity_pairs()[host][0],
4034 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
4035 wrong)
4036
4037 def find_and_report_problems(self):
4038 """Returns True if there was at least one problem, else False."""
4039 found = False
4040 bad_hosts = set()
4041 for title, sublines, hosts in self._find_problems():
4042 if not found:
4043 found = True
4044 print('\n\n.gitcookies problem report:\n')
4045 bad_hosts.update(hosts or [])
4046 print(' %s%s' % (title , (':' if sublines else '')))
4047 if sublines:
4048 print()
4049 print(' %s' % '\n '.join(sublines))
4050 print()
4051
4052 if bad_hosts:
4053 assert found
4054 print(' You can manually remove corresponding lines in your %s file and '
4055 'visit the following URLs with correct account to generate '
4056 'correct credential lines:\n' %
4057 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4058 print(' %s' % '\n '.join(sorted(set(
4059 gerrit_util.CookiesAuthenticator().get_new_password_url(
4060 self._canonical_git_googlesource_host(host))
4061 for host in bad_hosts
4062 ))))
4063 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004064
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004065
4066def CMDcreds_check(parser, args):
4067 """Checks credentials and suggests changes."""
4068 _, _ = parser.parse_args(args)
4069
4070 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004071 DieWithError(
4072 'This command is not designed for GCE, are you on a bot?\n'
4073 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004074
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004075 checker = _GitCookiesChecker()
4076 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004077
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004078 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004079 checker.print_current_creds(include_netrc=True)
4080
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004081 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004082 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004083 return 0
4084 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004085
4086
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004087@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004088def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004089 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004091 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004092 # TODO(tandrii): remove this once we switch to Gerrit.
4093 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004094 parser.add_option('--activate-update', action='store_true',
4095 help='activate auto-updating [rietveld] section in '
4096 '.git/config')
4097 parser.add_option('--deactivate-update', action='store_true',
4098 help='deactivate auto-updating [rietveld] section in '
4099 '.git/config')
4100 options, args = parser.parse_args(args)
4101
4102 if options.deactivate_update:
4103 RunGit(['config', 'rietveld.autoupdate', 'false'])
4104 return
4105
4106 if options.activate_update:
4107 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4108 return
4109
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004110 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004111 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004112 return 0
4113
4114 url = args[0]
4115 if not url.endswith('codereview.settings'):
4116 url = os.path.join(url, 'codereview.settings')
4117
4118 # Load code review settings and download hooks (if available).
4119 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4120 return 0
4121
4122
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004123def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004124 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004125 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4126 branch = ShortBranchName(branchref)
4127 _, args = parser.parse_args(args)
4128 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004129 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004130 return RunGit(['config', 'branch.%s.base-url' % branch],
4131 error_ok=False).strip()
4132 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004133 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004134 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4135 error_ok=False).strip()
4136
4137
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004138def color_for_status(status):
4139 """Maps a Changelist status to color, for CMDstatus and other tools."""
4140 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004141 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004142 'waiting': Fore.BLUE,
4143 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004144 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004145 'lgtm': Fore.GREEN,
4146 'commit': Fore.MAGENTA,
4147 'closed': Fore.CYAN,
4148 'error': Fore.WHITE,
4149 }.get(status, Fore.WHITE)
4150
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004151
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004152def get_cl_statuses(changes, fine_grained, max_processes=None):
4153 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004154
4155 If fine_grained is true, this will fetch CL statuses from the server.
4156 Otherwise, simply indicate if there's a matching url for the given branches.
4157
4158 If max_processes is specified, it is used as the maximum number of processes
4159 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4160 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004161
4162 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004163 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004164 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004165 upload.verbosity = 0
4166
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004167 if not changes:
4168 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004169
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004170 if not fine_grained:
4171 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004172 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004173 for cl in changes:
4174 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004175 return
4176
4177 # First, sort out authentication issues.
4178 logging.debug('ensuring credentials exist')
4179 for cl in changes:
4180 cl.EnsureAuthenticated(force=False, refresh=True)
4181
4182 def fetch(cl):
4183 try:
4184 return (cl, cl.GetStatus())
4185 except:
4186 # See http://crbug.com/629863.
4187 logging.exception('failed to fetch status for %s:', cl)
4188 raise
4189
4190 threads_count = len(changes)
4191 if max_processes:
4192 threads_count = max(1, min(threads_count, max_processes))
4193 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4194
4195 pool = ThreadPool(threads_count)
4196 fetched_cls = set()
4197 try:
4198 it = pool.imap_unordered(fetch, changes).__iter__()
4199 while True:
4200 try:
4201 cl, status = it.next(timeout=5)
4202 except multiprocessing.TimeoutError:
4203 break
4204 fetched_cls.add(cl)
4205 yield cl, status
4206 finally:
4207 pool.close()
4208
4209 # Add any branches that failed to fetch.
4210 for cl in set(changes) - fetched_cls:
4211 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004212
rmistry@google.com2dd99862015-06-22 12:22:18 +00004213
4214def upload_branch_deps(cl, args):
4215 """Uploads CLs of local branches that are dependents of the current branch.
4216
4217 If the local branch dependency tree looks like:
4218 test1 -> test2.1 -> test3.1
4219 -> test3.2
4220 -> test2.2 -> test3.3
4221
4222 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4223 run on the dependent branches in this order:
4224 test2.1, test3.1, test3.2, test2.2, test3.3
4225
4226 Note: This function does not rebase your local dependent branches. Use it when
4227 you make a change to the parent branch that will not conflict with its
4228 dependent branches, and you would like their dependencies updated in
4229 Rietveld.
4230 """
4231 if git_common.is_dirty_git_tree('upload-branch-deps'):
4232 return 1
4233
4234 root_branch = cl.GetBranch()
4235 if root_branch is None:
4236 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4237 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004238 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004239 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4240 'patchset dependencies without an uploaded CL.')
4241
4242 branches = RunGit(['for-each-ref',
4243 '--format=%(refname:short) %(upstream:short)',
4244 'refs/heads'])
4245 if not branches:
4246 print('No local branches found.')
4247 return 0
4248
4249 # Create a dictionary of all local branches to the branches that are dependent
4250 # on it.
4251 tracked_to_dependents = collections.defaultdict(list)
4252 for b in branches.splitlines():
4253 tokens = b.split()
4254 if len(tokens) == 2:
4255 branch_name, tracked = tokens
4256 tracked_to_dependents[tracked].append(branch_name)
4257
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print()
4259 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004260 dependents = []
4261 def traverse_dependents_preorder(branch, padding=''):
4262 dependents_to_process = tracked_to_dependents.get(branch, [])
4263 padding += ' '
4264 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004265 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004266 dependents.append(dependent)
4267 traverse_dependents_preorder(dependent, padding)
4268 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004269 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004270
4271 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004272 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004273 return 0
4274
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004275 confirm_or_exit('This command will checkout all dependent branches and run '
4276 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004277
andybons@chromium.org962f9462016-02-03 20:00:42 +00004278 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004279 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004280 args.extend(['-t', 'Updated patchset dependency'])
4281
rmistry@google.com2dd99862015-06-22 12:22:18 +00004282 # Record all dependents that failed to upload.
4283 failures = {}
4284 # Go through all dependents, checkout the branch and upload.
4285 try:
4286 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004287 print()
4288 print('--------------------------------------')
4289 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004290 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004291 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004292 try:
4293 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004294 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004295 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004296 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004297 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004298 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004299 finally:
4300 # Swap back to the original root branch.
4301 RunGit(['checkout', '-q', root_branch])
4302
vapiera7fbd5a2016-06-16 09:17:49 -07004303 print()
4304 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004305 for dependent_branch in dependents:
4306 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004307 print(' %s : %s' % (dependent_branch, upload_status))
4308 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004309
4310 return 0
4311
4312
kmarshall3bff56b2016-06-06 18:31:47 -07004313def CMDarchive(parser, args):
4314 """Archives and deletes branches associated with closed changelists."""
4315 parser.add_option(
4316 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004317 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004318 parser.add_option(
4319 '-f', '--force', action='store_true',
4320 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004321 parser.add_option(
4322 '-d', '--dry-run', action='store_true',
4323 help='Skip the branch tagging and removal steps.')
4324 parser.add_option(
4325 '-t', '--notags', action='store_true',
4326 help='Do not tag archived branches. '
4327 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004328
4329 auth.add_auth_options(parser)
4330 options, args = parser.parse_args(args)
4331 if args:
4332 parser.error('Unsupported args: %s' % ' '.join(args))
4333 auth_config = auth.extract_auth_config_from_options(options)
4334
4335 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4336 if not branches:
4337 return 0
4338
vapiera7fbd5a2016-06-16 09:17:49 -07004339 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004340 changes = [Changelist(branchref=b, auth_config=auth_config)
4341 for b in branches.splitlines()]
4342 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4343 statuses = get_cl_statuses(changes,
4344 fine_grained=True,
4345 max_processes=options.maxjobs)
4346 proposal = [(cl.GetBranch(),
4347 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4348 for cl, status in statuses
4349 if status == 'closed']
4350 proposal.sort()
4351
4352 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004353 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004354 return 0
4355
4356 current_branch = GetCurrentBranch()
4357
vapiera7fbd5a2016-06-16 09:17:49 -07004358 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004359 if options.notags:
4360 for next_item in proposal:
4361 print(' ' + next_item[0])
4362 else:
4363 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4364 for next_item in proposal:
4365 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004366
kmarshall9249e012016-08-23 12:02:16 -07004367 # Quit now on precondition failure or if instructed by the user, either
4368 # via an interactive prompt or by command line flags.
4369 if options.dry_run:
4370 print('\nNo changes were made (dry run).\n')
4371 return 0
4372 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004373 print('You are currently on a branch \'%s\' which is associated with a '
4374 'closed codereview issue, so archive cannot proceed. Please '
4375 'checkout another branch and run this command again.' %
4376 current_branch)
4377 return 1
kmarshall9249e012016-08-23 12:02:16 -07004378 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004379 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4380 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004381 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004382 return 1
4383
4384 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004385 if not options.notags:
4386 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004387 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004388
vapiera7fbd5a2016-06-16 09:17:49 -07004389 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004390
4391 return 0
4392
4393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004394def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004395 """Show status of changelists.
4396
4397 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004398 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004399 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004400 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004401 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004402 - Magenta in the commit queue
4403 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004404 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004405
4406 Also see 'git cl comments'.
4407 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004408 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004409 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004410 parser.add_option('-f', '--fast', action='store_true',
4411 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004412 parser.add_option(
4413 '-j', '--maxjobs', action='store', type=int,
4414 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004415
4416 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004417 _add_codereview_issue_select_options(
4418 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004419 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004420 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004421 if args:
4422 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004423 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004424
iannuccie53c9352016-08-17 14:40:40 -07004425 if options.issue is not None and not options.field:
4426 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004427
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004429 cl = Changelist(auth_config=auth_config, issue=options.issue,
4430 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004432 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433 elif options.field == 'id':
4434 issueid = cl.GetIssue()
4435 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004436 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004438 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004439 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004440 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004441 elif options.field == 'status':
4442 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004443 elif options.field == 'url':
4444 url = cl.GetIssueURL()
4445 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004446 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004447 return 0
4448
4449 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4450 if not branches:
4451 print('No local branch found.')
4452 return 0
4453
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004454 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004455 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004456 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004457 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004458 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004459 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004460 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004461
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004462 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004463 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4464 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4465 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004466 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004467 c, status = output.next()
4468 branch_statuses[c.GetBranch()] = status
4469 status = branch_statuses.pop(branch)
4470 url = cl.GetIssueURL()
4471 if url and (not status or status == 'error'):
4472 # The issue probably doesn't exist anymore.
4473 url += ' (broken)'
4474
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004475 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004476 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004477 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004478 color = ''
4479 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004480 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004481 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004482 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004483 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004484
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004485
4486 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004487 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004488 print('Current branch: %s' % branch)
4489 for cl in changes:
4490 if cl.GetBranch() == branch:
4491 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004492 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004493 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004494 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004495 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004496 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004497 print('Issue description:')
4498 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499 return 0
4500
4501
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004502def colorize_CMDstatus_doc():
4503 """To be called once in main() to add colors to git cl status help."""
4504 colors = [i for i in dir(Fore) if i[0].isupper()]
4505
4506 def colorize_line(line):
4507 for color in colors:
4508 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004509 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004510 indent = len(line) - len(line.lstrip(' ')) + 1
4511 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4512 return line
4513
4514 lines = CMDstatus.__doc__.splitlines()
4515 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4516
4517
phajdan.jre328cf92016-08-22 04:12:17 -07004518def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004519 if path == '-':
4520 json.dump(contents, sys.stdout)
4521 else:
4522 with open(path, 'w') as f:
4523 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004524
4525
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004526@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004527def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004528 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529
4530 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004531 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004532 parser.add_option('-r', '--reverse', action='store_true',
4533 help='Lookup the branch(es) for the specified issues. If '
4534 'no issues are specified, all branches with mapped '
4535 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004536 parser.add_option('--json',
4537 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004538 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004539 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004540 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541
dnj@chromium.org406c4402015-03-03 17:22:28 +00004542 if options.reverse:
4543 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004544 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004545 # Reverse issue lookup.
4546 issue_branch_map = {}
4547 for branch in branches:
4548 cl = Changelist(branchref=branch)
4549 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4550 if not args:
4551 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004552 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004553 for issue in args:
4554 if not issue:
4555 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004556 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004557 print('Branch for issue number %s: %s' % (
4558 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004559 if options.json:
4560 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004561 return 0
4562
4563 if len(args) > 0:
4564 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4565 if not issue.valid:
4566 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4567 'or no argument to list it.\n'
4568 'Maybe you want to run git cl status?')
4569 cl = Changelist(codereview=issue.codereview)
4570 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004571 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004572 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004573 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4574 if options.json:
4575 write_json(options.json, {
4576 'issue': cl.GetIssue(),
4577 'issue_url': cl.GetIssueURL(),
4578 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 return 0
4580
4581
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004582def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004583 """Shows or posts review comments for any changelist."""
4584 parser.add_option('-a', '--add-comment', dest='comment',
4585 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004586 parser.add_option('-i', '--issue', dest='issue',
4587 help='review issue id (defaults to current issue). '
4588 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004589 parser.add_option('-m', '--machine-readable', dest='readable',
4590 action='store_false', default=True,
4591 help='output comments in a format compatible with '
4592 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004593 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004594 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004595 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004596 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004597 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004598 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004599 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004600
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004601 issue = None
4602 if options.issue:
4603 try:
4604 issue = int(options.issue)
4605 except ValueError:
4606 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004607 if not options.forced_codereview:
4608 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004609
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004610 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004611 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004612 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004613
4614 if options.comment:
4615 cl.AddComment(options.comment)
4616 return 0
4617
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004618 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4619 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004620 for comment in summary:
4621 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004622 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004623 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004624 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004625 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004626 color = Fore.MAGENTA
4627 else:
4628 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004629 print('\n%s%s %s%s\n%s' % (
4630 color,
4631 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4632 comment.sender,
4633 Fore.RESET,
4634 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4635
smut@google.comc85ac942015-09-15 16:34:43 +00004636 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004637 def pre_serialize(c):
4638 dct = c.__dict__.copy()
4639 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4640 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004641 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004642 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004643 return 0
4644
4645
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004646@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004647def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004648 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004649 parser.add_option('-d', '--display', action='store_true',
4650 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004651 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004652 help='New description to set for this issue (- for stdin, '
4653 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004654 parser.add_option('-f', '--force', action='store_true',
4655 help='Delete any unpublished Gerrit edits for this issue '
4656 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004657
4658 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004659 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004660 options, args = parser.parse_args(args)
4661 _process_codereview_select_options(parser, options)
4662
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004663 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004664 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004665 target_issue_arg = ParseIssueNumberArgument(args[0],
4666 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004667 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004668 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004669
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004670 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004671
martiniss6eda05f2016-06-30 10:18:35 -07004672 kwargs = {
4673 'auth_config': auth_config,
4674 'codereview': options.forced_codereview,
4675 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004676 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004677 if target_issue_arg:
4678 kwargs['issue'] = target_issue_arg.issue
4679 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004680 if target_issue_arg.codereview and not options.forced_codereview:
4681 detected_codereview_from_url = True
4682 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004683
4684 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004685 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004686 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004687 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004688
4689 if detected_codereview_from_url:
4690 logging.info('canonical issue/change URL: %s (type: %s)\n',
4691 cl.GetIssueURL(), target_issue_arg.codereview)
4692
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004693 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004694
smut@google.com34fb6b12015-07-13 20:03:26 +00004695 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004696 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004697 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004698
4699 if options.new_description:
4700 text = options.new_description
4701 if text == '-':
4702 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004703 elif text == '+':
4704 base_branch = cl.GetCommonAncestorWithUpstream()
4705 change = cl.GetChange(base_branch, None, local_description=True)
4706 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004707
4708 description.set_description(text)
4709 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004710 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004711
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004712 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004713 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004714 return 0
4715
4716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004717def CreateDescriptionFromLog(args):
4718 """Pulls out the commit log to use as a base for the CL description."""
4719 log_args = []
4720 if len(args) == 1 and not args[0].endswith('.'):
4721 log_args = [args[0] + '..']
4722 elif len(args) == 1 and args[0].endswith('...'):
4723 log_args = [args[0][:-1]]
4724 elif len(args) == 2:
4725 log_args = [args[0] + '..' + args[1]]
4726 else:
4727 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004728 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004729
4730
thestig@chromium.org44202a22014-03-11 19:22:18 +00004731def CMDlint(parser, args):
4732 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004733 parser.add_option('--filter', action='append', metavar='-x,+y',
4734 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004735 auth.add_auth_options(parser)
4736 options, args = parser.parse_args(args)
4737 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004738
4739 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004740 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004741 try:
4742 import cpplint
4743 import cpplint_chromium
4744 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004745 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004746 return 1
4747
4748 # Change the current working directory before calling lint so that it
4749 # shows the correct base.
4750 previous_cwd = os.getcwd()
4751 os.chdir(settings.GetRoot())
4752 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004753 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004754 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4755 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004756 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004757 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004758 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004759
4760 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004761 command = args + files
4762 if options.filter:
4763 command = ['--filter=' + ','.join(options.filter)] + command
4764 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004765
4766 white_regex = re.compile(settings.GetLintRegex())
4767 black_regex = re.compile(settings.GetLintIgnoreRegex())
4768 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4769 for filename in filenames:
4770 if white_regex.match(filename):
4771 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004772 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004773 else:
4774 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4775 extra_check_functions)
4776 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004777 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004778 finally:
4779 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004780 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004781 if cpplint._cpplint_state.error_count != 0:
4782 return 1
4783 return 0
4784
4785
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004786def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004787 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004788 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004789 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004790 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004791 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004792 parser.add_option('--all', action='store_true',
4793 help='Run checks against all files, not just modified ones')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004794 auth.add_auth_options(parser)
4795 options, args = parser.parse_args(args)
4796 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797
sbc@chromium.org71437c02015-04-09 19:29:40 +00004798 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004799 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004800 return 1
4801
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004802 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004803 if args:
4804 base_branch = args[0]
4805 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004806 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004807 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004808
Aaron Gable8076c282017-11-29 14:39:41 -08004809 if options.all:
4810 base_change = cl.GetChange(base_branch, None)
4811 files = [('M', f) for f in base_change.AllFiles()]
4812 change = presubmit_support.GitChange(
4813 base_change.Name(),
4814 base_change.FullDescriptionText(),
4815 base_change.RepositoryRoot(),
4816 files,
4817 base_change.issue,
4818 base_change.patchset,
4819 base_change.author_email,
4820 base_change._upstream)
4821 else:
4822 change = cl.GetChange(base_branch, None)
4823
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004824 cl.RunHook(
4825 committing=not options.upload,
4826 may_prompt=False,
4827 verbose=options.verbose,
Aaron Gable8076c282017-11-29 14:39:41 -08004828 change=change)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004829 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004830
4831
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004832def GenerateGerritChangeId(message):
4833 """Returns Ixxxxxx...xxx change id.
4834
4835 Works the same way as
4836 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4837 but can be called on demand on all platforms.
4838
4839 The basic idea is to generate git hash of a state of the tree, original commit
4840 message, author/committer info and timestamps.
4841 """
4842 lines = []
4843 tree_hash = RunGitSilent(['write-tree'])
4844 lines.append('tree %s' % tree_hash.strip())
4845 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4846 if code == 0:
4847 lines.append('parent %s' % parent.strip())
4848 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4849 lines.append('author %s' % author.strip())
4850 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4851 lines.append('committer %s' % committer.strip())
4852 lines.append('')
4853 # Note: Gerrit's commit-hook actually cleans message of some lines and
4854 # whitespace. This code is not doing this, but it clearly won't decrease
4855 # entropy.
4856 lines.append(message)
4857 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4858 stdin='\n'.join(lines))
4859 return 'I%s' % change_hash.strip()
4860
4861
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004862def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004863 """Computes the remote branch ref to use for the CL.
4864
4865 Args:
4866 remote (str): The git remote for the CL.
4867 remote_branch (str): The git remote branch for the CL.
4868 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004869 """
4870 if not (remote and remote_branch):
4871 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004872
wittman@chromium.org455dc922015-01-26 20:15:50 +00004873 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004874 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004875 # refs, which are then translated into the remote full symbolic refs
4876 # below.
4877 if '/' not in target_branch:
4878 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4879 else:
4880 prefix_replacements = (
4881 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4882 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4883 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4884 )
4885 match = None
4886 for regex, replacement in prefix_replacements:
4887 match = re.search(regex, target_branch)
4888 if match:
4889 remote_branch = target_branch.replace(match.group(0), replacement)
4890 break
4891 if not match:
4892 # This is a branch path but not one we recognize; use as-is.
4893 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004894 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4895 # Handle the refs that need to land in different refs.
4896 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004897
wittman@chromium.org455dc922015-01-26 20:15:50 +00004898 # Create the true path to the remote branch.
4899 # Does the following translation:
4900 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4901 # * refs/remotes/origin/master -> refs/heads/master
4902 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4903 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4904 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4905 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4906 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4907 'refs/heads/')
4908 elif remote_branch.startswith('refs/remotes/branch-heads'):
4909 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004910
wittman@chromium.org455dc922015-01-26 20:15:50 +00004911 return remote_branch
4912
4913
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004914def cleanup_list(l):
4915 """Fixes a list so that comma separated items are put as individual items.
4916
4917 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4918 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4919 """
4920 items = sum((i.split(',') for i in l), [])
4921 stripped_items = (i.strip() for i in items)
4922 return sorted(filter(None, stripped_items))
4923
4924
Aaron Gable4db38df2017-11-03 14:59:07 -07004925@subcommand.usage('[flags]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004926def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004927 """Uploads the current changelist to codereview.
4928
4929 Can skip dependency patchset uploads for a branch by running:
4930 git config branch.branch_name.skip-deps-uploads True
4931 To unset run:
4932 git config --unset branch.branch_name.skip-deps-uploads
4933 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004934
4935 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4936 a bug number, this bug number is automatically populated in the CL
4937 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004938
4939 If subject contains text in square brackets or has "<text>: " prefix, such
4940 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4941 [git-cl] add support for hashtags
4942 Foo bar: implement foo
4943 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004944 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004945 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4946 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004947 parser.add_option('--bypass-watchlists', action='store_true',
4948 dest='bypass_watchlists',
4949 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004950 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004951 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004952 parser.add_option('--message', '-m', dest='message',
4953 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004954 parser.add_option('-b', '--bug',
4955 help='pre-populate the bug number(s) for this issue. '
4956 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004957 parser.add_option('--message-file', dest='message_file',
4958 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004959 parser.add_option('--title', '-t', dest='title',
4960 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004961 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004962 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004963 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004964 parser.add_option('--tbrs',
4965 action='append', default=[],
4966 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004967 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004968 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004969 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004970 parser.add_option('--hashtag', dest='hashtags',
4971 action='append', default=[],
4972 help=('Gerrit hashtag for new CL; '
4973 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004974 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004975 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004976 parser.add_option('--emulate_svn_auto_props',
4977 '--emulate-svn-auto-props',
4978 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004979 dest="emulate_svn_auto_props",
4980 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004981 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004982 help='tell the commit queue to commit this patchset; '
4983 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004984 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004985 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004986 metavar='TARGET',
4987 help='Apply CL to remote ref TARGET. ' +
4988 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004989 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004990 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004991 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004992 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004993 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004994 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004995 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4996 const='TBR', help='add a set of OWNERS to TBR')
4997 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4998 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004999 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
5000 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00005001 help='Send the patchset to do a CQ dry run right after '
5002 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00005003 parser.add_option('--dependencies', action='store_true',
5004 help='Uploads CLs of all the local branches that depend on '
5005 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04005006 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5007 help='Sends your change to the CQ after an approval. Only '
5008 'works on repos that have the Auto-Submit label '
5009 'enabled')
pgervais@chromium.org91141372014-01-09 23:27:20 +00005010
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005011 # TODO: remove Rietveld flags
5012 parser.add_option('--private', action='store_true',
5013 help='set the review private (rietveld only)')
5014 parser.add_option('--email', default=None,
5015 help='email address to use to connect to Rietveld')
5016
rmistry@google.com2dd99862015-06-22 12:22:18 +00005017 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005018 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005019 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005020 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005021 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005022 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005023
sbc@chromium.org71437c02015-04-09 19:29:40 +00005024 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005025 return 1
5026
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005027 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005028 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005029 options.cc = cleanup_list(options.cc)
5030
tandriib80458a2016-06-23 12:20:07 -07005031 if options.message_file:
5032 if options.message:
5033 parser.error('only one of --message and --message-file allowed.')
5034 options.message = gclient_utils.FileRead(options.message_file)
5035 options.message_file = None
5036
tandrii4d0545a2016-07-06 03:56:49 -07005037 if options.cq_dry_run and options.use_commit_queue:
5038 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5039
Aaron Gableedbc4132017-09-11 13:22:28 -07005040 if options.use_commit_queue:
5041 options.send_mail = True
5042
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005043 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5044 settings.GetIsGerrit()
5045
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005046 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005047 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005048
5049
Francois Dorayd42c6812017-05-30 15:10:20 -04005050@subcommand.usage('--description=<description file>')
5051def CMDsplit(parser, args):
5052 """Splits a branch into smaller branches and uploads CLs.
5053
5054 Creates a branch and uploads a CL for each group of files modified in the
5055 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005056 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005057 the shared OWNERS file.
5058 """
5059 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005060 help="A text file containing a CL description in which "
5061 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005062 parser.add_option("-c", "--comment", dest="comment_file",
5063 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005064 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5065 default=False,
5066 help="List the files and reviewers for each CL that would "
5067 "be created, but don't create branches or CLs.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005068 options, _ = parser.parse_args(args)
5069
5070 if not options.description_file:
5071 parser.error('No --description flag specified.')
5072
5073 def WrappedCMDupload(args):
5074 return CMDupload(OptionParser(), args)
5075
5076 return split_cl.SplitCl(options.description_file, options.comment_file,
Chris Watkinsba28e462017-12-13 11:22:17 +11005077 Changelist, WrappedCMDupload, options.dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005078
5079
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005080@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005081def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005082 """DEPRECATED: Used to commit the current changelist via git-svn."""
5083 message = ('git-cl no longer supports committing to SVN repositories via '
5084 'git-svn. You probably want to use `git cl land` instead.')
5085 print(message)
5086 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005087
5088
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005089# Two special branches used by git cl land.
5090MERGE_BRANCH = 'git-cl-commit'
5091CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5092
5093
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005094@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005095def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005096 """Commits the current changelist via git.
5097
5098 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5099 upstream and closes the issue automatically and atomically.
5100
5101 Otherwise (in case of Rietveld):
5102 Squashes branch into a single commit.
5103 Updates commit message with metadata (e.g. pointer to review).
5104 Pushes the code upstream.
5105 Updates review and closes.
5106 """
5107 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5108 help='bypass upload presubmit hook')
5109 parser.add_option('-m', dest='message',
5110 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005111 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005112 help="force yes to questions (don't prompt)")
5113 parser.add_option('-c', dest='contributor',
5114 help="external contributor for patch (appended to " +
5115 "description and used as author for git). Should be " +
5116 "formatted as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005117 auth.add_auth_options(parser)
5118 (options, args) = parser.parse_args(args)
5119 auth_config = auth.extract_auth_config_from_options(options)
5120
5121 cl = Changelist(auth_config=auth_config)
5122
Robert Iannucci2e73d432018-03-14 01:10:47 -07005123 if not cl.IsGerrit():
5124 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005125
Robert Iannucci2e73d432018-03-14 01:10:47 -07005126 if options.message:
5127 # This could be implemented, but it requires sending a new patch to
5128 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5129 # Besides, Gerrit has the ability to change the commit message on submit
5130 # automatically, thus there is no need to support this option (so far?).
5131 parser.error('-m MESSAGE option is not supported for Gerrit.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005132 if options.contributor:
Robert Iannucci2e73d432018-03-14 01:10:47 -07005133 parser.error(
5134 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5135 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5136 'the contributor\'s "name <email>". If you can\'t upload such a '
5137 'commit for review, contact your repository admin and request'
5138 '"Forge-Author" permission.')
5139 if not cl.GetIssue():
5140 DieWithError('You must upload the change first to Gerrit.\n'
5141 ' If you would rather have `git cl land` upload '
5142 'automatically for you, see http://crbug.com/642759')
5143 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5144 options.verbose)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005145
5146
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005147def PushToGitWithAutoRebase(remote, branch, original_description,
5148 git_numberer_enabled, max_attempts=3):
5149 """Pushes current HEAD commit on top of remote's branch.
5150
5151 Attempts to fetch and autorebase on push failures.
5152 Adds git number footers on the fly.
5153
5154 Returns integer code from last command.
5155 """
5156 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5157 code = 0
5158 attempts_left = max_attempts
5159 while attempts_left:
5160 attempts_left -= 1
5161 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5162
5163 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5164 # If fetch fails, retry.
5165 print('Fetching %s/%s...' % (remote, branch))
5166 code, out = RunGitWithCode(
5167 ['retry', 'fetch', remote,
5168 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5169 if code:
5170 print('Fetch failed with exit code %d.' % code)
5171 print(out.strip())
5172 continue
5173
5174 print('Cherry-picking commit on top of latest %s' % branch)
5175 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5176 suppress_stderr=True)
5177 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5178 code, out = RunGitWithCode(['cherry-pick', cherry])
5179 if code:
5180 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5181 'the following files have merge conflicts:' %
5182 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005183 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5184 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005185 print('Please rebase your patch and try again.')
5186 RunGitWithCode(['cherry-pick', '--abort'])
5187 break
5188
5189 commit_desc = ChangeDescription(original_description)
5190 if git_numberer_enabled:
5191 logging.debug('Adding git number footers')
5192 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5193 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5194 branch)
5195 # Ensure timestamps are monotonically increasing.
5196 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5197 _get_committer_timestamp('HEAD'))
5198 _git_amend_head(commit_desc.description, timestamp)
5199
5200 code, out = RunGitWithCode(
5201 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5202 print(out)
5203 if code == 0:
5204 break
5205 if IsFatalPushFailure(out):
5206 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005207 'user.email are correct and you have push access to the repo.\n'
5208 'Hint: run command below to diangose common Git/Gerrit credential '
5209 'problems:\n'
5210 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005211 break
5212 return code
5213
5214
5215def IsFatalPushFailure(push_stdout):
5216 """True if retrying push won't help."""
5217 return '(prohibited by Gerrit)' in push_stdout
5218
5219
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005220@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005221def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005222 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223 parser.add_option('-b', dest='newbranch',
5224 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005225 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005226 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005227 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005228 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005229 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005230 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005231 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005232 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005233 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005234 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005235
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005236
5237 group = optparse.OptionGroup(
5238 parser,
5239 'Options for continuing work on the current issue uploaded from a '
5240 'different clone (e.g. different machine). Must be used independently '
5241 'from the other options. No issue number should be specified, and the '
5242 'branch must have an issue number associated with it')
5243 group.add_option('--reapply', action='store_true', dest='reapply',
5244 help='Reset the branch and reapply the issue.\n'
5245 'CAUTION: This will undo any local changes in this '
5246 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005247
5248 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005249 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005250 parser.add_option_group(group)
5251
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005252 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005253 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005255 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005256 auth_config = auth.extract_auth_config_from_options(options)
5257
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005258 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005259 if options.newbranch:
5260 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005261 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005262 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005263
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005264 cl = Changelist(auth_config=auth_config,
5265 codereview=options.forced_codereview)
5266 if not cl.GetIssue():
5267 parser.error('current branch must have an associated issue')
5268
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005269 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005270 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005271 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005272
5273 RunGit(['reset', '--hard', upstream])
5274 if options.pull:
5275 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005276
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005277 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5278 options.directory)
5279
5280 if len(args) != 1 or not args[0]:
5281 parser.error('Must specify issue number or url')
5282
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005283 target_issue_arg = ParseIssueNumberArgument(args[0],
5284 options.forced_codereview)
5285 if not target_issue_arg.valid:
5286 parser.error('invalid codereview url or CL id')
5287
5288 cl_kwargs = {
5289 'auth_config': auth_config,
5290 'codereview_host': target_issue_arg.hostname,
5291 'codereview': options.forced_codereview,
5292 }
5293 detected_codereview_from_url = False
5294 if target_issue_arg.codereview and not options.forced_codereview:
5295 detected_codereview_from_url = True
5296 cl_kwargs['codereview'] = target_issue_arg.codereview
5297 cl_kwargs['issue'] = target_issue_arg.issue
5298
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005299 # We don't want uncommitted changes mixed up with the patch.
5300 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005301 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005303 if options.newbranch:
5304 if options.force:
5305 RunGit(['branch', '-D', options.newbranch],
5306 stderr=subprocess2.PIPE, error_ok=True)
5307 RunGit(['new-branch', options.newbranch])
5308
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005309 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005310
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005311 if cl.IsGerrit():
5312 if options.reject:
5313 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005314 if options.directory:
5315 parser.error('--directory is not supported with Gerrit codereview.')
5316
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005317 if detected_codereview_from_url:
5318 print('canonical issue/change URL: %s (type: %s)\n' %
5319 (cl.GetIssueURL(), target_issue_arg.codereview))
5320
5321 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005322 options.nocommit, options.directory,
5323 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005324
5325
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005326def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005327 """Fetches the tree status and returns either 'open', 'closed',
5328 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005329 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005330 if url:
5331 status = urllib2.urlopen(url).read().lower()
5332 if status.find('closed') != -1 or status == '0':
5333 return 'closed'
5334 elif status.find('open') != -1 or status == '1':
5335 return 'open'
5336 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005337 return 'unset'
5338
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005339
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005340def GetTreeStatusReason():
5341 """Fetches the tree status from a json url and returns the message
5342 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005343 url = settings.GetTreeStatusUrl()
5344 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005345 connection = urllib2.urlopen(json_url)
5346 status = json.loads(connection.read())
5347 connection.close()
5348 return status['message']
5349
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005350
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005351def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005352 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005353 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005354 status = GetTreeStatus()
5355 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005356 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005357 return 2
5358
vapiera7fbd5a2016-06-16 09:17:49 -07005359 print('The tree is %s' % status)
5360 print()
5361 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005362 if status != 'open':
5363 return 1
5364 return 0
5365
5366
maruel@chromium.org15192402012-09-06 12:38:29 +00005367def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005368 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005369 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005370 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005371 '-b', '--bot', action='append',
5372 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5373 'times to specify multiple builders. ex: '
5374 '"-b win_rel -b win_layout". See '
5375 'the try server waterfall for the builders name and the tests '
5376 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005377 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005378 '-B', '--bucket', default='',
5379 help=('Buildbucket bucket to send the try requests.'))
5380 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005381 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005382 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005383 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005384 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005385 help='Revision to use for the try job; default: the revision will '
5386 'be determined by the try recipe that builder runs, which usually '
5387 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005388 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005389 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005390 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005391 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005392 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005393 '--category', default='git_cl_try', help='Specify custom build category.')
5394 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005395 '--project',
5396 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005397 'in recipe to determine to which repository or directory to '
5398 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005399 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005400 '-p', '--property', dest='properties', action='append', default=[],
5401 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005402 'key2=value2 etc. The value will be treated as '
5403 'json if decodable, or as string otherwise. '
5404 'NOTE: using this may make your try job not usable for CQ, '
5405 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005406 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005407 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5408 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005409 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005410 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005411 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005412 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005413 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005414 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005415
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005416 if options.master and options.master.startswith('luci.'):
5417 parser.error(
5418 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005419 # Make sure that all properties are prop=value pairs.
5420 bad_params = [x for x in options.properties if '=' not in x]
5421 if bad_params:
5422 parser.error('Got properties with missing "=": %s' % bad_params)
5423
maruel@chromium.org15192402012-09-06 12:38:29 +00005424 if args:
5425 parser.error('Unknown arguments: %s' % args)
5426
Koji Ishii31c14782018-01-08 17:17:33 +09005427 cl = Changelist(auth_config=auth_config, issue=options.issue,
5428 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005429 if not cl.GetIssue():
5430 parser.error('Need to upload first')
5431
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005432 if cl.IsGerrit():
5433 # HACK: warm up Gerrit change detail cache to save on RPCs.
5434 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5435
tandriie113dfd2016-10-11 10:20:12 -07005436 error_message = cl.CannotTriggerTryJobReason()
5437 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005438 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005439
borenet6c0efe62016-10-19 08:13:29 -07005440 if options.bucket and options.master:
5441 parser.error('Only one of --bucket and --master may be used.')
5442
qyearsley1fdfcb62016-10-24 13:22:03 -07005443 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005444
qyearsleydd49f942016-10-28 11:57:22 -07005445 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5446 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005447 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005448 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005449 print('git cl try with no bots now defaults to CQ dry run.')
5450 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5451 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005452
borenet6c0efe62016-10-19 08:13:29 -07005453 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005454 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005455 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005456 'of bot requires an initial job from a parent (usually a builder). '
5457 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005458 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005459 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005460
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005461 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005462 # TODO(tandrii): Checking local patchset against remote patchset is only
5463 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5464 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005465 print('Warning: Codereview server has newer patchsets (%s) than most '
5466 'recent upload from local checkout (%s). Did a previous upload '
5467 'fail?\n'
5468 'By default, git cl try uses the latest patchset from '
5469 'codereview, continuing to use patchset %s.\n' %
5470 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005471
tandrii568043b2016-10-11 07:49:18 -07005472 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005473 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005474 except BuildbucketResponseException as ex:
5475 print('ERROR: %s' % ex)
5476 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005477 return 0
5478
5479
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005480def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005481 """Prints info about try jobs associated with current CL."""
5482 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005483 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005484 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005485 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005486 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005487 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005488 '--color', action='store_true', default=setup_color.IS_TTY,
5489 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005490 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005491 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5492 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005493 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005494 '--json', help=('Path of JSON output file to write try job results to,'
5495 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005496 parser.add_option_group(group)
5497 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005498 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005499 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005500 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005501 if args:
5502 parser.error('Unrecognized args: %s' % ' '.join(args))
5503
5504 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005505 cl = Changelist(
5506 issue=options.issue, codereview=options.forced_codereview,
5507 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005508 if not cl.GetIssue():
5509 parser.error('Need to upload first')
5510
tandrii221ab252016-10-06 08:12:04 -07005511 patchset = options.patchset
5512 if not patchset:
5513 patchset = cl.GetMostRecentPatchset()
5514 if not patchset:
5515 parser.error('Codereview doesn\'t know about issue %s. '
5516 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005517 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005518 cl.GetIssue())
5519
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005520 # TODO(tandrii): Checking local patchset against remote patchset is only
5521 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5522 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005523 print('Warning: Codereview server has newer patchsets (%s) than most '
5524 'recent upload from local checkout (%s). Did a previous upload '
5525 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005526 'By default, git cl try-results uses the latest patchset from '
5527 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005528 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005529 try:
tandrii221ab252016-10-06 08:12:04 -07005530 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005531 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005532 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005533 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005534 if options.json:
5535 write_try_results_json(options.json, jobs)
5536 else:
5537 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005538 return 0
5539
5540
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005541@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005542def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005543 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005544 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005545 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005546 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005547
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005548 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005549 if args:
5550 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005551 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005552 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005553 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005554 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005555
5556 # Clear configured merge-base, if there is one.
5557 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005558 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005559 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005560 return 0
5561
5562
thestig@chromium.org00858c82013-12-02 23:08:03 +00005563def CMDweb(parser, args):
5564 """Opens the current CL in the web browser."""
5565 _, args = parser.parse_args(args)
5566 if args:
5567 parser.error('Unrecognized args: %s' % ' '.join(args))
5568
5569 issue_url = Changelist().GetIssueURL()
5570 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005571 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005572 return 1
5573
5574 webbrowser.open(issue_url)
5575 return 0
5576
5577
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005578def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005579 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005580 parser.add_option('-d', '--dry-run', action='store_true',
5581 help='trigger in dry run mode')
5582 parser.add_option('-c', '--clear', action='store_true',
5583 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005584 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005585 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005586 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005587 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005588 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005589 if args:
5590 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005591 if options.dry_run and options.clear:
5592 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5593
iannuccie53c9352016-08-17 14:40:40 -07005594 cl = Changelist(auth_config=auth_config, issue=options.issue,
5595 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005596 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005597 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005598 elif options.dry_run:
5599 state = _CQState.DRY_RUN
5600 else:
5601 state = _CQState.COMMIT
5602 if not cl.GetIssue():
5603 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005604 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005605 return 0
5606
5607
groby@chromium.org411034a2013-02-26 15:12:01 +00005608def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005609 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005610 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005611 auth.add_auth_options(parser)
5612 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005613 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005614 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005615 if args:
5616 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005617 cl = Changelist(auth_config=auth_config, issue=options.issue,
5618 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005619 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005620 if not cl.GetIssue():
5621 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005622 cl.CloseIssue()
5623 return 0
5624
5625
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005626def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005627 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005628 parser.add_option(
5629 '--stat',
5630 action='store_true',
5631 dest='stat',
5632 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005633 auth.add_auth_options(parser)
5634 options, args = parser.parse_args(args)
5635 auth_config = auth.extract_auth_config_from_options(options)
5636 if args:
5637 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005638
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005639 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005640 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005641 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005642 if not issue:
5643 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005644
Aaron Gablea718c3e2017-08-28 17:47:28 -07005645 base = cl._GitGetBranchConfigValue('last-upload-hash')
5646 if not base:
5647 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5648 if not base:
5649 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5650 revision_info = detail['revisions'][detail['current_revision']]
5651 fetch_info = revision_info['fetch']['http']
5652 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5653 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005654
Aaron Gablea718c3e2017-08-28 17:47:28 -07005655 cmd = ['git', 'diff']
5656 if options.stat:
5657 cmd.append('--stat')
5658 cmd.append(base)
5659 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005660
5661 return 0
5662
5663
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005664def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005665 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005666 parser.add_option(
5667 '--no-color',
5668 action='store_true',
5669 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005670 parser.add_option(
5671 '--batch',
5672 action='store_true',
5673 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005674 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005675 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005676 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005677
5678 author = RunGit(['config', 'user.email']).strip() or None
5679
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005680 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005681
5682 if args:
5683 if len(args) > 1:
5684 parser.error('Unknown args')
5685 base_branch = args[0]
5686 else:
5687 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005688 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005689
5690 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005691 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5692
5693 if options.batch:
5694 db = owners.Database(change.RepositoryRoot(), file, os.path)
5695 print('\n'.join(db.reviewers_for(affected_files, author)))
5696 return 0
5697
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005698 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005699 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005700 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005701 author,
5702 cl.GetReviewers(),
5703 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005704 disable_color=options.no_color,
5705 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005706
5707
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005708def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005709 """Generates a diff command."""
5710 # Generate diff for the current branch's changes.
Aaron Gablef4068aa2017-12-12 15:14:09 -08005711 diff_cmd = ['-c', 'core.quotePath=false', 'diff',
5712 '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005713 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005714
5715 if args:
5716 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005717 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005718 diff_cmd.append(arg)
5719 else:
5720 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005721
5722 return diff_cmd
5723
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005724
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005725def MatchingFileType(file_name, extensions):
5726 """Returns true if the file name ends with one of the given extensions."""
5727 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005728
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005729
enne@chromium.org555cfe42014-01-29 18:21:39 +00005730@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005731def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005732 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005733 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005734 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005735 parser.add_option('--full', action='store_true',
5736 help='Reformat the full content of all touched files')
5737 parser.add_option('--dry-run', action='store_true',
5738 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005739 parser.add_option('--python', action='store_true',
5740 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005741 parser.add_option('--js', action='store_true',
5742 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005743 parser.add_option('--diff', action='store_true',
5744 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005745 parser.add_option('--presubmit', action='store_true',
5746 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005747 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005748
Daniel Chengc55eecf2016-12-30 03:11:02 -08005749 # Normalize any remaining args against the current path, so paths relative to
5750 # the current directory are still resolved as expected.
5751 args = [os.path.join(os.getcwd(), arg) for arg in args]
5752
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005753 # git diff generates paths against the root of the repository. Change
5754 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005755 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005756 if rel_base_path:
5757 os.chdir(rel_base_path)
5758
digit@chromium.org29e47272013-05-17 17:01:46 +00005759 # Grab the merge-base commit, i.e. the upstream commit of the current
5760 # branch when it was created or the last time it was rebased. This is
5761 # to cover the case where the user may have called "git fetch origin",
5762 # moving the origin branch to a newer commit, but hasn't rebased yet.
5763 upstream_commit = None
5764 cl = Changelist()
5765 upstream_branch = cl.GetUpstreamBranch()
5766 if upstream_branch:
5767 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5768 upstream_commit = upstream_commit.strip()
5769
5770 if not upstream_commit:
5771 DieWithError('Could not find base commit for this branch. '
5772 'Are you in detached state?')
5773
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005774 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5775 diff_output = RunGit(changed_files_cmd)
5776 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005777 # Filter out files deleted by this CL
5778 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005779
Christopher Lamc5ba6922017-01-24 11:19:14 +11005780 if opts.js:
5781 CLANG_EXTS.append('.js')
5782
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005783 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5784 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5785 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005786 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005787
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005788 top_dir = os.path.normpath(
5789 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5790
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005791 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5792 # formatted. This is used to block during the presubmit.
5793 return_value = 0
5794
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005795 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005796 # Locate the clang-format binary in the checkout
5797 try:
5798 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005799 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005800 DieWithError(e)
5801
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005802 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005803 cmd = [clang_format_tool]
5804 if not opts.dry_run and not opts.diff:
5805 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005806 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005807 if opts.diff:
5808 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005809 else:
5810 env = os.environ.copy()
5811 env['PATH'] = str(os.path.dirname(clang_format_tool))
5812 try:
5813 script = clang_format.FindClangFormatScriptInChromiumTree(
5814 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005815 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005816 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005817
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005818 cmd = [sys.executable, script, '-p0']
5819 if not opts.dry_run and not opts.diff:
5820 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005821
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005822 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5823 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005824
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005825 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5826 if opts.diff:
5827 sys.stdout.write(stdout)
5828 if opts.dry_run and len(stdout) > 0:
5829 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005830
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005831 # Similar code to above, but using yapf on .py files rather than clang-format
5832 # on C/C++ files
5833 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005834 yapf_tool = gclient_utils.FindExecutable('yapf')
5835 if yapf_tool is None:
5836 DieWithError('yapf not found in PATH')
5837
5838 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005839 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005840 cmd = [yapf_tool]
5841 if not opts.dry_run and not opts.diff:
5842 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005843 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005844 if opts.diff:
5845 sys.stdout.write(stdout)
5846 else:
5847 # TODO(sbc): yapf --lines mode still has some issues.
5848 # https://github.com/google/yapf/issues/154
5849 DieWithError('--python currently only works with --full')
5850
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005851 # Dart's formatter does not have the nice property of only operating on
5852 # modified chunks, so hard code full.
5853 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005854 try:
5855 command = [dart_format.FindDartFmtToolInChromiumTree()]
5856 if not opts.dry_run and not opts.diff:
5857 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005858 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005859
ppi@chromium.org6593d932016-03-03 15:41:15 +00005860 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005861 if opts.dry_run and stdout:
5862 return_value = 2
5863 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005864 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5865 'found in this checkout. Files in other languages are still '
5866 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005867
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005868 # Format GN build files. Always run on full build files for canonical form.
5869 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005870 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005871 if opts.dry_run or opts.diff:
5872 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005873 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005874 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5875 shell=sys.platform == 'win32',
5876 cwd=top_dir)
5877 if opts.dry_run and gn_ret == 2:
5878 return_value = 2 # Not formatted.
5879 elif opts.diff and gn_ret == 2:
5880 # TODO this should compute and print the actual diff.
5881 print("This change has GN build file diff for " + gn_diff_file)
5882 elif gn_ret != 0:
5883 # For non-dry run cases (and non-2 return values for dry-run), a
5884 # nonzero error code indicates a failure, probably because the file
5885 # doesn't parse.
5886 DieWithError("gn format failed on " + gn_diff_file +
5887 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005888
Ilya Shermane081cbe2017-08-15 17:51:04 -07005889 # Skip the metrics formatting from the global presubmit hook. These files have
5890 # a separate presubmit hook that issues an error if the files need formatting,
5891 # whereas the top-level presubmit script merely issues a warning. Formatting
5892 # these files is somewhat slow, so it's important not to duplicate the work.
5893 if not opts.presubmit:
5894 for xml_dir in GetDirtyMetricsDirs(diff_files):
5895 tool_dir = os.path.join(top_dir, xml_dir)
5896 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5897 if opts.dry_run or opts.diff:
5898 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005899 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005900 if opts.diff:
5901 sys.stdout.write(stdout)
5902 if opts.dry_run and stdout:
5903 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005904
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005905 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005906
Steven Holte2e664bf2017-04-21 13:10:47 -07005907def GetDirtyMetricsDirs(diff_files):
5908 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5909 metrics_xml_dirs = [
5910 os.path.join('tools', 'metrics', 'actions'),
5911 os.path.join('tools', 'metrics', 'histograms'),
5912 os.path.join('tools', 'metrics', 'rappor'),
5913 os.path.join('tools', 'metrics', 'ukm')]
5914 for xml_dir in metrics_xml_dirs:
5915 if any(file.startswith(xml_dir) for file in xml_diff_files):
5916 yield xml_dir
5917
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005918
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005919@subcommand.usage('<codereview url or issue id>')
5920def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005921 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005922 _, args = parser.parse_args(args)
5923
5924 if len(args) != 1:
5925 parser.print_help()
5926 return 1
5927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005928 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005929 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005930 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005931
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005932 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005933
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005934 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005935 output = RunGit(['config', '--local', '--get-regexp',
5936 r'branch\..*\.%s' % issueprefix],
5937 error_ok=True)
5938 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005939 if issue == target_issue:
5940 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005941
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005942 branches = []
5943 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005944 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005945 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005946 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005947 return 1
5948 if len(branches) == 1:
5949 RunGit(['checkout', branches[0]])
5950 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005951 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005952 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005953 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005954 which = raw_input('Choose by index: ')
5955 try:
5956 RunGit(['checkout', branches[int(which)]])
5957 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005958 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005959 return 1
5960
5961 return 0
5962
5963
maruel@chromium.org29404b52014-09-08 22:58:00 +00005964def CMDlol(parser, args):
5965 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005966 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005967 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5968 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5969 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005970 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005971 return 0
5972
5973
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005974class OptionParser(optparse.OptionParser):
5975 """Creates the option parse and add --verbose support."""
5976 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005977 optparse.OptionParser.__init__(
5978 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005979 self.add_option(
5980 '-v', '--verbose', action='count', default=0,
5981 help='Use 2 times for more debugging info')
5982
5983 def parse_args(self, args=None, values=None):
5984 options, args = optparse.OptionParser.parse_args(self, args, values)
5985 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005986 logging.basicConfig(
5987 level=levels[min(options.verbose, len(levels) - 1)],
5988 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5989 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005990 return options, args
5991
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005992
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005993def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005994 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005995 print('\nYour python version %s is unsupported, please upgrade.\n' %
5996 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005997 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005998
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005999 # Reload settings.
6000 global settings
6001 settings = Settings()
6002
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006003 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006004 dispatcher = subcommand.CommandDispatcher(__name__)
6005 try:
6006 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006007 except auth.AuthenticationError as e:
6008 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006009 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006010 if e.code != 500:
6011 raise
6012 DieWithError(
6013 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6014 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006015 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006016
6017
6018if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006019 # These affect sys.stdout so do it outside of main() to simplify mocks in
6020 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006021 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006022 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006023 try:
6024 sys.exit(main(sys.argv[1:]))
6025 except KeyboardInterrupt:
6026 sys.stderr.write('interrupted\n')
6027 sys.exit(1)