blob: 36c6889db45f67e3be4af6f4769d1f7ecd7ca3d6 [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
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000058import metrics
piman@chromium.org336f9122014-09-04 02:16:55 +000059import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000060import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000062import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040064import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000065import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000066import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067import watchlists
68
tandrii7400cf02016-06-21 08:48:07 -070069__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000070
tandrii9d2c7a32016-06-22 03:42:45 -070071COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070072DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080073POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000075REFS_THAT_ALIAS_TO_OTHER_REFS = {
76 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
77 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
78}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000079
thestig@chromium.org44202a22014-03-11 19:22:18 +000080# Valid extensions for files we want to lint.
81DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
82DEFAULT_LINT_IGNORE_REGEX = r"$^"
83
borenet6c0efe62016-10-19 08:13:29 -070084# Buildbucket master name prefix.
85MASTER_PREFIX = 'master.'
86
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000087# Shortcut since it quickly becomes redundant.
88Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000089
maruel@chromium.orgddd59412011-11-30 14:20:38 +000090# Initialized in main()
91settings = None
92
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010093# Used by tests/git_cl_test.py to add extra logging.
94# Inside the weirdly failing test, add this:
95# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -070096# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010097_IS_BEING_TESTED = False
98
maruel@chromium.orgddd59412011-11-30 14:20:38 +000099
Christopher Lamf732cd52017-01-24 12:40:11 +1100100def DieWithError(message, change_desc=None):
101 if change_desc:
102 SaveDescriptionBackup(change_desc)
103
vapiera7fbd5a2016-06-16 09:17:49 -0700104 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000105 sys.exit(1)
106
107
Christopher Lamf732cd52017-01-24 12:40:11 +1100108def SaveDescriptionBackup(change_desc):
109 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
110 print('\nError after CL description prompt -- saving description to %s\n' %
111 backup_path)
112 backup_file = open(backup_path, 'w')
113 backup_file.write(change_desc.description)
114 backup_file.close()
115
116
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000117def GetNoGitPagerEnv():
118 env = os.environ.copy()
119 # 'cat' is a magical git string that disables pagers on all platforms.
120 env['GIT_PAGER'] = 'cat'
121 return env
122
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000123
bsep@chromium.org627d9002016-04-29 00:00:52 +0000124def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000125 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000126 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000127 except subprocess2.CalledProcessError as e:
128 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000129 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000130 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000131 'Command "%s" failed.\n%s' % (
132 ' '.join(args), error_message or e.stdout or ''))
133 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000134
135
136def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000137 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000138 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000139
140
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000141def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000142 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700143 if suppress_stderr:
144 stderr = subprocess2.VOID
145 else:
146 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000147 try:
tandrii5d48c322016-08-18 16:19:37 -0700148 (out, _), code = subprocess2.communicate(['git'] + args,
149 env=GetNoGitPagerEnv(),
150 stdout=subprocess2.PIPE,
151 stderr=stderr)
152 return code, out
153 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900154 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700155 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156
157
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000158def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000159 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000160 return RunGitWithCode(args, suppress_stderr=True)[1]
161
162
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000163def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000164 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000165 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000166 return (version.startswith(prefix) and
167 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000168
169
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000170def BranchExists(branch):
171 """Return True if specified branch exists."""
172 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
173 suppress_stderr=True)
174 return not code
175
176
tandrii2a16b952016-10-19 07:09:44 -0700177def time_sleep(seconds):
178 # Use this so that it can be mocked in tests without interfering with python
179 # system machinery.
180 import time # Local import to discourage others from importing time globally.
181 return time.sleep(seconds)
182
183
maruel@chromium.org90541732011-04-01 17:54:18 +0000184def ask_for_data(prompt):
185 try:
186 return raw_input(prompt)
187 except KeyboardInterrupt:
188 # Hide the exception.
189 sys.exit(1)
190
191
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100192def confirm_or_exit(prefix='', action='confirm'):
193 """Asks user to press enter to continue or press Ctrl+C to abort."""
194 if not prefix or prefix.endswith('\n'):
195 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100196 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100197 mid = ' Press'
198 elif prefix.endswith(' '):
199 mid = 'press'
200 else:
201 mid = ' press'
202 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
203
204
205def ask_for_explicit_yes(prompt):
206 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
207 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
208 while True:
209 if 'yes'.startswith(result):
210 return True
211 if 'no'.startswith(result):
212 return False
213 result = ask_for_data('Please, type yes or no: ').lower()
214
215
tandrii5d48c322016-08-18 16:19:37 -0700216def _git_branch_config_key(branch, key):
217 """Helper method to return Git config key for a branch."""
218 assert branch, 'branch name is required to set git config for it'
219 return 'branch.%s.%s' % (branch, key)
220
221
222def _git_get_branch_config_value(key, default=None, value_type=str,
223 branch=False):
224 """Returns git config value of given or current branch if any.
225
226 Returns default in all other cases.
227 """
228 assert value_type in (int, str, bool)
229 if branch is False: # Distinguishing default arg value from None.
230 branch = GetCurrentBranch()
231
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000232 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700233 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000234
tandrii5d48c322016-08-18 16:19:37 -0700235 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700236 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700237 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700238 # git config also has --int, but apparently git config suffers from integer
239 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700240 args.append(_git_branch_config_key(branch, key))
241 code, out = RunGitWithCode(args)
242 if code == 0:
243 value = out.strip()
244 if value_type == int:
245 return int(value)
246 if value_type == bool:
247 return bool(value.lower() == 'true')
248 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000249 return default
250
251
tandrii5d48c322016-08-18 16:19:37 -0700252def _git_set_branch_config_value(key, value, branch=None, **kwargs):
253 """Sets the value or unsets if it's None of a git branch config.
254
255 Valid, though not necessarily existing, branch must be provided,
256 otherwise currently checked out branch is used.
257 """
258 if not branch:
259 branch = GetCurrentBranch()
260 assert branch, 'a branch name OR currently checked out branch is required'
261 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700262 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700263 if value is None:
264 args.append('--unset')
265 elif isinstance(value, bool):
266 args.append('--bool')
267 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700268 else:
tandrii33a46ff2016-08-23 05:53:40 -0700269 # git config also has --int, but apparently git config suffers from integer
270 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700271 value = str(value)
272 args.append(_git_branch_config_key(branch, key))
273 if value is not None:
274 args.append(value)
275 RunGit(args, **kwargs)
276
277
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100278def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700279 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100280
281 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
282 """
283 # Git also stores timezone offset, but it only affects visual display,
284 # actual point in time is defined by this timestamp only.
285 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
286
287
288def _git_amend_head(message, committer_timestamp):
289 """Amends commit with new message and desired committer_timestamp.
290
291 Sets committer timezone to UTC.
292 """
293 env = os.environ.copy()
294 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
295 return RunGit(['commit', '--amend', '-m', message], env=env)
296
297
machenbach@chromium.org45453142015-09-15 08:45:22 +0000298def _get_properties_from_options(options):
299 properties = dict(x.split('=', 1) for x in options.properties)
300 for key, val in properties.iteritems():
301 try:
302 properties[key] = json.loads(val)
303 except ValueError:
304 pass # If a value couldn't be evaluated, treat it as a string.
305 return properties
306
307
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000308def _prefix_master(master):
309 """Convert user-specified master name to full master name.
310
311 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
312 name, while the developers always use shortened master name
313 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
314 function does the conversion for buildbucket migration.
315 """
borenet6c0efe62016-10-19 08:13:29 -0700316 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000317 return master
borenet6c0efe62016-10-19 08:13:29 -0700318 return '%s%s' % (MASTER_PREFIX, master)
319
320
321def _unprefix_master(bucket):
322 """Convert bucket name to shortened master name.
323
324 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
325 name, while the developers always use shortened master name
326 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
327 function does the conversion for buildbucket migration.
328 """
329 if bucket.startswith(MASTER_PREFIX):
330 return bucket[len(MASTER_PREFIX):]
331 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000332
333
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000334def _buildbucket_retry(operation_name, http, *args, **kwargs):
335 """Retries requests to buildbucket service and returns parsed json content."""
336 try_count = 0
337 while True:
338 response, content = http.request(*args, **kwargs)
339 try:
340 content_json = json.loads(content)
341 except ValueError:
342 content_json = None
343
344 # Buildbucket could return an error even if status==200.
345 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000346 error = content_json.get('error')
347 if error.get('code') == 403:
348 raise BuildbucketResponseException(
349 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000351 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000352 raise BuildbucketResponseException(msg)
353
354 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700355 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 raise BuildbucketResponseException(
357 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700358 'Please file bugs at http://crbug.com, '
359 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360 content)
361 return content_json
362 if response.status < 500 or try_count >= 2:
363 raise httplib2.HttpLib2Error(content)
364
365 # status >= 500 means transient failures.
366 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700367 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000368 try_count += 1
369 assert False, 'unreachable'
370
371
qyearsley1fdfcb62016-10-24 13:22:03 -0700372def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700373 """Returns a dict mapping bucket names to builders and tests,
374 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700375 """
qyearsleydd49f942016-10-28 11:57:22 -0700376 # If no bots are listed, we try to get a set of builders and tests based
377 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700378 if not options.bot:
379 change = changelist.GetChange(
380 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700381 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700382 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700383 change=change,
384 changed_files=change.LocalPaths(),
385 repository_root=settings.GetRoot(),
386 default_presubmit=None,
387 project=None,
388 verbose=options.verbose,
389 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700390 if masters is None:
391 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100392 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700393
qyearsley1fdfcb62016-10-24 13:22:03 -0700394 if options.bucket:
395 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700396 if options.master:
397 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700398
qyearsleydd49f942016-10-28 11:57:22 -0700399 # If bots are listed but no master or bucket, then we need to find out
400 # the corresponding master for each bot.
401 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
402 if error_message:
403 option_parser.error(
404 'Tryserver master cannot be found because: %s\n'
405 'Please manually specify the tryserver master, e.g. '
406 '"-m tryserver.chromium.linux".' % error_message)
407 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700408
409
qyearsley123a4682016-10-26 09:12:17 -0700410def _get_bucket_map_for_builders(builders):
411 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700412 map_url = 'https://builders-map.appspot.com/'
413 try:
qyearsley123a4682016-10-26 09:12:17 -0700414 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700415 except urllib2.URLError as e:
416 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
417 (map_url, e))
418 except ValueError as e:
419 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700420 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 return None, 'Failed to build master map.'
422
qyearsley123a4682016-10-26 09:12:17 -0700423 bucket_map = {}
424 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800425 bucket = builders_map.get(builder, {}).get('bucket')
426 if bucket:
427 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700428 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700429
430
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800431def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700432 """Sends a request to Buildbucket to trigger try jobs for a changelist.
433
434 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700435 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700436 changelist: Changelist that the try jobs are associated with.
437 buckets: A nested dict mapping bucket names to builders to tests.
438 options: Command-line options.
439 """
tandriide281ae2016-10-12 06:02:30 -0700440 assert changelist.GetIssue(), 'CL must be uploaded first'
441 codereview_url = changelist.GetCodereviewServer()
442 assert codereview_url, 'CL must be uploaded first'
443 patchset = patchset or changelist.GetMostRecentPatchset()
444 assert patchset, 'CL must be uploaded first'
445
446 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700447 # Cache the buildbucket credentials under the codereview host key, so that
448 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700449 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000450 http = authenticator.authorize(httplib2.Http())
451 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700452
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000453 buildbucket_put_url = (
454 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000455 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700456 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
457 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
458 hostname=codereview_host,
459 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000460 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700461
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700462 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800463 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700464 if options.clobber:
465 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700466 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700467 if extra_properties:
468 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000469
470 batch_req_body = {'builds': []}
471 print_text = []
472 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700473 for bucket, builders_and_tests in sorted(buckets.iteritems()):
474 print_text.append('Bucket: %s' % bucket)
475 master = None
476 if bucket.startswith(MASTER_PREFIX):
477 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000478 for builder, tests in sorted(builders_and_tests.iteritems()):
479 print_text.append(' %s: %s' % (builder, tests))
480 parameters = {
481 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000482 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100483 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000484 'revision': options.revision,
485 }],
tandrii8c5a3532016-11-04 07:52:02 -0700486 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000487 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000488 if 'presubmit' in builder.lower():
489 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000490 if tests:
491 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700492
493 tags = [
494 'builder:%s' % builder,
495 'buildset:%s' % buildset,
496 'user_agent:git_cl_try',
497 ]
498 if master:
499 parameters['properties']['master'] = master
500 tags.append('master:%s' % master)
501
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000502 batch_req_body['builds'].append(
503 {
504 'bucket': bucket,
505 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000506 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700507 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000508 }
509 )
510
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000511 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700512 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000513 http,
514 buildbucket_put_url,
515 'PUT',
516 body=json.dumps(batch_req_body),
517 headers={'Content-Type': 'application/json'}
518 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000519 print_text.append('To see results here, run: git cl try-results')
520 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700521 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000522
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000523
tandrii221ab252016-10-06 08:12:04 -0700524def fetch_try_jobs(auth_config, changelist, buildbucket_host,
525 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700526 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
qyearsley53f48a12016-09-01 10:45:13 -0700528 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529 """
tandrii221ab252016-10-06 08:12:04 -0700530 assert buildbucket_host
531 assert changelist.GetIssue(), 'CL must be uploaded first'
532 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
533 patchset = patchset or changelist.GetMostRecentPatchset()
534 assert patchset, 'CL must be uploaded first'
535
536 codereview_url = changelist.GetCodereviewServer()
537 codereview_host = urlparse.urlparse(codereview_url).hostname
538 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000539 if authenticator.has_cached_credentials():
540 http = authenticator.authorize(httplib2.Http())
541 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700542 print('Warning: Some results might be missing because %s' %
543 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700544 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 http = httplib2.Http()
546
547 http.force_exception_to_status_code = True
548
tandrii221ab252016-10-06 08:12:04 -0700549 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
550 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
551 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700553 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 params = {'tag': 'buildset:%s' % buildset}
555
556 builds = {}
557 while True:
558 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700559 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700561 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 for build in content.get('builds', []):
563 builds[build['id']] = build
564 if 'next_cursor' in content:
565 params['start_cursor'] = content['next_cursor']
566 else:
567 break
568 return builds
569
570
qyearsleyeab3c042016-08-24 09:18:28 -0700571def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572 """Prints nicely result of fetch_try_jobs."""
573 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700574 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000575 return
576
577 # Make a copy, because we'll be modifying builds dictionary.
578 builds = builds.copy()
579 builder_names_cache = {}
580
581 def get_builder(b):
582 try:
583 return builder_names_cache[b['id']]
584 except KeyError:
585 try:
586 parameters = json.loads(b['parameters_json'])
587 name = parameters['builder_name']
588 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700589 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700590 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591 name = None
592 builder_names_cache[b['id']] = name
593 return name
594
595 def get_bucket(b):
596 bucket = b['bucket']
597 if bucket.startswith('master.'):
598 return bucket[len('master.'):]
599 return bucket
600
601 if options.print_master:
602 name_fmt = '%%-%ds %%-%ds' % (
603 max(len(str(get_bucket(b))) for b in builds.itervalues()),
604 max(len(str(get_builder(b))) for b in builds.itervalues()))
605 def get_name(b):
606 return name_fmt % (get_bucket(b), get_builder(b))
607 else:
608 name_fmt = '%%-%ds' % (
609 max(len(str(get_builder(b))) for b in builds.itervalues()))
610 def get_name(b):
611 return name_fmt % get_builder(b)
612
613 def sort_key(b):
614 return b['status'], b.get('result'), get_name(b), b.get('url')
615
616 def pop(title, f, color=None, **kwargs):
617 """Pop matching builds from `builds` dict and print them."""
618
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000619 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000620 colorize = str
621 else:
622 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
623
624 result = []
625 for b in builds.values():
626 if all(b.get(k) == v for k, v in kwargs.iteritems()):
627 builds.pop(b['id'])
628 result.append(b)
629 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700630 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700632 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633
634 total = len(builds)
635 pop(status='COMPLETED', result='SUCCESS',
636 title='Successes:', color=Fore.GREEN,
637 f=lambda b: (get_name(b), b.get('url')))
638 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
639 title='Infra Failures:', color=Fore.MAGENTA,
640 f=lambda b: (get_name(b), b.get('url')))
641 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
642 title='Failures:', color=Fore.RED,
643 f=lambda b: (get_name(b), b.get('url')))
644 pop(status='COMPLETED', result='CANCELED',
645 title='Canceled:', color=Fore.MAGENTA,
646 f=lambda b: (get_name(b),))
647 pop(status='COMPLETED', result='FAILURE',
648 failure_reason='INVALID_BUILD_DEFINITION',
649 title='Wrong master/builder name:', color=Fore.MAGENTA,
650 f=lambda b: (get_name(b),))
651 pop(status='COMPLETED', result='FAILURE',
652 title='Other failures:',
653 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
654 pop(status='COMPLETED',
655 title='Other finished:',
656 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
657 pop(status='STARTED',
658 title='Started:', color=Fore.YELLOW,
659 f=lambda b: (get_name(b), b.get('url')))
660 pop(status='SCHEDULED',
661 title='Scheduled:',
662 f=lambda b: (get_name(b), 'id=%s' % b['id']))
663 # The last section is just in case buildbucket API changes OR there is a bug.
664 pop(title='Other:',
665 f=lambda b: (get_name(b), 'id=%s' % b['id']))
666 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700667 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668
669
qyearsley53f48a12016-09-01 10:45:13 -0700670def write_try_results_json(output_file, builds):
671 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
672
673 The input |builds| dict is assumed to be generated by Buildbucket.
674 Buildbucket documentation: http://goo.gl/G0s101
675 """
676
677 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800678 """Extracts some of the information from one build dict."""
679 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700680 return {
681 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700682 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800683 'builder_name': parameters.get('builder_name'),
684 'created_ts': build.get('created_ts'),
685 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700686 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800687 'result': build.get('result'),
688 'status': build.get('status'),
689 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700690 'url': build.get('url'),
691 }
692
693 converted = []
694 for _, build in sorted(builds.items()):
695 converted.append(convert_build_dict(build))
696 write_json(output_file, converted)
697
698
Aaron Gable13101a62018-02-09 13:20:41 -0800699def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 """Prints statistics about the change to the user."""
701 # --no-ext-diff is broken in some versions of Git, so try to work around
702 # this by overriding the environment (but there is still a problem if the
703 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000704 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705 if 'GIT_EXTERNAL_DIFF' in env:
706 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000707
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000708 try:
709 stdout = sys.stdout.fileno()
710 except AttributeError:
711 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000712 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800713 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000714 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000715
716
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000717class BuildbucketResponseException(Exception):
718 pass
719
720
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000721class Settings(object):
722 def __init__(self):
723 self.default_server = None
724 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000725 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000726 self.tree_status_url = None
727 self.viewvc_url = None
728 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000729 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000730 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000731 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000732 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000733 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000734 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000735
736 def LazyUpdateIfNeeded(self):
737 """Updates the settings from a codereview.settings file, if available."""
738 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000739 # The only value that actually changes the behavior is
740 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000741 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000742 error_ok=True
743 ).strip().lower()
744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000746 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000747 LoadCodereviewSettingsFromFile(cr_settings_file)
748 self.updated = True
749
750 def GetDefaultServerUrl(self, error_ok=False):
751 if not self.default_server:
752 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000753 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000754 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000755 if error_ok:
756 return self.default_server
757 if not self.default_server:
758 error_message = ('Could not find settings file. You must configure '
759 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000760 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000761 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 return self.default_server
763
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000764 @staticmethod
765 def GetRelativeRoot():
766 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000767
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000769 if self.root is None:
770 self.root = os.path.abspath(self.GetRelativeRoot())
771 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000772
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000773 def GetGitMirror(self, remote='origin'):
774 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000775 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000776 if not os.path.isdir(local_url):
777 return None
778 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
779 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100780 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100781 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000782 if mirror.exists():
783 return mirror
784 return None
785
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786 def GetTreeStatusUrl(self, error_ok=False):
787 if not self.tree_status_url:
788 error_message = ('You must configure your tree status URL by running '
789 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790 self.tree_status_url = self._GetRietveldConfig(
791 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792 return self.tree_status_url
793
794 def GetViewVCUrl(self):
795 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 return self.viewvc_url
798
rmistry@google.com90752582014-01-14 21:04:50 +0000799 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000800 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000801
rmistry@google.com78948ed2015-07-08 23:09:57 +0000802 def GetIsSkipDependencyUpload(self, branch_name):
803 """Returns true if specified branch should skip dep uploads."""
804 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
805 error_ok=True)
806
rmistry@google.com5626a922015-02-26 14:03:30 +0000807 def GetRunPostUploadHook(self):
808 run_post_upload_hook = self._GetRietveldConfig(
809 'run-post-upload-hook', error_ok=True)
810 return run_post_upload_hook == "True"
811
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000812 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000813 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000814
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000815 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000816 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000817
ukai@chromium.orge8077812012-02-03 03:41:46 +0000818 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700819 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000820 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700821 self.is_gerrit = (
822 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000823 return self.is_gerrit
824
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000825 def GetSquashGerritUploads(self):
826 """Return true if uploads to Gerrit should be squashed by default."""
827 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700828 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
829 if self.squash_gerrit_uploads is None:
830 # Default is squash now (http://crbug.com/611892#c23).
831 self.squash_gerrit_uploads = not (
832 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
833 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000834 return self.squash_gerrit_uploads
835
tandriia60502f2016-06-20 02:01:53 -0700836 def GetSquashGerritUploadsOverride(self):
837 """Return True or False if codereview.settings should be overridden.
838
839 Returns None if no override has been defined.
840 """
841 # See also http://crbug.com/611892#c23
842 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
843 error_ok=True).strip()
844 if result == 'true':
845 return True
846 if result == 'false':
847 return False
848 return None
849
tandrii@chromium.org28253532016-04-14 13:46:56 +0000850 def GetGerritSkipEnsureAuthenticated(self):
851 """Return True if EnsureAuthenticated should not be done for Gerrit
852 uploads."""
853 if self.gerrit_skip_ensure_authenticated is None:
854 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000855 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 error_ok=True).strip() == 'true')
857 return self.gerrit_skip_ensure_authenticated
858
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000859 def GetGitEditor(self):
860 """Return the editor specified in the git config, or None if none is."""
861 if self.git_editor is None:
862 self.git_editor = self._GetConfig('core.editor', error_ok=True)
863 return self.git_editor or None
864
thestig@chromium.org44202a22014-03-11 19:22:18 +0000865 def GetLintRegex(self):
866 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
867 DEFAULT_LINT_REGEX)
868
869 def GetLintIgnoreRegex(self):
870 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
871 DEFAULT_LINT_IGNORE_REGEX)
872
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000873 def GetProject(self):
874 if not self.project:
875 self.project = self._GetRietveldConfig('project', error_ok=True)
876 return self.project
877
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000878 def _GetRietveldConfig(self, param, **kwargs):
879 return self._GetConfig('rietveld.' + param, **kwargs)
880
rmistry@google.com78948ed2015-07-08 23:09:57 +0000881 def _GetBranchConfig(self, branch_name, param, **kwargs):
882 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
883
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000884 def _GetConfig(self, param, **kwargs):
885 self.LazyUpdateIfNeeded()
886 return RunGit(['config', param], **kwargs).strip()
887
888
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100889@contextlib.contextmanager
890def _get_gerrit_project_config_file(remote_url):
891 """Context manager to fetch and store Gerrit's project.config from
892 refs/meta/config branch and store it in temp file.
893
894 Provides a temporary filename or None if there was error.
895 """
896 error, _ = RunGitWithCode([
897 'fetch', remote_url,
898 '+refs/meta/config:refs/git_cl/meta/config'])
899 if error:
900 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700901 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100902 (remote_url, error))
903 yield None
904 return
905
906 error, project_config_data = RunGitWithCode(
907 ['show', 'refs/git_cl/meta/config:project.config'])
908 if error:
909 print('WARNING: project.config file not found')
910 yield None
911 return
912
913 with gclient_utils.temporary_directory() as tempdir:
914 project_config_file = os.path.join(tempdir, 'project.config')
915 gclient_utils.FileWrite(project_config_file, project_config_data)
916 yield project_config_file
917
918
919def _is_git_numberer_enabled(remote_url, remote_ref):
920 """Returns True if Git Numberer is enabled on this ref."""
921 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100922 KNOWN_PROJECTS_WHITELIST = [
923 'chromium/src',
924 'external/webrtc',
925 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100926 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200927 # For webrtc.googlesource.com/src.
928 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100929 ]
930
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100931 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
932 url_parts = urlparse.urlparse(remote_url)
933 project_name = url_parts.path.lstrip('/').rstrip('git./')
934 for known in KNOWN_PROJECTS_WHITELIST:
935 if project_name.endswith(known):
936 break
937 else:
938 # Early exit to avoid extra fetches for repos that aren't using Git
939 # Numberer.
940 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100941
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100942 with _get_gerrit_project_config_file(remote_url) as project_config_file:
943 if project_config_file is None:
944 # Failed to fetch project.config, which shouldn't happen on open source
945 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100946 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100947 def get_opts(x):
948 code, out = RunGitWithCode(
949 ['config', '-f', project_config_file, '--get-all',
950 'plugin.git-numberer.validate-%s-refglob' % x])
951 if code == 0:
952 return out.strip().splitlines()
953 return []
954 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100955
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100956 logging.info('validator config enabled %s disabled %s refglobs for '
957 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000958
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100959 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100960 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100961 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100962 return True
963 return False
964
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100965 if match_refglobs(disabled):
966 return False
967 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100968
969
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000970def ShortBranchName(branch):
971 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000972 return branch.replace('refs/heads/', '', 1)
973
974
975def GetCurrentBranchRef():
976 """Returns branch ref (e.g., refs/heads/master) or None."""
977 return RunGit(['symbolic-ref', 'HEAD'],
978 stderr=subprocess2.VOID, error_ok=True).strip() or None
979
980
981def GetCurrentBranch():
982 """Returns current branch or None.
983
984 For refs/heads/* branches, returns just last part. For others, full ref.
985 """
986 branchref = GetCurrentBranchRef()
987 if branchref:
988 return ShortBranchName(branchref)
989 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000990
991
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000992class _CQState(object):
993 """Enum for states of CL with respect to Commit Queue."""
994 NONE = 'none'
995 DRY_RUN = 'dry_run'
996 COMMIT = 'commit'
997
998 ALL_STATES = [NONE, DRY_RUN, COMMIT]
999
1000
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001001class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001002 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001003 self.issue = issue
1004 self.patchset = patchset
1005 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001006 assert codereview in (None, 'rietveld', 'gerrit')
1007 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001008
1009 @property
1010 def valid(self):
1011 return self.issue is not None
1012
1013
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001014def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001015 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1016 fail_result = _ParsedIssueNumberArgument()
1017
1018 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001019 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001020 if not arg.startswith('http'):
1021 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001022
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001023 url = gclient_utils.UpgradeToHttps(arg)
1024 try:
1025 parsed_url = urlparse.urlparse(url)
1026 except ValueError:
1027 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001028
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001029 if codereview is not None:
1030 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1031 return parsed or fail_result
1032
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001033 results = {}
1034 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1035 parsed = cls.ParseIssueURL(parsed_url)
1036 if parsed is not None:
1037 results[name] = parsed
1038
1039 if not results:
1040 return fail_result
1041 if len(results) == 1:
1042 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001043
1044 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1045 # This is likely Gerrit.
1046 return results['gerrit']
1047 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001048 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001049
1050
Aaron Gablea45ee112016-11-22 15:14:38 -08001051class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001052 def __init__(self, issue, url):
1053 self.issue = issue
1054 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001055 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001056
1057 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001058 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001059 self.issue, self.url)
1060
1061
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001062_CommentSummary = collections.namedtuple(
1063 '_CommentSummary', ['date', 'message', 'sender',
1064 # TODO(tandrii): these two aren't known in Gerrit.
1065 'approval', 'disapproval'])
1066
1067
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001068class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001069 """Changelist works with one changelist in local branch.
1070
1071 Supports two codereview backends: Rietveld or Gerrit, selected at object
1072 creation.
1073
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001074 Notes:
1075 * Not safe for concurrent multi-{thread,process} use.
1076 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001077 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001078 """
1079
1080 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1081 """Create a new ChangeList instance.
1082
1083 If issue is given, the codereview must be given too.
1084
1085 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1086 Otherwise, it's decided based on current configuration of the local branch,
1087 with default being 'rietveld' for backwards compatibility.
1088 See _load_codereview_impl for more details.
1089
1090 **kwargs will be passed directly to codereview implementation.
1091 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001093 global settings
1094 if not settings:
1095 # Happens when git_cl.py is used as a utility library.
1096 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001097
1098 if issue:
1099 assert codereview, 'codereview must be known, if issue is known'
1100
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101 self.branchref = branchref
1102 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001103 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104 self.branch = ShortBranchName(self.branchref)
1105 else:
1106 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001108 self.lookedup_issue = False
1109 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 self.has_description = False
1111 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001112 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001114 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001115 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001116 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001117 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001118
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001119 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001120 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001121 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001122 assert self._codereview_impl
1123 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001124
1125 def _load_codereview_impl(self, codereview=None, **kwargs):
1126 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001127 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1128 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1129 self._codereview = codereview
1130 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001131 return
1132
1133 # Automatic selection based on issue number set for a current branch.
1134 # Rietveld takes precedence over Gerrit.
1135 assert not self.issue
1136 # Whether we find issue or not, we are doing the lookup.
1137 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001138 if self.GetBranch():
1139 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1140 issue = _git_get_branch_config_value(
1141 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1142 if issue:
1143 self._codereview = codereview
1144 self._codereview_impl = cls(self, **kwargs)
1145 self.issue = int(issue)
1146 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001147
1148 # No issue is set for this branch, so decide based on repo-wide settings.
1149 return self._load_codereview_impl(
1150 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1151 **kwargs)
1152
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001153 def IsGerrit(self):
1154 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001155
1156 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001157 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001158
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001159 The return value is a string suitable for passing to git cl with the --cc
1160 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001161 """
1162 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001163 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001164 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001165 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1166 return self.cc
1167
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001168 def GetCCListWithoutDefault(self):
1169 """Return the users cc'd on this CL excluding default ones."""
1170 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001171 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001172 return self.cc
1173
Daniel Cheng7227d212017-11-17 08:12:37 -08001174 def ExtendCC(self, more_cc):
1175 """Extends the list of users to cc on this CL based on the changed files."""
1176 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001177
1178 def GetBranch(self):
1179 """Returns the short branch name, e.g. 'master'."""
1180 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001181 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001182 if not branchref:
1183 return None
1184 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185 self.branch = ShortBranchName(self.branchref)
1186 return self.branch
1187
1188 def GetBranchRef(self):
1189 """Returns the full branch name, e.g. 'refs/heads/master'."""
1190 self.GetBranch() # Poke the lazy loader.
1191 return self.branchref
1192
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001193 def ClearBranch(self):
1194 """Clears cached branch data of this object."""
1195 self.branch = self.branchref = None
1196
tandrii5d48c322016-08-18 16:19:37 -07001197 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1198 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1199 kwargs['branch'] = self.GetBranch()
1200 return _git_get_branch_config_value(key, default, **kwargs)
1201
1202 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1203 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1204 assert self.GetBranch(), (
1205 'this CL must have an associated branch to %sset %s%s' %
1206 ('un' if value is None else '',
1207 key,
1208 '' if value is None else ' to %r' % value))
1209 kwargs['branch'] = self.GetBranch()
1210 return _git_set_branch_config_value(key, value, **kwargs)
1211
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 @staticmethod
1213 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001214 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 e.g. 'origin', 'refs/heads/master'
1216 """
1217 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001218 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1219
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001221 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001223 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1224 error_ok=True).strip()
1225 if upstream_branch:
1226 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001228 # Else, try to guess the origin remote.
1229 remote_branches = RunGit(['branch', '-r']).split()
1230 if 'origin/master' in remote_branches:
1231 # Fall back on origin/master if it exits.
1232 remote = 'origin'
1233 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001235 DieWithError(
1236 'Unable to determine default branch to diff against.\n'
1237 'Either pass complete "git diff"-style arguments, like\n'
1238 ' git cl upload origin/master\n'
1239 'or verify this branch is set up to track another \n'
1240 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241
1242 return remote, upstream_branch
1243
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001244 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001245 upstream_branch = self.GetUpstreamBranch()
1246 if not BranchExists(upstream_branch):
1247 DieWithError('The upstream for the current branch (%s) does not exist '
1248 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001249 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001250 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001251
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 def GetUpstreamBranch(self):
1253 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001254 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001256 upstream_branch = upstream_branch.replace('refs/heads/',
1257 'refs/remotes/%s/' % remote)
1258 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1259 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 self.upstream_branch = upstream_branch
1261 return self.upstream_branch
1262
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001263 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001264 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001265 remote, branch = None, self.GetBranch()
1266 seen_branches = set()
1267 while branch not in seen_branches:
1268 seen_branches.add(branch)
1269 remote, branch = self.FetchUpstreamTuple(branch)
1270 branch = ShortBranchName(branch)
1271 if remote != '.' or branch.startswith('refs/remotes'):
1272 break
1273 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001274 remotes = RunGit(['remote'], error_ok=True).split()
1275 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001276 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001277 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001278 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001279 logging.warn('Could not determine which remote this change is '
1280 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001281 else:
1282 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001283 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001284 branch = 'HEAD'
1285 if branch.startswith('refs/remotes'):
1286 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001287 elif branch.startswith('refs/branch-heads/'):
1288 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001289 else:
1290 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001291 return self._remote
1292
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 def GitSanityChecks(self, upstream_git_obj):
1294 """Checks git repo status and ensures diff is from local commits."""
1295
sbc@chromium.org79706062015-01-14 21:18:12 +00001296 if upstream_git_obj is None:
1297 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001298 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001299 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001300 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001301 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001302 return False
1303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 # Verify the commit we're diffing against is in our current branch.
1305 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1306 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1307 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001308 print('ERROR: %s is not in the current branch. You may need to rebase '
1309 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001310 return False
1311
1312 # List the commits inside the diff, and verify they are all local.
1313 commits_in_diff = RunGit(
1314 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1315 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1316 remote_branch = remote_branch.strip()
1317 if code != 0:
1318 _, remote_branch = self.GetRemoteBranch()
1319
1320 commits_in_remote = RunGit(
1321 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1322
1323 common_commits = set(commits_in_diff) & set(commits_in_remote)
1324 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001325 print('ERROR: Your diff contains %d commits already in %s.\n'
1326 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1327 'the diff. If you are using a custom git flow, you can override'
1328 ' the reference used for this check with "git config '
1329 'gitcl.remotebranch <git-ref>".' % (
1330 len(common_commits), remote_branch, upstream_git_obj),
1331 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 return False
1333 return True
1334
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001335 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001336 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001337
1338 Returns None if it is not set.
1339 """
tandrii5d48c322016-08-18 16:19:37 -07001340 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001341
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342 def GetRemoteUrl(self):
1343 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1344
1345 Returns None if there is no remote.
1346 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001347 is_cached, value = self._cached_remote_url
1348 if is_cached:
1349 return value
1350
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001351 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001352 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1353
1354 # If URL is pointing to a local directory, it is probably a git cache.
1355 if os.path.isdir(url):
1356 url = RunGit(['config', 'remote.%s.url' % remote],
1357 error_ok=True,
1358 cwd=url).strip()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001359 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001360 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001361
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001362 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001363 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001364 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001365 self.issue = self._GitGetBranchConfigValue(
1366 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001367 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001368 return self.issue
1369
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370 def GetIssueURL(self):
1371 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001372 issue = self.GetIssue()
1373 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001374 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001375 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001376
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001377 def GetDescription(self, pretty=False, force=False):
1378 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001380 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001381 self.has_description = True
1382 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001383 # Set width to 72 columns + 2 space indent.
1384 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001386 lines = self.description.splitlines()
1387 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 return self.description
1389
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001390 def GetDescriptionFooters(self):
1391 """Returns (non_footer_lines, footers) for the commit message.
1392
1393 Returns:
1394 non_footer_lines (list(str)) - Simple list of description lines without
1395 any footer. The lines do not contain newlines, nor does the list contain
1396 the empty line between the message and the footers.
1397 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1398 [("Change-Id", "Ideadbeef...."), ...]
1399 """
1400 raw_description = self.GetDescription()
1401 msg_lines, _, footers = git_footers.split_footers(raw_description)
1402 if footers:
1403 msg_lines = msg_lines[:len(msg_lines)-1]
1404 return msg_lines, footers
1405
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001407 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001408 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001409 self.patchset = self._GitGetBranchConfigValue(
1410 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001411 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 return self.patchset
1413
1414 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001415 """Set this branch's patchset. If patchset=0, clears the patchset."""
1416 assert self.GetBranch()
1417 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001418 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001419 else:
1420 self.patchset = int(patchset)
1421 self._GitSetBranchConfigValue(
1422 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001423
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001424 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001425 """Set this branch's issue. If issue isn't given, clears the issue."""
1426 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001428 issue = int(issue)
1429 self._GitSetBranchConfigValue(
1430 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001431 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001432 codereview_server = self._codereview_impl.GetCodereviewServer()
1433 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001434 self._GitSetBranchConfigValue(
1435 self._codereview_impl.CodereviewServerConfigKey(),
1436 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437 else:
tandrii5d48c322016-08-18 16:19:37 -07001438 # Reset all of these just to be clean.
1439 reset_suffixes = [
1440 'last-upload-hash',
1441 self._codereview_impl.IssueConfigKey(),
1442 self._codereview_impl.PatchsetConfigKey(),
1443 self._codereview_impl.CodereviewServerConfigKey(),
1444 ] + self._PostUnsetIssueProperties()
1445 for prop in reset_suffixes:
1446 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001447 msg = RunGit(['log', '-1', '--format=%B']).strip()
1448 if msg and git_footers.get_footer_change_id(msg):
1449 print('WARNING: The change patched into this branch has a Change-Id. '
1450 'Removing it.')
1451 RunGit(['commit', '--amend', '-m',
1452 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001453 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001454 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001455
dnjba1b0f32016-09-02 12:37:42 -07001456 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001457 if not self.GitSanityChecks(upstream_branch):
1458 DieWithError('\nGit sanity check failure')
1459
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001460 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001461 if not root:
1462 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001463 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001464
1465 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001466 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001467 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001468 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001469 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001470 except subprocess2.CalledProcessError:
1471 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001472 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001473 'This branch probably doesn\'t exist anymore. To reset the\n'
1474 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001475 ' git branch --set-upstream-to origin/master %s\n'
1476 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001477 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001478
maruel@chromium.org52424302012-08-29 15:14:30 +00001479 issue = self.GetIssue()
1480 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001481 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001482 description = self.GetDescription()
1483 else:
1484 # If the change was never uploaded, use the log messages of all commits
1485 # up to the branch point, as git cl upload will prefill the description
1486 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001487 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1488 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001489
1490 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001491 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001492 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001493 name,
1494 description,
1495 absroot,
1496 files,
1497 issue,
1498 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001499 author,
1500 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001501
dsansomee2d6fd92016-09-08 00:10:47 -07001502 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001503 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001504 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001505 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001506
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001507 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1508 """Sets the description for this CL remotely.
1509
1510 You can get description_lines and footers with GetDescriptionFooters.
1511
1512 Args:
1513 description_lines (list(str)) - List of CL description lines without
1514 newline characters.
1515 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1516 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1517 `List-Of-Tokens`). It will be case-normalized so that each token is
1518 title-cased.
1519 """
1520 new_description = '\n'.join(description_lines)
1521 if footers:
1522 new_description += '\n'
1523 for k, v in footers:
1524 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1525 if not git_footers.FOOTER_PATTERN.match(foot):
1526 raise ValueError('Invalid footer %r' % foot)
1527 new_description += foot + '\n'
1528 self.UpdateDescription(new_description, force)
1529
Edward Lesmes8e282792018-04-03 18:50:29 -04001530 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1532 try:
1533 return presubmit_support.DoPresubmitChecks(change, committing,
1534 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1535 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001536 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1537 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001538 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001539 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001540
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001541 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1542 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001543 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1544 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001545 else:
1546 # Assume url.
1547 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1548 urlparse.urlparse(issue_arg))
1549 if not parsed_issue_arg or not parsed_issue_arg.valid:
1550 DieWithError('Failed to parse issue argument "%s". '
1551 'Must be an issue number or a valid URL.' % issue_arg)
1552 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001553 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001554
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001555 def CMDUpload(self, options, git_diff_args, orig_args):
1556 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001557 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001559 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 else:
1561 if self.GetBranch() is None:
1562 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1563
1564 # Default to diffing against common ancestor of upstream branch
1565 base_branch = self.GetCommonAncestorWithUpstream()
1566 git_diff_args = [base_branch, 'HEAD']
1567
Aaron Gablec4c40d12017-05-22 11:49:53 -07001568 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1569 if not self.IsGerrit() and not self.GetIssue():
1570 print('=====================================')
1571 print('NOTICE: Rietveld is being deprecated. '
1572 'You can upload changes to Gerrit with')
1573 print(' git cl upload --gerrit')
1574 print('or set Gerrit to be your default code review tool with')
1575 print(' git config gerrit.host true')
1576 print('=====================================')
1577
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001578 # Fast best-effort checks to abort before running potentially
1579 # expensive hooks if uploading is likely to fail anyway. Passing these
1580 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001581 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001582 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583
1584 # Apply watchlists on upload.
1585 change = self.GetChange(base_branch, None)
1586 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1587 files = [f.LocalPath() for f in change.AffectedFiles()]
1588 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001589 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590
1591 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001592 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001593 # Set the reviewer list now so that presubmit checks can access it.
1594 change_description = ChangeDescription(change.FullDescriptionText())
1595 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001596 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001597 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 change)
1599 change.SetDescriptionText(change_description.description)
1600 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001601 may_prompt=not options.force,
1602 verbose=options.verbose,
1603 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001604 if not hook_results.should_continue():
1605 return 1
1606 if not options.reviewers and hook_results.reviewers:
1607 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001608 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001609
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001610 # TODO(tandrii): Checking local patchset against remote patchset is only
1611 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1612 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001613 latest_patchset = self.GetMostRecentPatchset()
1614 local_patchset = self.GetPatchset()
1615 if (latest_patchset and local_patchset and
1616 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001617 print('The last upload made from this repository was patchset #%d but '
1618 'the most recent patchset on the server is #%d.'
1619 % (local_patchset, latest_patchset))
1620 print('Uploading will still work, but if you\'ve uploaded to this '
1621 'issue from another machine or branch the patch you\'re '
1622 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001623 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001624
Aaron Gable13101a62018-02-09 13:20:41 -08001625 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001626 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001627 if not ret:
Ravi Mistry31e7d562018-04-02 12:53:57 -04001628 if self.IsGerrit():
1629 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
1630 options.cq_dry_run);
1631 else:
1632 if options.use_commit_queue:
1633 self.SetCQState(_CQState.COMMIT)
1634 elif options.cq_dry_run:
1635 self.SetCQState(_CQState.DRY_RUN)
tandrii4d0545a2016-07-06 03:56:49 -07001636
tandrii5d48c322016-08-18 16:19:37 -07001637 _git_set_branch_config_value('last-upload-hash',
1638 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001639 # Run post upload hooks, if specified.
1640 if settings.GetRunPostUploadHook():
1641 presubmit_support.DoPostUploadExecuter(
1642 change,
1643 self,
1644 settings.GetRoot(),
1645 options.verbose,
1646 sys.stdout)
1647
1648 # Upload all dependencies if specified.
1649 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001650 print()
1651 print('--dependencies has been specified.')
1652 print('All dependent local branches will be re-uploaded.')
1653 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001654 # Remove the dependencies flag from args so that we do not end up in a
1655 # loop.
1656 orig_args.remove('--dependencies')
1657 ret = upload_branch_deps(self, orig_args)
1658 return ret
1659
Ravi Mistry31e7d562018-04-02 12:53:57 -04001660 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1661 """Sets labels on the change based on the provided flags.
1662
1663 Sets labels if issue is already uploaded and known, else returns without
1664 doing anything.
1665
1666 Args:
1667 enable_auto_submit: Sets Auto-Submit+1 on the change.
1668 use_commit_queue: Sets Commit-Queue+2 on the change.
1669 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1670 both use_commit_queue and cq_dry_run are true.
1671 """
1672 if not self.GetIssue():
1673 return
1674 try:
1675 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1676 cq_dry_run)
1677 return 0
1678 except KeyboardInterrupt:
1679 raise
1680 except:
1681 labels = []
1682 if enable_auto_submit:
1683 labels.append('Auto-Submit')
1684 if use_commit_queue or cq_dry_run:
1685 labels.append('Commit-Queue')
1686 print('WARNING: Failed to set label(s) on your change: %s\n'
1687 'Either:\n'
1688 ' * Your project does not have the above label(s),\n'
1689 ' * You don\'t have permission to set the above label(s),\n'
1690 ' * There\'s a bug in this code (see stack trace below).\n' %
1691 (', '.join(labels)))
1692 # Still raise exception so that stack trace is printed.
1693 raise
1694
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001695 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001696 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001697
1698 Issue must have been already uploaded and known.
1699 """
1700 assert new_state in _CQState.ALL_STATES
1701 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001702 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001703 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001704 return 0
1705 except KeyboardInterrupt:
1706 raise
1707 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001708 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001709 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001710 ' * Your project has no CQ,\n'
1711 ' * You don\'t have permission to change the CQ state,\n'
1712 ' * There\'s a bug in this code (see stack trace below).\n'
1713 'Consider specifying which bots to trigger manually or asking your '
1714 'project owners for permissions or contacting Chrome Infra at:\n'
1715 'https://www.chromium.org/infra\n\n' %
1716 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001717 # Still raise exception so that stack trace is printed.
1718 raise
1719
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 # Forward methods to codereview specific implementation.
1721
Aaron Gable636b13f2017-07-14 10:42:48 -07001722 def AddComment(self, message, publish=None):
1723 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001724
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001726 """Returns list of _CommentSummary for each comment.
1727
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 args:
1729 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001731 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 def CloseIssue(self):
1734 return self._codereview_impl.CloseIssue()
1735
1736 def GetStatus(self):
1737 return self._codereview_impl.GetStatus()
1738
1739 def GetCodereviewServer(self):
1740 return self._codereview_impl.GetCodereviewServer()
1741
tandriide281ae2016-10-12 06:02:30 -07001742 def GetIssueOwner(self):
1743 """Get owner from codereview, which may differ from this checkout."""
1744 return self._codereview_impl.GetIssueOwner()
1745
Edward Lemur707d70b2018-02-07 00:50:14 +01001746 def GetReviewers(self):
1747 return self._codereview_impl.GetReviewers()
1748
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749 def GetMostRecentPatchset(self):
1750 return self._codereview_impl.GetMostRecentPatchset()
1751
tandriide281ae2016-10-12 06:02:30 -07001752 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001753 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001754 return self._codereview_impl.CannotTriggerTryJobReason()
1755
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001756 def GetTryJobProperties(self, patchset=None):
1757 """Returns dictionary of properties to launch try job."""
1758 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001759
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001760 def __getattr__(self, attr):
1761 # This is because lots of untested code accesses Rietveld-specific stuff
1762 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001763 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001764 # Note that child method defines __getattr__ as well, and forwards it here,
1765 # because _RietveldChangelistImpl is not cleaned up yet, and given
1766 # deprecation of Rietveld, it should probably be just removed.
1767 # Until that time, avoid infinite recursion by bypassing __getattr__
1768 # of implementation class.
1769 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770
1771
1772class _ChangelistCodereviewBase(object):
1773 """Abstract base class encapsulating codereview specifics of a changelist."""
1774 def __init__(self, changelist):
1775 self._changelist = changelist # instance of Changelist
1776
1777 def __getattr__(self, attr):
1778 # Forward methods to changelist.
1779 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1780 # _RietveldChangelistImpl to avoid this hack?
1781 return getattr(self._changelist, attr)
1782
1783 def GetStatus(self):
1784 """Apply a rough heuristic to give a simple summary of an issue's review
1785 or CQ status, assuming adherence to a common workflow.
1786
1787 Returns None if no issue for this branch, or specific string keywords.
1788 """
1789 raise NotImplementedError()
1790
1791 def GetCodereviewServer(self):
1792 """Returns server URL without end slash, like "https://codereview.com"."""
1793 raise NotImplementedError()
1794
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001795 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 """Fetches and returns description from the codereview server."""
1797 raise NotImplementedError()
1798
tandrii5d48c322016-08-18 16:19:37 -07001799 @classmethod
1800 def IssueConfigKey(cls):
1801 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001802 raise NotImplementedError()
1803
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001804 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001805 def PatchsetConfigKey(cls):
1806 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 raise NotImplementedError()
1808
tandrii5d48c322016-08-18 16:19:37 -07001809 @classmethod
1810 def CodereviewServerConfigKey(cls):
1811 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812 raise NotImplementedError()
1813
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001814 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001815 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001816 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001817
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001818 def GetGerritObjForPresubmit(self):
1819 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1820 return None
1821
dsansomee2d6fd92016-09-08 00:10:47 -07001822 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 """Update the description on codereview site."""
1824 raise NotImplementedError()
1825
Aaron Gable636b13f2017-07-14 10:42:48 -07001826 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001827 """Posts a comment to the codereview site."""
1828 raise NotImplementedError()
1829
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001831 raise NotImplementedError()
1832
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 def CloseIssue(self):
1834 """Closes the issue."""
1835 raise NotImplementedError()
1836
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837 def GetMostRecentPatchset(self):
1838 """Returns the most recent patchset number from the codereview site."""
1839 raise NotImplementedError()
1840
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001841 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001842 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 """Fetches and applies the issue.
1844
1845 Arguments:
1846 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1847 reject: if True, reject the failed patch instead of switching to 3-way
1848 merge. Rietveld only.
1849 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1850 only.
1851 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001852 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001853 """
1854 raise NotImplementedError()
1855
1856 @staticmethod
1857 def ParseIssueURL(parsed_url):
1858 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1859 failed."""
1860 raise NotImplementedError()
1861
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001862 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001863 """Best effort check that user is authenticated with codereview server.
1864
1865 Arguments:
1866 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001867 refresh: whether to attempt to refresh credentials. Ignored if not
1868 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001869 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001870 raise NotImplementedError()
1871
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001873 """Best effort check that uploading isn't supposed to fail for predictable
1874 reasons.
1875
1876 This method should raise informative exception if uploading shouldn't
1877 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001878
1879 Arguments:
1880 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001881 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001882 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001883
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001884 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001885 """Uploads a change to codereview."""
1886 raise NotImplementedError()
1887
Ravi Mistry31e7d562018-04-02 12:53:57 -04001888 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1889 """Sets labels on the change based on the provided flags.
1890
1891 Issue must have been already uploaded and known.
1892 """
1893 raise NotImplementedError()
1894
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001895 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001897
1898 Issue must have been already uploaded and known.
1899 """
1900 raise NotImplementedError()
1901
tandriie113dfd2016-10-11 10:20:12 -07001902 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001903 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001904 raise NotImplementedError()
1905
tandriide281ae2016-10-12 06:02:30 -07001906 def GetIssueOwner(self):
1907 raise NotImplementedError()
1908
Edward Lemur707d70b2018-02-07 00:50:14 +01001909 def GetReviewers(self):
1910 raise NotImplementedError()
1911
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001912 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001913 raise NotImplementedError()
1914
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
1916class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001917
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001918 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919 super(_RietveldChangelistImpl, self).__init__(changelist)
1920 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001921 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001922 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001924 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001925 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001926 self._props = None
1927 self._rpc_server = None
1928
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929 def GetCodereviewServer(self):
1930 if not self._rietveld_server:
1931 # If we're on a branch then get the server potentially associated
1932 # with that branch.
1933 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001934 self._rietveld_server = gclient_utils.UpgradeToHttps(
1935 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 if not self._rietveld_server:
1937 self._rietveld_server = settings.GetDefaultServerUrl()
1938 return self._rietveld_server
1939
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001940 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001941 """Best effort check that user is authenticated with Rietveld server."""
1942 if self._auth_config.use_oauth2:
1943 authenticator = auth.get_authenticator_for_host(
1944 self.GetCodereviewServer(), self._auth_config)
1945 if not authenticator.has_cached_credentials():
1946 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001947 if refresh:
1948 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001949
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001950 def EnsureCanUploadPatchset(self, force):
1951 # No checks for Rietveld because we are deprecating Rietveld.
1952 pass
1953
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001954 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001955 issue = self.GetIssue()
1956 assert issue
1957 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001958 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959 except urllib2.HTTPError as e:
1960 if e.code == 404:
1961 DieWithError(
1962 ('\nWhile fetching the description for issue %d, received a '
1963 '404 (not found)\n'
1964 'error. It is likely that you deleted this '
1965 'issue on the server. If this is the\n'
1966 'case, please run\n\n'
1967 ' git cl issue 0\n\n'
1968 'to clear the association with the deleted issue. Then run '
1969 'this command again.') % issue)
1970 else:
1971 DieWithError(
1972 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1973 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001974 print('Warning: Failed to retrieve CL description due to network '
1975 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001976 return ''
1977
1978 def GetMostRecentPatchset(self):
1979 return self.GetIssueProperties()['patchsets'][-1]
1980
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001981 def GetIssueProperties(self):
1982 if self._props is None:
1983 issue = self.GetIssue()
1984 if not issue:
1985 self._props = {}
1986 else:
1987 self._props = self.RpcServer().get_issue_properties(issue, True)
1988 return self._props
1989
tandriie113dfd2016-10-11 10:20:12 -07001990 def CannotTriggerTryJobReason(self):
1991 props = self.GetIssueProperties()
1992 if not props:
1993 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1994 if props.get('closed'):
1995 return 'CL %s is closed' % self.GetIssue()
1996 if props.get('private'):
1997 return 'CL %s is private' % self.GetIssue()
1998 return None
1999
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002000 def GetTryJobProperties(self, patchset=None):
2001 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07002002 project = (self.GetIssueProperties() or {}).get('project')
2003 return {
2004 'issue': self.GetIssue(),
2005 'patch_project': project,
2006 'patch_storage': 'rietveld',
2007 'patchset': patchset or self.GetPatchset(),
2008 'rietveld': self.GetCodereviewServer(),
2009 }
2010
tandriide281ae2016-10-12 06:02:30 -07002011 def GetIssueOwner(self):
2012 return (self.GetIssueProperties() or {}).get('owner_email')
2013
Edward Lemur707d70b2018-02-07 00:50:14 +01002014 def GetReviewers(self):
2015 return (self.GetIssueProperties() or {}).get('reviewers')
2016
Aaron Gable636b13f2017-07-14 10:42:48 -07002017 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018 return self.RpcServer().add_comment(self.GetIssue(), message)
2019
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002020 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002021 summary = []
2022 for message in self.GetIssueProperties().get('messages', []):
2023 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2024 summary.append(_CommentSummary(
2025 date=date,
2026 disapproval=bool(message['disapproval']),
2027 approval=bool(message['approval']),
2028 sender=message['sender'],
2029 message=message['text'],
2030 ))
2031 return summary
2032
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002033 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002034 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002035 or CQ status, assuming adherence to a common workflow.
2036
2037 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002038 * 'error' - error from review tool (including deleted issues)
2039 * 'unsent' - not sent for review
2040 * 'waiting' - waiting for review
2041 * 'reply' - waiting for owner to reply to review
2042 * 'not lgtm' - Code-Review label has been set negatively
2043 * 'lgtm' - LGTM from at least one approved reviewer
2044 * 'commit' - in the commit queue
2045 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002046 """
2047 if not self.GetIssue():
2048 return None
2049
2050 try:
2051 props = self.GetIssueProperties()
2052 except urllib2.HTTPError:
2053 return 'error'
2054
2055 if props.get('closed'):
2056 # Issue is closed.
2057 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002058 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002059 # Issue is in the commit queue.
2060 return 'commit'
2061
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002062 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002063 if not messages:
2064 # No message was sent.
2065 return 'unsent'
2066
2067 if get_approving_reviewers(props):
2068 return 'lgtm'
2069 elif get_approving_reviewers(props, disapproval=True):
2070 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002071
tandrii9d2c7a32016-06-22 03:42:45 -07002072 # Skip CQ messages that don't require owner's action.
2073 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2074 if 'Dry run:' in messages[-1]['text']:
2075 messages.pop()
2076 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2077 # This message always follows prior messages from CQ,
2078 # so skip this too.
2079 messages.pop()
2080 else:
2081 # This is probably a CQ messages warranting user attention.
2082 break
2083
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002084 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002085 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002086 return 'reply'
2087 return 'waiting'
2088
dsansomee2d6fd92016-09-08 00:10:47 -07002089 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002090 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002091
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002092 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002093 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002094
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002095 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002096 return self.SetFlags({flag: value})
2097
2098 def SetFlags(self, flags):
2099 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002100 """
phajdan.jr68598232016-08-10 03:28:28 -07002101 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002102 try:
tandrii4b233bd2016-07-06 03:50:29 -07002103 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002104 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002105 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002106 if e.code == 404:
2107 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2108 if e.code == 403:
2109 DieWithError(
2110 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002111 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002112 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002113
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002114 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002115 """Returns an upload.RpcServer() to access this review's rietveld instance.
2116 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002117 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002118 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002119 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002120 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002121 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002122
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002123 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002124 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002125 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002126
tandrii5d48c322016-08-18 16:19:37 -07002127 @classmethod
2128 def PatchsetConfigKey(cls):
2129 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002130
tandrii5d48c322016-08-18 16:19:37 -07002131 @classmethod
2132 def CodereviewServerConfigKey(cls):
2133 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002134
Ravi Mistry31e7d562018-04-02 12:53:57 -04002135 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2136 raise NotImplementedError()
2137
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002138 def SetCQState(self, new_state):
2139 props = self.GetIssueProperties()
2140 if props.get('private'):
2141 DieWithError('Cannot set-commit on private issue')
2142
2143 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002144 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002145 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002146 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002147 else:
tandrii4b233bd2016-07-06 03:50:29 -07002148 assert new_state == _CQState.DRY_RUN
2149 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002150
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002152 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002153 # PatchIssue should never be called with a dirty tree. It is up to the
2154 # caller to check this, but just in case we assert here since the
2155 # consequences of the caller not checking this could be dire.
2156 assert(not git_common.is_dirty_git_tree('apply'))
2157 assert(parsed_issue_arg.valid)
2158 self._changelist.issue = parsed_issue_arg.issue
2159 if parsed_issue_arg.hostname:
2160 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2161
skobes6468b902016-10-24 08:45:10 -07002162 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2163 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2164 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 try:
skobes6468b902016-10-24 08:45:10 -07002166 scm_obj.apply_patch(patchset_object)
2167 except Exception as e:
2168 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 return 1
2170
2171 # If we had an issue, commit the current state and register the issue.
2172 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002173 self.SetIssue(self.GetIssue())
2174 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002175 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2176 'patch from issue %(i)s at patchset '
2177 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2178 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002179 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002181 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002182 return 0
2183
2184 @staticmethod
2185 def ParseIssueURL(parsed_url):
2186 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2187 return None
wychen3c1c1722016-08-04 11:46:36 -07002188 # Rietveld patch: https://domain/<number>/#ps<patchset>
2189 match = re.match(r'/(\d+)/$', parsed_url.path)
2190 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2191 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002192 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002193 issue=int(match.group(1)),
2194 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002195 hostname=parsed_url.netloc,
2196 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 # Typical url: https://domain/<issue_number>[/[other]]
2198 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2199 if match:
skobes6468b902016-10-24 08:45:10 -07002200 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002202 hostname=parsed_url.netloc,
2203 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002204 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2205 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2206 if match:
skobes6468b902016-10-24 08:45:10 -07002207 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002208 issue=int(match.group(1)),
2209 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002210 hostname=parsed_url.netloc,
2211 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002212 return None
2213
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002214 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002215 """Upload the patch to Rietveld."""
2216 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2217 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2219 if options.emulate_svn_auto_props:
2220 upload_args.append('--emulate_svn_auto_props')
2221
2222 change_desc = None
2223
2224 if options.email is not None:
2225 upload_args.extend(['--email', options.email])
2226
2227 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002228 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002229 upload_args.extend(['--title', options.title])
2230 if options.message:
2231 upload_args.extend(['--message', options.message])
2232 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002233 print('This branch is associated with issue %s. '
2234 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002235 else:
nodirca166002016-06-27 10:59:51 -07002236 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002238 if options.message:
2239 message = options.message
2240 else:
2241 message = CreateDescriptionFromLog(args)
2242 if options.title:
2243 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002244 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002245 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002246 change_desc.update_reviewers(options.reviewers, options.tbrs,
2247 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002248 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002249 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002250
2251 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002252 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002253 return 1
2254
2255 upload_args.extend(['--message', change_desc.description])
2256 if change_desc.get_reviewers():
2257 upload_args.append('--reviewers=%s' % ','.join(
2258 change_desc.get_reviewers()))
2259 if options.send_mail:
2260 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002261 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002262 upload_args.append('--send_mail')
2263
2264 # We check this before applying rietveld.private assuming that in
2265 # rietveld.cc only addresses which we can send private CLs to are listed
2266 # if rietveld.private is set, and so we should ignore rietveld.cc only
2267 # when --private is specified explicitly on the command line.
2268 if options.private:
2269 logging.warn('rietveld.cc is ignored since private flag is specified. '
2270 'You need to review and add them manually if necessary.')
2271 cc = self.GetCCListWithoutDefault()
2272 else:
2273 cc = self.GetCCList()
2274 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002275 if change_desc.get_cced():
2276 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002277 if cc:
2278 upload_args.extend(['--cc', cc])
2279
2280 if options.private or settings.GetDefaultPrivateFlag() == "True":
2281 upload_args.append('--private')
2282
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 # Include the upstream repo's URL in the change -- this is useful for
2284 # projects that have their source spread across multiple repos.
2285 remote_url = self.GetGitBaseUrlFromConfig()
2286 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002287 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2288 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2289 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002292 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 if target_ref:
2294 upload_args.extend(['--target_ref', target_ref])
2295
2296 # Look for dependent patchsets. See crbug.com/480453 for more details.
2297 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2298 upstream_branch = ShortBranchName(upstream_branch)
2299 if remote is '.':
2300 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002301 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002303 print()
2304 print('Skipping dependency patchset upload because git config '
2305 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2306 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 else:
2308 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002309 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 auth_config=auth_config)
2311 branch_cl_issue_url = branch_cl.GetIssueURL()
2312 branch_cl_issue = branch_cl.GetIssue()
2313 branch_cl_patchset = branch_cl.GetPatchset()
2314 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2315 upload_args.extend(
2316 ['--depends_on_patchset', '%s:%s' % (
2317 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002318 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002319 '\n'
2320 'The current branch (%s) is tracking a local branch (%s) with '
2321 'an associated CL.\n'
2322 'Adding %s/#ps%s as a dependency patchset.\n'
2323 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2324 branch_cl_patchset))
2325
2326 project = settings.GetProject()
2327 if project:
2328 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002329 else:
2330 print()
2331 print('WARNING: Uploading without a project specified. Please ensure '
2332 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2333 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002334
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002335 try:
2336 upload_args = ['upload'] + upload_args + args
2337 logging.info('upload.RealMain(%s)', upload_args)
2338 issue, patchset = upload.RealMain(upload_args)
2339 issue = int(issue)
2340 patchset = int(patchset)
2341 except KeyboardInterrupt:
2342 sys.exit(1)
2343 except:
2344 # If we got an exception after the user typed a description for their
2345 # change, back up the description before re-raising.
2346 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002347 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002348 raise
2349
2350 if not self.GetIssue():
2351 self.SetIssue(issue)
2352 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002353 return 0
2354
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002355
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002356class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002357 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002358 # auth_config is Rietveld thing, kept here to preserve interface only.
2359 super(_GerritChangelistImpl, self).__init__(changelist)
2360 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002361 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002362 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002363 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002364 # Map from change number (issue) to its detail cache.
2365 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002366
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002367 if codereview_host is not None:
2368 assert not codereview_host.startswith('https://'), codereview_host
2369 self._gerrit_host = codereview_host
2370 self._gerrit_server = 'https://%s' % codereview_host
2371
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002372 def _GetGerritHost(self):
2373 # Lazy load of configs.
2374 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002375 if self._gerrit_host and '.' not in self._gerrit_host:
2376 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2377 # This happens for internal stuff http://crbug.com/614312.
2378 parsed = urlparse.urlparse(self.GetRemoteUrl())
2379 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002380 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002381 ' Your current remote is: %s' % self.GetRemoteUrl())
2382 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2383 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002384 return self._gerrit_host
2385
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002386 def _GetGitHost(self):
2387 """Returns git host to be used when uploading change to Gerrit."""
2388 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2389
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002390 def GetCodereviewServer(self):
2391 if not self._gerrit_server:
2392 # If we're on a branch then get the server potentially associated
2393 # with that branch.
2394 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002395 self._gerrit_server = self._GitGetBranchConfigValue(
2396 self.CodereviewServerConfigKey())
2397 if self._gerrit_server:
2398 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002399 if not self._gerrit_server:
2400 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2401 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002402 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002403 parts[0] = parts[0] + '-review'
2404 self._gerrit_host = '.'.join(parts)
2405 self._gerrit_server = 'https://%s' % self._gerrit_host
2406 return self._gerrit_server
2407
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002408 def _GetGerritProject(self, remote_url=None):
2409 """Returns Gerrit project name based on remote git URL."""
2410 if remote_url is None:
2411 remote_url = self.GetRemoteUrl()
2412 project = urlparse.urlparse(remote_url).path.strip('/')
2413 if project.endswith('.git'):
2414 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002415 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2416 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2417 # gitiles/git-over-https protocol. E.g.,
2418 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2419 # as
2420 # https://chromium.googlesource.com/v8/v8
2421 if project.startswith('a/'):
2422 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002423 return project
2424
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002425 def _GerritChangeIdentifier(self):
2426 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2427
2428 Not to be confused by value of "Change-Id:" footer.
2429 """
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002430 return gerrit_util.ChangeIdentifier(
2431 self._GetGerritProject(), self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002432
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002433 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002434 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002435 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002436
tandrii5d48c322016-08-18 16:19:37 -07002437 @classmethod
2438 def PatchsetConfigKey(cls):
2439 return 'gerritpatchset'
2440
2441 @classmethod
2442 def CodereviewServerConfigKey(cls):
2443 return 'gerritserver'
2444
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002445 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002446 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002447 if settings.GetGerritSkipEnsureAuthenticated():
2448 # For projects with unusual authentication schemes.
2449 # See http://crbug.com/603378.
2450 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002451 # Lazy-loader to identify Gerrit and Git hosts.
2452 if gerrit_util.GceAuthenticator.is_gce():
2453 return
2454 self.GetCodereviewServer()
2455 git_host = self._GetGitHost()
2456 assert self._gerrit_server and self._gerrit_host
2457 cookie_auth = gerrit_util.CookiesAuthenticator()
2458
2459 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2460 git_auth = cookie_auth.get_auth_header(git_host)
2461 if gerrit_auth and git_auth:
2462 if gerrit_auth == git_auth:
2463 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002464 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002465 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002466 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002467 ' %s\n'
2468 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002469 ' Consider running the following command:\n'
2470 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002471 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002472 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002473 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002474 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002475 cookie_auth.get_new_password_message(git_host)))
2476 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002477 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002478 return
2479 else:
2480 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002481 ([] if gerrit_auth else [self._gerrit_host]) +
2482 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002483 DieWithError('Credentials for the following hosts are required:\n'
2484 ' %s\n'
2485 'These are read from %s (or legacy %s)\n'
2486 '%s' % (
2487 '\n '.join(missing),
2488 cookie_auth.get_gitcookies_path(),
2489 cookie_auth.get_netrc_path(),
2490 cookie_auth.get_new_password_message(git_host)))
2491
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002492 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002493 if not self.GetIssue():
2494 return
2495
2496 # Warm change details cache now to avoid RPCs later, reducing latency for
2497 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002498 self._GetChangeDetail(
2499 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002500
2501 status = self._GetChangeDetail()['status']
2502 if status in ('MERGED', 'ABANDONED'):
2503 DieWithError('Change %s has been %s, new uploads are not allowed' %
2504 (self.GetIssueURL(),
2505 'submitted' if status == 'MERGED' else 'abandoned'))
2506
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002507 if gerrit_util.GceAuthenticator.is_gce():
2508 return
2509 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2510 self._GetGerritHost())
2511 if self.GetIssueOwner() == cookies_user:
2512 return
2513 logging.debug('change %s owner is %s, cookies user is %s',
2514 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002515 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002516 # so ask what Gerrit thinks of this user.
2517 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2518 if details['email'] == self.GetIssueOwner():
2519 return
2520 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002521 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002522 'as %s.\n'
2523 'Uploading may fail due to lack of permissions.' %
2524 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2525 confirm_or_exit(action='upload')
2526
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002527 def _PostUnsetIssueProperties(self):
2528 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002529 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002530
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002531 def GetGerritObjForPresubmit(self):
2532 return presubmit_support.GerritAccessor(self._GetGerritHost())
2533
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002534 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002535 """Apply a rough heuristic to give a simple summary of an issue's review
2536 or CQ status, assuming adherence to a common workflow.
2537
2538 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002539 * 'error' - error from review tool (including deleted issues)
2540 * 'unsent' - no reviewers added
2541 * 'waiting' - waiting for review
2542 * 'reply' - waiting for uploader to reply to review
2543 * 'lgtm' - Code-Review label has been set
2544 * 'commit' - in the commit queue
2545 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002546 """
2547 if not self.GetIssue():
2548 return None
2549
2550 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002551 data = self._GetChangeDetail([
2552 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002553 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 return 'error'
2555
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002556 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002557 return 'closed'
2558
Aaron Gable9ab38c62017-04-06 14:36:33 -07002559 if data['labels'].get('Commit-Queue', {}).get('approved'):
2560 # The section will have an "approved" subsection if anyone has voted
2561 # the maximum value on the label.
2562 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002563
Aaron Gable9ab38c62017-04-06 14:36:33 -07002564 if data['labels'].get('Code-Review', {}).get('approved'):
2565 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002566
2567 if not data.get('reviewers', {}).get('REVIEWER', []):
2568 return 'unsent'
2569
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002570 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002571 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2572 last_message_author = messages.pop().get('author', {})
2573 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002574 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2575 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002576 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002577 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002578 if last_message_author.get('_account_id') == owner:
2579 # Most recent message was by owner.
2580 return 'waiting'
2581 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002582 # Some reply from non-owner.
2583 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002584
2585 # Somehow there are no messages even though there are reviewers.
2586 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002587
2588 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002589 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002590 patchset = data['revisions'][data['current_revision']]['_number']
2591 self.SetPatchset(patchset)
2592 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002593
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002594 def FetchDescription(self, force=False):
2595 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2596 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002597 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002598 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002599
dsansomee2d6fd92016-09-08 00:10:47 -07002600 def UpdateDescriptionRemote(self, description, force=False):
2601 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2602 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002603 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002604 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002605 'unpublished edit. Either publish the edit in the Gerrit web UI '
2606 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002607
2608 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2609 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002610 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002611 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002612
Aaron Gable636b13f2017-07-14 10:42:48 -07002613 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002614 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002615 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002616
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002617 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002618 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002619 messages = self._GetChangeDetail(
2620 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2621 file_comments = gerrit_util.GetChangeComments(
2622 self._GetGerritHost(), self.GetIssue())
2623
2624 # Build dictionary of file comments for easy access and sorting later.
2625 # {author+date: {path: {patchset: {line: url+message}}}}
2626 comments = collections.defaultdict(
2627 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2628 for path, line_comments in file_comments.iteritems():
2629 for comment in line_comments:
2630 if comment.get('tag', '').startswith('autogenerated'):
2631 continue
2632 key = (comment['author']['email'], comment['updated'])
2633 if comment.get('side', 'REVISION') == 'PARENT':
2634 patchset = 'Base'
2635 else:
2636 patchset = 'PS%d' % comment['patch_set']
2637 line = comment.get('line', 0)
2638 url = ('https://%s/c/%s/%s/%s#%s%s' %
2639 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2640 'b' if comment.get('side') == 'PARENT' else '',
2641 str(line) if line else ''))
2642 comments[key][path][patchset][line] = (url, comment['message'])
2643
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002644 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002645 for msg in messages:
2646 # Don't bother showing autogenerated messages.
2647 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2648 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002649 # Gerrit spits out nanoseconds.
2650 assert len(msg['date'].split('.')[-1]) == 9
2651 date = datetime.datetime.strptime(msg['date'][:-3],
2652 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002653 message = msg['message']
2654 key = (msg['author']['email'], msg['date'])
2655 if key in comments:
2656 message += '\n'
2657 for path, patchsets in sorted(comments.get(key, {}).items()):
2658 if readable:
2659 message += '\n%s' % path
2660 for patchset, lines in sorted(patchsets.items()):
2661 for line, (url, content) in sorted(lines.items()):
2662 if line:
2663 line_str = 'Line %d' % line
2664 path_str = '%s:%d:' % (path, line)
2665 else:
2666 line_str = 'File comment'
2667 path_str = '%s:0:' % path
2668 if readable:
2669 message += '\n %s, %s: %s' % (patchset, line_str, url)
2670 message += '\n %s\n' % content
2671 else:
2672 message += '\n%s ' % path_str
2673 message += '\n%s\n' % content
2674
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002675 summary.append(_CommentSummary(
2676 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002677 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002678 sender=msg['author']['email'],
2679 # These could be inferred from the text messages and correlated with
2680 # Code-Review label maximum, however this is not reliable.
2681 # Leaving as is until the need arises.
2682 approval=False,
2683 disapproval=False,
2684 ))
2685 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002686
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002687 def CloseIssue(self):
2688 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2689
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002690 def SubmitIssue(self, wait_for_merge=True):
2691 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2692 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002693
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002694 def _GetChangeDetail(self, options=None, no_cache=False):
2695 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002696
2697 If fresh data is needed, set no_cache=True which will clear cache and
2698 thus new data will be fetched from Gerrit.
2699 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002700 options = options or []
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002701 issue = self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002702 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002703
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002704 # Optimization to avoid multiple RPCs:
2705 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2706 'CURRENT_COMMIT' not in options):
2707 options.append('CURRENT_COMMIT')
2708
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002709 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002710 issue = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002711 options = [o.upper() for o in options]
2712
2713 # Check in cache first unless no_cache is True.
2714 if no_cache:
2715 self._detail_cache.pop(issue, None)
2716 else:
2717 options_set = frozenset(options)
2718 for cached_options_set, data in self._detail_cache.get(issue, []):
2719 # Assumption: data fetched before with extra options is suitable
2720 # for return for a smaller set of options.
2721 # For example, if we cached data for
2722 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2723 # and request is for options=[CURRENT_REVISION],
2724 # THEN we can return prior cached data.
2725 if options_set.issubset(cached_options_set):
2726 return data
2727
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002728 try:
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002729 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), issue, options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002730 except gerrit_util.GerritError as e:
2731 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002732 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002733 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002734
2735 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002736 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002737
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002738 def _GetChangeCommit(self):
2739 issue = self.GetIssue()
agable32978d92016-11-01 12:55:02 -07002740 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002741 try:
2742 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2743 except gerrit_util.GerritError as e:
2744 if e.http_status == 404:
2745 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2746 raise
agable32978d92016-11-01 12:55:02 -07002747 return data
2748
Olivier Robin75ee7252018-04-13 10:02:56 +02002749 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002750 if git_common.is_dirty_git_tree('land'):
2751 return 1
tandriid60367b2016-06-22 05:25:12 -07002752 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2753 if u'Commit-Queue' in detail.get('labels', {}):
2754 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002755 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2756 'which can test and land changes for you. '
2757 'Are you sure you wish to bypass it?\n',
2758 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002759
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002760 differs = True
tandriic4344b52016-08-29 06:04:54 -07002761 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002762 # Note: git diff outputs nothing if there is no diff.
2763 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002764 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002765 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002766 if detail['current_revision'] == last_upload:
2767 differs = False
2768 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002769 print('WARNING: Local branch contents differ from latest uploaded '
2770 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002771 if differs:
2772 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002773 confirm_or_exit(
2774 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2775 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002776 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002777 elif not bypass_hooks:
2778 hook_results = self.RunHook(
2779 committing=True,
2780 may_prompt=not force,
2781 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002782 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2783 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002784 if not hook_results.should_continue():
2785 return 1
2786
2787 self.SubmitIssue(wait_for_merge=True)
2788 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002789 links = self._GetChangeCommit().get('web_links', [])
2790 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002791 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002792 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002793 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002794 return 0
2795
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002796 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002797 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002798 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002799 assert not directory
2800 assert parsed_issue_arg.valid
2801
2802 self._changelist.issue = parsed_issue_arg.issue
2803
2804 if parsed_issue_arg.hostname:
2805 self._gerrit_host = parsed_issue_arg.hostname
2806 self._gerrit_server = 'https://%s' % self._gerrit_host
2807
tandriic2405f52016-10-10 08:13:15 -07002808 try:
2809 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002810 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002811 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002812
2813 if not parsed_issue_arg.patchset:
2814 # Use current revision by default.
2815 revision_info = detail['revisions'][detail['current_revision']]
2816 patchset = int(revision_info['_number'])
2817 else:
2818 patchset = parsed_issue_arg.patchset
2819 for revision_info in detail['revisions'].itervalues():
2820 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2821 break
2822 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002823 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002824 (parsed_issue_arg.patchset, self.GetIssue()))
2825
Aaron Gable697a91b2018-01-19 15:20:15 -08002826 remote_url = self._changelist.GetRemoteUrl()
2827 if remote_url.endswith('.git'):
2828 remote_url = remote_url[:-len('.git')]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002829 fetch_info = revision_info['fetch']['http']
Aaron Gable697a91b2018-01-19 15:20:15 -08002830
2831 if remote_url != fetch_info['url']:
2832 DieWithError('Trying to patch a change from %s but this repo appears '
2833 'to be %s.' % (fetch_info['url'], remote_url))
2834
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002835 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002836
Aaron Gable62619a32017-06-16 08:22:09 -07002837 if force:
2838 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2839 print('Checked out commit for change %i patchset %i locally' %
2840 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002841 elif nocommit:
2842 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2843 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002844 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002845 RunGit(['cherry-pick', 'FETCH_HEAD'])
2846 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002847 (parsed_issue_arg.issue, patchset))
2848 print('Note: this created a local commit which does not have '
2849 'the same hash as the one uploaded for review. This will make '
2850 'uploading changes based on top of this branch difficult.\n'
2851 'If you want to do that, use "git cl patch --force" instead.')
2852
Stefan Zagerd08043c2017-10-12 12:07:02 -07002853 if self.GetBranch():
2854 self.SetIssue(parsed_issue_arg.issue)
2855 self.SetPatchset(patchset)
2856 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2857 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2858 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2859 else:
2860 print('WARNING: You are in detached HEAD state.\n'
2861 'The patch has been applied to your checkout, but you will not be '
2862 'able to upload a new patch set to the gerrit issue.\n'
2863 'Try using the \'-b\' option if you would like to work on a '
2864 'branch and/or upload a new patch set.')
2865
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002866 return 0
2867
2868 @staticmethod
2869 def ParseIssueURL(parsed_url):
2870 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2871 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002872 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2873 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002874 # Short urls like https://domain/<issue_number> can be used, but don't allow
2875 # specifying the patchset (you'd 404), but we allow that here.
2876 if parsed_url.path == '/':
2877 part = parsed_url.fragment
2878 else:
2879 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002880 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002881 if match:
2882 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002883 issue=int(match.group(3)),
2884 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002885 hostname=parsed_url.netloc,
2886 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002887 return None
2888
tandrii16e0b4e2016-06-07 10:34:28 -07002889 def _GerritCommitMsgHookCheck(self, offer_removal):
2890 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2891 if not os.path.exists(hook):
2892 return
2893 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2894 # custom developer made one.
2895 data = gclient_utils.FileRead(hook)
2896 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2897 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002898 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002899 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002900 'and may interfere with it in subtle ways.\n'
2901 'We recommend you remove the commit-msg hook.')
2902 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002903 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002904 gclient_utils.rm_file_or_tree(hook)
2905 print('Gerrit commit-msg hook removed.')
2906 else:
2907 print('OK, will keep Gerrit commit-msg hook in place.')
2908
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002909 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002910 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002911 if options.squash and options.no_squash:
2912 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002913
2914 if not options.squash and not options.no_squash:
2915 # Load default for user, repo, squash=true, in this order.
2916 options.squash = settings.GetSquashGerritUploads()
2917 elif options.no_squash:
2918 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002919
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002920 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002921 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002922
Aaron Gableb56ad332017-01-06 15:24:31 -08002923 # This may be None; default fallback value is determined in logic below.
2924 title = options.title
2925
Dominic Battre7d1c4842017-10-27 09:17:28 +02002926 # Extract bug number from branch name.
2927 bug = options.bug
2928 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2929 if not bug and match:
2930 bug = match.group(1)
2931
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002932 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002933 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002934 if self.GetIssue():
2935 # Try to get the message from a previous upload.
2936 message = self.GetDescription()
2937 if not message:
2938 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002939 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002940 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002941 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002942 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002943 # When uploading a subsequent patchset, -m|--message is taken
2944 # as the patchset title if --title was not provided.
2945 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002946 else:
2947 default_title = RunGit(
2948 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002949 if options.force:
2950 title = default_title
2951 else:
2952 title = ask_for_data(
2953 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002954 change_id = self._GetChangeDetail()['change_id']
2955 while True:
2956 footer_change_ids = git_footers.get_footer_change_id(message)
2957 if footer_change_ids == [change_id]:
2958 break
2959 if not footer_change_ids:
2960 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002961 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002962 continue
2963 # There is already a valid footer but with different or several ids.
2964 # Doing this automatically is non-trivial as we don't want to lose
2965 # existing other footers, yet we want to append just 1 desired
2966 # Change-Id. Thus, just create a new footer, but let user verify the
2967 # new description.
2968 message = '%s\n\nChange-Id: %s' % (message, change_id)
2969 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002970 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002971 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002972 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002973 'Please, check the proposed correction to the description, '
2974 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2975 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2976 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002977 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002978 if not options.force:
2979 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002980 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002981 message = change_desc.description
2982 if not message:
2983 DieWithError("Description is empty. Aborting...")
2984 # Continue the while loop.
2985 # Sanity check of this code - we should end up with proper message
2986 # footer.
2987 assert [change_id] == git_footers.get_footer_change_id(message)
2988 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002989 else: # if not self.GetIssue()
2990 if options.message:
2991 message = options.message
2992 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002993 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002994 if options.title:
2995 message = options.title + '\n\n' + message
2996 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002997
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002999 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08003000 # On first upload, patchset title is always this string, while
3001 # --title flag gets converted to first line of message.
3002 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003003 if not change_desc.description:
3004 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02003005 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006 if len(change_ids) > 1:
3007 DieWithError('too many Change-Id footers, at most 1 allowed.')
3008 if not change_ids:
3009 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02003010 change_desc.set_description(git_footers.add_footer_change_id(
3011 change_desc.description,
3012 GenerateGerritChangeId(change_desc.description)))
3013 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003014 assert len(change_ids) == 1
3015 change_id = change_ids[0]
3016
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003017 if options.reviewers or options.tbrs or options.add_owners_to:
3018 change_desc.update_reviewers(options.reviewers, options.tbrs,
3019 options.add_owners_to, change)
3020
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003021 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003022 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3023 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003024 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07003025 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
3026 desc_tempfile.write(change_desc.description)
3027 desc_tempfile.close()
3028 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
3029 '-F', desc_tempfile.name]).strip()
3030 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003031 else:
3032 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003033 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003034 if not change_desc.description:
3035 DieWithError("Description is empty. Aborting...")
3036
3037 if not git_footers.get_footer_change_id(change_desc.description):
3038 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003039 change_desc.set_description(
3040 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003041 if options.reviewers or options.tbrs or options.add_owners_to:
3042 change_desc.update_reviewers(options.reviewers, options.tbrs,
3043 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003044 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003045 # For no-squash mode, we assume the remote called "origin" is the one we
3046 # want. It is not worthwhile to support different workflows for
3047 # no-squash mode.
3048 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003049 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3050
3051 assert change_desc
3052 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3053 ref_to_push)]).splitlines()
3054 if len(commits) > 1:
3055 print('WARNING: This will upload %d commits. Run the following command '
3056 'to see which commits will be uploaded: ' % len(commits))
3057 print('git log %s..%s' % (parent, ref_to_push))
3058 print('You can also use `git squash-branch` to squash these into a '
3059 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003060 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003061
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003062 if options.reviewers or options.tbrs or options.add_owners_to:
3063 change_desc.update_reviewers(options.reviewers, options.tbrs,
3064 options.add_owners_to, change)
3065
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003066 # Extra options that can be specified at push time. Doc:
3067 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003068 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003069
Aaron Gable844cf292017-06-28 11:32:59 -07003070 # By default, new changes are started in WIP mode, and subsequent patchsets
3071 # don't send email. At any time, passing --send-mail will mark the change
3072 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003073 if options.send_mail:
3074 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003075 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04003076 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003077 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07003078 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003079 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003080
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003081 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003082 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003083
Aaron Gable9b713dd2016-12-14 16:04:21 -08003084 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003085 # Punctuation and whitespace in |title| must be percent-encoded.
3086 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003087
agablec6787972016-09-09 16:13:34 -07003088 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003089 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003090
rmistry9eadede2016-09-19 11:22:43 -07003091 if options.topic:
3092 # Documentation on Gerrit topics is here:
3093 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003094 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003095
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003096 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08003097 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003098 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08003099 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003100 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
3101
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003102 refspec_suffix = ''
3103 if refspec_opts:
3104 refspec_suffix = '%' + ','.join(refspec_opts)
3105 assert ' ' not in refspec_suffix, (
3106 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3107 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3108
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003109 try:
3110 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003111 ['git', 'push', self.GetRemoteUrl(), refspec],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003112 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003113 # Flush after every line: useful for seeing progress when running as
3114 # recipe.
3115 filter_fn=lambda _: sys.stdout.flush())
3116 except subprocess2.CalledProcessError:
3117 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003118 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003119 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003120 'credential problems:\n'
3121 ' git cl creds-check\n',
3122 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003123
3124 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003125 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003126 change_numbers = [m.group(1)
3127 for m in map(regex.match, push_stdout.splitlines())
3128 if m]
3129 if len(change_numbers) != 1:
3130 DieWithError(
3131 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003132 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003133 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003134 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003135
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003136 reviewers = sorted(change_desc.get_reviewers())
3137
tandrii88189772016-09-29 04:29:57 -07003138 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003139 if not options.private:
3140 cc = self.GetCCList().split(',')
3141 else:
3142 cc = []
tandrii88189772016-09-29 04:29:57 -07003143 if options.cc:
3144 cc.extend(options.cc)
3145 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003146 if change_desc.get_cced():
3147 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003148
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003149 if self.GetIssue():
3150 # GetIssue() is not set in case of non-squash uploads according to tests.
3151 # TODO(agable): non-squash uploads in git cl should be removed.
3152 gerrit_util.AddReviewers(
3153 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003154 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003155 reviewers, cc,
3156 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003157
Aaron Gablefd238082017-06-07 13:42:34 -07003158 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003159 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3160 score = 1
3161 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3162 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3163 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003164 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003165 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003166 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003167 msg='Self-approving for TBR',
3168 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003169
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003170 return 0
3171
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003172 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3173 change_desc):
3174 """Computes parent of the generated commit to be uploaded to Gerrit.
3175
3176 Returns revision or a ref name.
3177 """
3178 if custom_cl_base:
3179 # Try to avoid creating additional unintended CLs when uploading, unless
3180 # user wants to take this risk.
3181 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3182 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3183 local_ref_of_target_remote])
3184 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003185 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003186 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3187 'If you proceed with upload, more than 1 CL may be created by '
3188 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3189 'If you are certain that specified base `%s` has already been '
3190 'uploaded to Gerrit as another CL, you may proceed.\n' %
3191 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3192 if not force:
3193 confirm_or_exit(
3194 'Do you take responsibility for cleaning up potential mess '
3195 'resulting from proceeding with upload?',
3196 action='upload')
3197 return custom_cl_base
3198
Aaron Gablef97e33d2017-03-30 15:44:27 -07003199 if remote != '.':
3200 return self.GetCommonAncestorWithUpstream()
3201
3202 # If our upstream branch is local, we base our squashed commit on its
3203 # squashed version.
3204 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3205
Aaron Gablef97e33d2017-03-30 15:44:27 -07003206 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003207 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003208
3209 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003210 # TODO(tandrii): consider checking parent change in Gerrit and using its
3211 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3212 # the tree hash of the parent branch. The upside is less likely bogus
3213 # requests to reupload parent change just because it's uploadhash is
3214 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003215 parent = RunGit(['config',
3216 'branch.%s.gerritsquashhash' % upstream_branch_name],
3217 error_ok=True).strip()
3218 # Verify that the upstream branch has been uploaded too, otherwise
3219 # Gerrit will create additional CLs when uploading.
3220 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3221 RunGitSilent(['rev-parse', parent + ':'])):
3222 DieWithError(
3223 '\nUpload upstream branch %s first.\n'
3224 'It is likely that this branch has been rebased since its last '
3225 'upload, so you just need to upload it again.\n'
3226 '(If you uploaded it with --no-squash, then branch dependencies '
3227 'are not supported, and you should reupload with --squash.)'
3228 % upstream_branch_name,
3229 change_desc)
3230 return parent
3231
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003232 def _AddChangeIdToCommitMessage(self, options, args):
3233 """Re-commits using the current message, assumes the commit hook is in
3234 place.
3235 """
3236 log_desc = options.message or CreateDescriptionFromLog(args)
3237 git_command = ['commit', '--amend', '-m', log_desc]
3238 RunGit(git_command)
3239 new_log_desc = CreateDescriptionFromLog(args)
3240 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003241 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003242 return new_log_desc
3243 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003244 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003245
Ravi Mistry31e7d562018-04-02 12:53:57 -04003246 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3247 """Sets labels on the change based on the provided flags."""
3248 labels = {}
3249 notify = None;
3250 if enable_auto_submit:
3251 labels['Auto-Submit'] = 1
3252 if use_commit_queue:
3253 labels['Commit-Queue'] = 2
3254 elif cq_dry_run:
3255 labels['Commit-Queue'] = 1
3256 notify = False
3257 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003258 gerrit_util.SetReview(
3259 self._GetGerritHost(),
3260 self._GerritChangeIdentifier(),
3261 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003262
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003263 def SetCQState(self, new_state):
3264 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003265 vote_map = {
3266 _CQState.NONE: 0,
3267 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003268 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003269 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003270 labels = {'Commit-Queue': vote_map[new_state]}
3271 notify = False if new_state == _CQState.DRY_RUN else None
3272 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3273 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003274
tandriie113dfd2016-10-11 10:20:12 -07003275 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003276 try:
3277 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003278 except GerritChangeNotExists:
3279 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003280
3281 if data['status'] in ('ABANDONED', 'MERGED'):
3282 return 'CL %s is closed' % self.GetIssue()
3283
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003284 def GetTryJobProperties(self, patchset=None):
3285 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003286 data = self._GetChangeDetail(['ALL_REVISIONS'])
3287 patchset = int(patchset or self.GetPatchset())
3288 assert patchset
3289 revision_data = None # Pylint wants it to be defined.
3290 for revision_data in data['revisions'].itervalues():
3291 if int(revision_data['_number']) == patchset:
3292 break
3293 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003294 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003295 (patchset, self.GetIssue()))
3296 return {
3297 'patch_issue': self.GetIssue(),
3298 'patch_set': patchset or self.GetPatchset(),
3299 'patch_project': data['project'],
3300 'patch_storage': 'gerrit',
3301 'patch_ref': revision_data['fetch']['http']['ref'],
3302 'patch_repository_url': revision_data['fetch']['http']['url'],
3303 'patch_gerrit_url': self.GetCodereviewServer(),
3304 }
tandriie113dfd2016-10-11 10:20:12 -07003305
tandriide281ae2016-10-12 06:02:30 -07003306 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003307 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003308
Edward Lemur707d70b2018-02-07 00:50:14 +01003309 def GetReviewers(self):
3310 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3311 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3312
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003313
3314_CODEREVIEW_IMPLEMENTATIONS = {
3315 'rietveld': _RietveldChangelistImpl,
3316 'gerrit': _GerritChangelistImpl,
3317}
3318
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003319
iannuccie53c9352016-08-17 14:40:40 -07003320def _add_codereview_issue_select_options(parser, extra=""):
3321 _add_codereview_select_options(parser)
3322
3323 text = ('Operate on this issue number instead of the current branch\'s '
3324 'implicit issue.')
3325 if extra:
3326 text += ' '+extra
3327 parser.add_option('-i', '--issue', type=int, help=text)
3328
3329
3330def _process_codereview_issue_select_options(parser, options):
3331 _process_codereview_select_options(parser, options)
3332 if options.issue is not None and not options.forced_codereview:
3333 parser.error('--issue must be specified with either --rietveld or --gerrit')
3334
3335
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003336def _add_codereview_select_options(parser):
3337 """Appends --gerrit and --rietveld options to force specific codereview."""
3338 parser.codereview_group = optparse.OptionGroup(
3339 parser, 'EXPERIMENTAL! Codereview override options')
3340 parser.add_option_group(parser.codereview_group)
3341 parser.codereview_group.add_option(
3342 '--gerrit', action='store_true',
3343 help='Force the use of Gerrit for codereview')
3344 parser.codereview_group.add_option(
3345 '--rietveld', action='store_true',
3346 help='Force the use of Rietveld for codereview')
3347
3348
3349def _process_codereview_select_options(parser, options):
3350 if options.gerrit and options.rietveld:
3351 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3352 options.forced_codereview = None
3353 if options.gerrit:
3354 options.forced_codereview = 'gerrit'
3355 elif options.rietveld:
3356 options.forced_codereview = 'rietveld'
3357
3358
tandriif9aefb72016-07-01 09:06:51 -07003359def _get_bug_line_values(default_project, bugs):
3360 """Given default_project and comma separated list of bugs, yields bug line
3361 values.
3362
3363 Each bug can be either:
3364 * a number, which is combined with default_project
3365 * string, which is left as is.
3366
3367 This function may produce more than one line, because bugdroid expects one
3368 project per line.
3369
3370 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3371 ['v8:123', 'chromium:789']
3372 """
3373 default_bugs = []
3374 others = []
3375 for bug in bugs.split(','):
3376 bug = bug.strip()
3377 if bug:
3378 try:
3379 default_bugs.append(int(bug))
3380 except ValueError:
3381 others.append(bug)
3382
3383 if default_bugs:
3384 default_bugs = ','.join(map(str, default_bugs))
3385 if default_project:
3386 yield '%s:%s' % (default_project, default_bugs)
3387 else:
3388 yield default_bugs
3389 for other in sorted(others):
3390 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3391 yield other
3392
3393
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003394class ChangeDescription(object):
3395 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003396 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003397 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003398 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003399 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003400 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3401 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3402 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3403 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003404
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003405 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003406 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003407
agable@chromium.org42c20792013-09-12 17:34:49 +00003408 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003409 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003410 return '\n'.join(self._description_lines)
3411
3412 def set_description(self, desc):
3413 if isinstance(desc, basestring):
3414 lines = desc.splitlines()
3415 else:
3416 lines = [line.rstrip() for line in desc]
3417 while lines and not lines[0]:
3418 lines.pop(0)
3419 while lines and not lines[-1]:
3420 lines.pop(-1)
3421 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003422
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003423 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3424 """Rewrites the R=/TBR= line(s) as a single line each.
3425
3426 Args:
3427 reviewers (list(str)) - list of additional emails to use for reviewers.
3428 tbrs (list(str)) - list of additional emails to use for TBRs.
3429 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3430 the change that are missing OWNER coverage. If this is not None, you
3431 must also pass a value for `change`.
3432 change (Change) - The Change that should be used for OWNERS lookups.
3433 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003434 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003435 assert isinstance(tbrs, list), tbrs
3436
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003437 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003438 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003439
3440 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003441 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003442
3443 reviewers = set(reviewers)
3444 tbrs = set(tbrs)
3445 LOOKUP = {
3446 'TBR': tbrs,
3447 'R': reviewers,
3448 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003449
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003450 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003451 regexp = re.compile(self.R_LINE)
3452 matches = [regexp.match(line) for line in self._description_lines]
3453 new_desc = [l for i, l in enumerate(self._description_lines)
3454 if not matches[i]]
3455 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003456
agable@chromium.org42c20792013-09-12 17:34:49 +00003457 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003458
3459 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003460 for match in matches:
3461 if not match:
3462 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003463 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3464
3465 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003466 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003467 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003468 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003469 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003470 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003471 LOOKUP[add_owners_to].update(
3472 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003473
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003474 # If any folks ended up in both groups, remove them from tbrs.
3475 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003476
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003477 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3478 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003479
3480 # Put the new lines in the description where the old first R= line was.
3481 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3482 if 0 <= line_loc < len(self._description_lines):
3483 if new_tbr_line:
3484 self._description_lines.insert(line_loc, new_tbr_line)
3485 if new_r_line:
3486 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003487 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003488 if new_r_line:
3489 self.append_footer(new_r_line)
3490 if new_tbr_line:
3491 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003492
Aaron Gable3a16ed12017-03-23 10:51:55 -07003493 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003494 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003495 self.set_description([
3496 '# Enter a description of the change.',
3497 '# This will be displayed on the codereview site.',
3498 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003499 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003500 '--------------------',
3501 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003502
agable@chromium.org42c20792013-09-12 17:34:49 +00003503 regexp = re.compile(self.BUG_LINE)
3504 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003505 prefix = settings.GetBugPrefix()
3506 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003507 if git_footer:
3508 self.append_footer('Bug: %s' % ', '.join(values))
3509 else:
3510 for value in values:
3511 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003512
agable@chromium.org42c20792013-09-12 17:34:49 +00003513 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003514 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003515 if not content:
3516 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003517 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003518
Bruce Dawson2377b012018-01-11 16:46:49 -08003519 # Strip off comments and default inserted "Bug:" line.
3520 clean_lines = [line.rstrip() for line in lines if not
3521 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003522 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003523 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003524 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003525
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003526 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003527 """Adds a footer line to the description.
3528
3529 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3530 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3531 that Gerrit footers are always at the end.
3532 """
3533 parsed_footer_line = git_footers.parse_footer(line)
3534 if parsed_footer_line:
3535 # Line is a gerrit footer in the form: Footer-Key: any value.
3536 # Thus, must be appended observing Gerrit footer rules.
3537 self.set_description(
3538 git_footers.add_footer(self.description,
3539 key=parsed_footer_line[0],
3540 value=parsed_footer_line[1]))
3541 return
3542
3543 if not self._description_lines:
3544 self._description_lines.append(line)
3545 return
3546
3547 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3548 if gerrit_footers:
3549 # git_footers.split_footers ensures that there is an empty line before
3550 # actual (gerrit) footers, if any. We have to keep it that way.
3551 assert top_lines and top_lines[-1] == ''
3552 top_lines, separator = top_lines[:-1], top_lines[-1:]
3553 else:
3554 separator = [] # No need for separator if there are no gerrit_footers.
3555
3556 prev_line = top_lines[-1] if top_lines else ''
3557 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3558 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3559 top_lines.append('')
3560 top_lines.append(line)
3561 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003562
tandrii99a72f22016-08-17 14:33:24 -07003563 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003564 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003565 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003566 reviewers = [match.group(2).strip()
3567 for match in matches
3568 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003569 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003570
bradnelsond975b302016-10-23 12:20:23 -07003571 def get_cced(self):
3572 """Retrieves the list of reviewers."""
3573 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3574 cced = [match.group(2).strip() for match in matches if match]
3575 return cleanup_list(cced)
3576
Nodir Turakulov23b82142017-11-16 11:04:25 -08003577 def get_hash_tags(self):
3578 """Extracts and sanitizes a list of Gerrit hashtags."""
3579 subject = (self._description_lines or ('',))[0]
3580 subject = re.sub(
3581 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3582
3583 tags = []
3584 start = 0
3585 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3586 while True:
3587 m = bracket_exp.match(subject, start)
3588 if not m:
3589 break
3590 tags.append(self.sanitize_hash_tag(m.group(1)))
3591 start = m.end()
3592
3593 if not tags:
3594 # Try "Tag: " prefix.
3595 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3596 if m:
3597 tags.append(self.sanitize_hash_tag(m.group(1)))
3598 return tags
3599
3600 @classmethod
3601 def sanitize_hash_tag(cls, tag):
3602 """Returns a sanitized Gerrit hash tag.
3603
3604 A sanitized hashtag can be used as a git push refspec parameter value.
3605 """
3606 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3607
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003608 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3609 """Updates this commit description given the parent.
3610
3611 This is essentially what Gnumbd used to do.
3612 Consult https://goo.gl/WMmpDe for more details.
3613 """
3614 assert parent_msg # No, orphan branch creation isn't supported.
3615 assert parent_hash
3616 assert dest_ref
3617 parent_footer_map = git_footers.parse_footers(parent_msg)
3618 # This will also happily parse svn-position, which GnumbD is no longer
3619 # supporting. While we'd generate correct footers, the verifier plugin
3620 # installed in Gerrit will block such commit (ie git push below will fail).
3621 parent_position = git_footers.get_position(parent_footer_map)
3622
3623 # Cherry-picks may have last line obscuring their prior footers,
3624 # from git_footers perspective. This is also what Gnumbd did.
3625 cp_line = None
3626 if (self._description_lines and
3627 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3628 cp_line = self._description_lines.pop()
3629
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003630 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003631
3632 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3633 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003634 for i, line in enumerate(footer_lines):
3635 k, v = git_footers.parse_footer(line) or (None, None)
3636 if k and k.startswith('Cr-'):
3637 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003638
3639 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003640 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003641 if parent_position[0] == dest_ref:
3642 # Same branch as parent.
3643 number = int(parent_position[1]) + 1
3644 else:
3645 number = 1 # New branch, and extra lineage.
3646 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3647 int(parent_position[1])))
3648
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003649 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3650 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003651
3652 self._description_lines = top_lines
3653 if cp_line:
3654 self._description_lines.append(cp_line)
3655 if self._description_lines[-1] != '':
3656 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003657 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003658
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003659
Aaron Gablea1bab272017-04-11 16:38:18 -07003660def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003661 """Retrieves the reviewers that approved a CL from the issue properties with
3662 messages.
3663
3664 Note that the list may contain reviewers that are not committer, thus are not
3665 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003666
3667 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003668 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003669 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003670 return sorted(
3671 set(
3672 message['sender']
3673 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003674 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003675 )
3676 )
3677
3678
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003679def FindCodereviewSettingsFile(filename='codereview.settings'):
3680 """Finds the given file starting in the cwd and going up.
3681
3682 Only looks up to the top of the repository unless an
3683 'inherit-review-settings-ok' file exists in the root of the repository.
3684 """
3685 inherit_ok_file = 'inherit-review-settings-ok'
3686 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003687 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003688 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3689 root = '/'
3690 while True:
3691 if filename in os.listdir(cwd):
3692 if os.path.isfile(os.path.join(cwd, filename)):
3693 return open(os.path.join(cwd, filename))
3694 if cwd == root:
3695 break
3696 cwd = os.path.dirname(cwd)
3697
3698
3699def LoadCodereviewSettingsFromFile(fileobj):
3700 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003701 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003702
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003703 def SetProperty(name, setting, unset_error_ok=False):
3704 fullname = 'rietveld.' + name
3705 if setting in keyvals:
3706 RunGit(['config', fullname, keyvals[setting]])
3707 else:
3708 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3709
tandrii48df5812016-10-17 03:55:37 -07003710 if not keyvals.get('GERRIT_HOST', False):
3711 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003712 # Only server setting is required. Other settings can be absent.
3713 # In that case, we ignore errors raised during option deletion attempt.
3714 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003715 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003716 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3717 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003718 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003719 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3720 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003721 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003722 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3723 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003724
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003725 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003726 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003727
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003728 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003729 RunGit(['config', 'gerrit.squash-uploads',
3730 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003731
tandrii@chromium.org28253532016-04-14 13:46:56 +00003732 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003733 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003734 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3735
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003736 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003737 # should be of the form
3738 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3739 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003740 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3741 keyvals['ORIGIN_URL_CONFIG']])
3742
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003743
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003744def urlretrieve(source, destination):
3745 """urllib is broken for SSL connections via a proxy therefore we
3746 can't use urllib.urlretrieve()."""
3747 with open(destination, 'w') as f:
3748 f.write(urllib2.urlopen(source).read())
3749
3750
ukai@chromium.org712d6102013-11-27 00:52:58 +00003751def hasSheBang(fname):
3752 """Checks fname is a #! script."""
3753 with open(fname) as f:
3754 return f.read(2).startswith('#!')
3755
3756
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003757# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3758def DownloadHooks(*args, **kwargs):
3759 pass
3760
3761
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003762def DownloadGerritHook(force):
3763 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003764
3765 Args:
3766 force: True to update hooks. False to install hooks if not present.
3767 """
3768 if not settings.GetIsGerrit():
3769 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003770 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003771 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3772 if not os.access(dst, os.X_OK):
3773 if os.path.exists(dst):
3774 if not force:
3775 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003776 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003777 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003778 if not hasSheBang(dst):
3779 DieWithError('Not a script: %s\n'
3780 'You need to download from\n%s\n'
3781 'into .git/hooks/commit-msg and '
3782 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003783 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3784 except Exception:
3785 if os.path.exists(dst):
3786 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003787 DieWithError('\nFailed to download hooks.\n'
3788 'You need to download from\n%s\n'
3789 'into .git/hooks/commit-msg and '
3790 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003791
3792
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003793def GetRietveldCodereviewSettingsInteractively():
3794 """Prompt the user for settings."""
3795 server = settings.GetDefaultServerUrl(error_ok=True)
3796 prompt = 'Rietveld server (host[:port])'
3797 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3798 newserver = ask_for_data(prompt + ':')
3799 if not server and not newserver:
3800 newserver = DEFAULT_SERVER
3801 if newserver:
3802 newserver = gclient_utils.UpgradeToHttps(newserver)
3803 if newserver != server:
3804 RunGit(['config', 'rietveld.server', newserver])
3805
3806 def SetProperty(initial, caption, name, is_url):
3807 prompt = caption
3808 if initial:
3809 prompt += ' ("x" to clear) [%s]' % initial
3810 new_val = ask_for_data(prompt + ':')
3811 if new_val == 'x':
3812 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3813 elif new_val:
3814 if is_url:
3815 new_val = gclient_utils.UpgradeToHttps(new_val)
3816 if new_val != initial:
3817 RunGit(['config', 'rietveld.' + name, new_val])
3818
3819 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3820 SetProperty(settings.GetDefaultPrivateFlag(),
3821 'Private flag (rietveld only)', 'private', False)
3822 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3823 'tree-status-url', False)
3824 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3825 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3826 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3827 'run-post-upload-hook', False)
3828
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003829
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003830class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003831 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003832
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003833 _GOOGLESOURCE = 'googlesource.com'
3834
3835 def __init__(self):
3836 # Cached list of [host, identity, source], where source is either
3837 # .gitcookies or .netrc.
3838 self._all_hosts = None
3839
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003840 def ensure_configured_gitcookies(self):
3841 """Runs checks and suggests fixes to make git use .gitcookies from default
3842 path."""
3843 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3844 configured_path = RunGitSilent(
3845 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003846 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003847 if configured_path:
3848 self._ensure_default_gitcookies_path(configured_path, default)
3849 else:
3850 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003851
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003852 @staticmethod
3853 def _ensure_default_gitcookies_path(configured_path, default_path):
3854 assert configured_path
3855 if configured_path == default_path:
3856 print('git is already configured to use your .gitcookies from %s' %
3857 configured_path)
3858 return
3859
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003860 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003861 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3862 (configured_path, default_path))
3863
3864 if not os.path.exists(configured_path):
3865 print('However, your configured .gitcookies file is missing.')
3866 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3867 action='reconfigure')
3868 RunGit(['config', '--global', 'http.cookiefile', default_path])
3869 return
3870
3871 if os.path.exists(default_path):
3872 print('WARNING: default .gitcookies file already exists %s' %
3873 default_path)
3874 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3875 default_path)
3876
3877 confirm_or_exit('Move existing .gitcookies to default location?',
3878 action='move')
3879 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003880 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003881 print('Moved and reconfigured git to use .gitcookies from %s' %
3882 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003883
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003884 @staticmethod
3885 def _configure_gitcookies_path(default_path):
3886 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3887 if os.path.exists(netrc_path):
3888 print('You seem to be using outdated .netrc for git credentials: %s' %
3889 netrc_path)
3890 print('This tool will guide you through setting up recommended '
3891 '.gitcookies store for git credentials.\n'
3892 '\n'
3893 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3894 ' git config --global --unset http.cookiefile\n'
3895 ' mv %s %s.backup\n\n' % (default_path, default_path))
3896 confirm_or_exit(action='setup .gitcookies')
3897 RunGit(['config', '--global', 'http.cookiefile', default_path])
3898 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003899
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003900 def get_hosts_with_creds(self, include_netrc=False):
3901 if self._all_hosts is None:
3902 a = gerrit_util.CookiesAuthenticator()
3903 self._all_hosts = [
3904 (h, u, s)
3905 for h, u, s in itertools.chain(
3906 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3907 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3908 )
3909 if h.endswith(self._GOOGLESOURCE)
3910 ]
3911
3912 if include_netrc:
3913 return self._all_hosts
3914 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3915
3916 def print_current_creds(self, include_netrc=False):
3917 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3918 if not hosts:
3919 print('No Git/Gerrit credentials found')
3920 return
3921 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3922 header = [('Host', 'User', 'Which file'),
3923 ['=' * l for l in lengths]]
3924 for row in (header + hosts):
3925 print('\t'.join((('%%+%ds' % l) % s)
3926 for l, s in zip(lengths, row)))
3927
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003928 @staticmethod
3929 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003930 """Parses identity "git-<username>.domain" into <username> and domain."""
3931 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003932 # distinguishable from sub-domains. But we do know typical domains:
3933 if identity.endswith('.chromium.org'):
3934 domain = 'chromium.org'
3935 username = identity[:-len('.chromium.org')]
3936 else:
3937 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003938 if username.startswith('git-'):
3939 username = username[len('git-'):]
3940 return username, domain
3941
3942 def _get_usernames_of_domain(self, domain):
3943 """Returns list of usernames referenced by .gitcookies in a given domain."""
3944 identities_by_domain = {}
3945 for _, identity, _ in self.get_hosts_with_creds():
3946 username, domain = self._parse_identity(identity)
3947 identities_by_domain.setdefault(domain, []).append(username)
3948 return identities_by_domain.get(domain)
3949
3950 def _canonical_git_googlesource_host(self, host):
3951 """Normalizes Gerrit hosts (with '-review') to Git host."""
3952 assert host.endswith(self._GOOGLESOURCE)
3953 # Prefix doesn't include '.' at the end.
3954 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3955 if prefix.endswith('-review'):
3956 prefix = prefix[:-len('-review')]
3957 return prefix + '.' + self._GOOGLESOURCE
3958
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003959 def _canonical_gerrit_googlesource_host(self, host):
3960 git_host = self._canonical_git_googlesource_host(host)
3961 prefix = git_host.split('.', 1)[0]
3962 return prefix + '-review.' + self._GOOGLESOURCE
3963
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003964 def _get_counterpart_host(self, host):
3965 assert host.endswith(self._GOOGLESOURCE)
3966 git = self._canonical_git_googlesource_host(host)
3967 gerrit = self._canonical_gerrit_googlesource_host(git)
3968 return git if gerrit == host else gerrit
3969
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003970 def has_generic_host(self):
3971 """Returns whether generic .googlesource.com has been configured.
3972
3973 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3974 """
3975 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3976 if host == '.' + self._GOOGLESOURCE:
3977 return True
3978 return False
3979
3980 def _get_git_gerrit_identity_pairs(self):
3981 """Returns map from canonic host to pair of identities (Git, Gerrit).
3982
3983 One of identities might be None, meaning not configured.
3984 """
3985 host_to_identity_pairs = {}
3986 for host, identity, _ in self.get_hosts_with_creds():
3987 canonical = self._canonical_git_googlesource_host(host)
3988 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3989 idx = 0 if canonical == host else 1
3990 pair[idx] = identity
3991 return host_to_identity_pairs
3992
3993 def get_partially_configured_hosts(self):
3994 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003995 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3996 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3997 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003998
3999 def get_conflicting_hosts(self):
4000 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004001 host
4002 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004003 if None not in (i1, i2) and i1 != i2)
4004
4005 def get_duplicated_hosts(self):
4006 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
4007 return set(host for host, count in counters.iteritems() if count > 1)
4008
4009 _EXPECTED_HOST_IDENTITY_DOMAINS = {
4010 'chromium.googlesource.com': 'chromium.org',
4011 'chrome-internal.googlesource.com': 'google.com',
4012 }
4013
4014 def get_hosts_with_wrong_identities(self):
4015 """Finds hosts which **likely** reference wrong identities.
4016
4017 Note: skips hosts which have conflicting identities for Git and Gerrit.
4018 """
4019 hosts = set()
4020 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
4021 pair = self._get_git_gerrit_identity_pairs().get(host)
4022 if pair and pair[0] == pair[1]:
4023 _, domain = self._parse_identity(pair[0])
4024 if domain != expected:
4025 hosts.add(host)
4026 return hosts
4027
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004028 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004029 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004030 hosts = sorted(hosts)
4031 assert hosts
4032 if extra_column_func is None:
4033 extras = [''] * len(hosts)
4034 else:
4035 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004036 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
4037 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004038 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004039 lines.append(tmpl % he)
4040 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004041
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004042 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004043 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004044 yield ('.googlesource.com wildcard record detected',
4045 ['Chrome Infrastructure team recommends to list full host names '
4046 'explicitly.'],
4047 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004048
4049 dups = self.get_duplicated_hosts()
4050 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004051 yield ('The following hosts were defined twice',
4052 self._format_hosts(dups),
4053 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004054
4055 partial = self.get_partially_configured_hosts()
4056 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004057 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
4058 'These hosts are missing',
4059 self._format_hosts(partial, lambda host: 'but %s defined' %
4060 self._get_counterpart_host(host)),
4061 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004062
4063 conflicting = self.get_conflicting_hosts()
4064 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004065 yield ('The following Git hosts have differing credentials from their '
4066 'Gerrit counterparts',
4067 self._format_hosts(conflicting, lambda host: '%s vs %s' %
4068 tuple(self._get_git_gerrit_identity_pairs()[host])),
4069 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004070
4071 wrong = self.get_hosts_with_wrong_identities()
4072 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004073 yield ('These hosts likely use wrong identity',
4074 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
4075 (self._get_git_gerrit_identity_pairs()[host][0],
4076 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
4077 wrong)
4078
4079 def find_and_report_problems(self):
4080 """Returns True if there was at least one problem, else False."""
4081 found = False
4082 bad_hosts = set()
4083 for title, sublines, hosts in self._find_problems():
4084 if not found:
4085 found = True
4086 print('\n\n.gitcookies problem report:\n')
4087 bad_hosts.update(hosts or [])
4088 print(' %s%s' % (title , (':' if sublines else '')))
4089 if sublines:
4090 print()
4091 print(' %s' % '\n '.join(sublines))
4092 print()
4093
4094 if bad_hosts:
4095 assert found
4096 print(' You can manually remove corresponding lines in your %s file and '
4097 'visit the following URLs with correct account to generate '
4098 'correct credential lines:\n' %
4099 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4100 print(' %s' % '\n '.join(sorted(set(
4101 gerrit_util.CookiesAuthenticator().get_new_password_url(
4102 self._canonical_git_googlesource_host(host))
4103 for host in bad_hosts
4104 ))))
4105 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004106
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004107
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004108@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004109def CMDcreds_check(parser, args):
4110 """Checks credentials and suggests changes."""
4111 _, _ = parser.parse_args(args)
4112
4113 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004114 DieWithError(
4115 'This command is not designed for GCE, are you on a bot?\n'
4116 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004117
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004118 checker = _GitCookiesChecker()
4119 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004120
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004121 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004122 checker.print_current_creds(include_netrc=True)
4123
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004124 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004125 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004126 return 0
4127 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004128
4129
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004130@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004131@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004132def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004133 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004134
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004135 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004136 # TODO(tandrii): remove this once we switch to Gerrit.
4137 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004138 parser.add_option('--activate-update', action='store_true',
4139 help='activate auto-updating [rietveld] section in '
4140 '.git/config')
4141 parser.add_option('--deactivate-update', action='store_true',
4142 help='deactivate auto-updating [rietveld] section in '
4143 '.git/config')
4144 options, args = parser.parse_args(args)
4145
4146 if options.deactivate_update:
4147 RunGit(['config', 'rietveld.autoupdate', 'false'])
4148 return
4149
4150 if options.activate_update:
4151 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4152 return
4153
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004154 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004155 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004156 return 0
4157
4158 url = args[0]
4159 if not url.endswith('codereview.settings'):
4160 url = os.path.join(url, 'codereview.settings')
4161
4162 # Load code review settings and download hooks (if available).
4163 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4164 return 0
4165
4166
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004167@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004168def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004169 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004170 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4171 branch = ShortBranchName(branchref)
4172 _, args = parser.parse_args(args)
4173 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004174 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004175 return RunGit(['config', 'branch.%s.base-url' % branch],
4176 error_ok=False).strip()
4177 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004178 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004179 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4180 error_ok=False).strip()
4181
4182
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004183def color_for_status(status):
4184 """Maps a Changelist status to color, for CMDstatus and other tools."""
4185 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004186 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004187 'waiting': Fore.BLUE,
4188 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004189 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004190 'lgtm': Fore.GREEN,
4191 'commit': Fore.MAGENTA,
4192 'closed': Fore.CYAN,
4193 'error': Fore.WHITE,
4194 }.get(status, Fore.WHITE)
4195
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004196
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004197def get_cl_statuses(changes, fine_grained, max_processes=None):
4198 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004199
4200 If fine_grained is true, this will fetch CL statuses from the server.
4201 Otherwise, simply indicate if there's a matching url for the given branches.
4202
4203 If max_processes is specified, it is used as the maximum number of processes
4204 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4205 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004206
4207 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004208 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004209 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004210 upload.verbosity = 0
4211
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004212 if not changes:
4213 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004214
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004215 if not fine_grained:
4216 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004217 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004218 for cl in changes:
4219 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004220 return
4221
4222 # First, sort out authentication issues.
4223 logging.debug('ensuring credentials exist')
4224 for cl in changes:
4225 cl.EnsureAuthenticated(force=False, refresh=True)
4226
4227 def fetch(cl):
4228 try:
4229 return (cl, cl.GetStatus())
4230 except:
4231 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004232 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004233 raise
4234
4235 threads_count = len(changes)
4236 if max_processes:
4237 threads_count = max(1, min(threads_count, max_processes))
4238 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4239
4240 pool = ThreadPool(threads_count)
4241 fetched_cls = set()
4242 try:
4243 it = pool.imap_unordered(fetch, changes).__iter__()
4244 while True:
4245 try:
4246 cl, status = it.next(timeout=5)
4247 except multiprocessing.TimeoutError:
4248 break
4249 fetched_cls.add(cl)
4250 yield cl, status
4251 finally:
4252 pool.close()
4253
4254 # Add any branches that failed to fetch.
4255 for cl in set(changes) - fetched_cls:
4256 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004257
rmistry@google.com2dd99862015-06-22 12:22:18 +00004258
4259def upload_branch_deps(cl, args):
4260 """Uploads CLs of local branches that are dependents of the current branch.
4261
4262 If the local branch dependency tree looks like:
4263 test1 -> test2.1 -> test3.1
4264 -> test3.2
4265 -> test2.2 -> test3.3
4266
4267 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4268 run on the dependent branches in this order:
4269 test2.1, test3.1, test3.2, test2.2, test3.3
4270
4271 Note: This function does not rebase your local dependent branches. Use it when
4272 you make a change to the parent branch that will not conflict with its
4273 dependent branches, and you would like their dependencies updated in
4274 Rietveld.
4275 """
4276 if git_common.is_dirty_git_tree('upload-branch-deps'):
4277 return 1
4278
4279 root_branch = cl.GetBranch()
4280 if root_branch is None:
4281 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4282 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004283 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004284 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4285 'patchset dependencies without an uploaded CL.')
4286
4287 branches = RunGit(['for-each-ref',
4288 '--format=%(refname:short) %(upstream:short)',
4289 'refs/heads'])
4290 if not branches:
4291 print('No local branches found.')
4292 return 0
4293
4294 # Create a dictionary of all local branches to the branches that are dependent
4295 # on it.
4296 tracked_to_dependents = collections.defaultdict(list)
4297 for b in branches.splitlines():
4298 tokens = b.split()
4299 if len(tokens) == 2:
4300 branch_name, tracked = tokens
4301 tracked_to_dependents[tracked].append(branch_name)
4302
vapiera7fbd5a2016-06-16 09:17:49 -07004303 print()
4304 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004305 dependents = []
4306 def traverse_dependents_preorder(branch, padding=''):
4307 dependents_to_process = tracked_to_dependents.get(branch, [])
4308 padding += ' '
4309 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004310 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004311 dependents.append(dependent)
4312 traverse_dependents_preorder(dependent, padding)
4313 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004314 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004315
4316 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004317 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004318 return 0
4319
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004320 confirm_or_exit('This command will checkout all dependent branches and run '
4321 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004322
andybons@chromium.org962f9462016-02-03 20:00:42 +00004323 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004324 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004325 args.extend(['-t', 'Updated patchset dependency'])
4326
rmistry@google.com2dd99862015-06-22 12:22:18 +00004327 # Record all dependents that failed to upload.
4328 failures = {}
4329 # Go through all dependents, checkout the branch and upload.
4330 try:
4331 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004332 print()
4333 print('--------------------------------------')
4334 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004335 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004336 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004337 try:
4338 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004339 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004340 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004341 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004342 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004343 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004344 finally:
4345 # Swap back to the original root branch.
4346 RunGit(['checkout', '-q', root_branch])
4347
vapiera7fbd5a2016-06-16 09:17:49 -07004348 print()
4349 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004350 for dependent_branch in dependents:
4351 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004352 print(' %s : %s' % (dependent_branch, upload_status))
4353 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004354
4355 return 0
4356
4357
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004358@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004359def CMDarchive(parser, args):
4360 """Archives and deletes branches associated with closed changelists."""
4361 parser.add_option(
4362 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004363 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004364 parser.add_option(
4365 '-f', '--force', action='store_true',
4366 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004367 parser.add_option(
4368 '-d', '--dry-run', action='store_true',
4369 help='Skip the branch tagging and removal steps.')
4370 parser.add_option(
4371 '-t', '--notags', action='store_true',
4372 help='Do not tag archived branches. '
4373 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004374
4375 auth.add_auth_options(parser)
4376 options, args = parser.parse_args(args)
4377 if args:
4378 parser.error('Unsupported args: %s' % ' '.join(args))
4379 auth_config = auth.extract_auth_config_from_options(options)
4380
4381 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4382 if not branches:
4383 return 0
4384
vapiera7fbd5a2016-06-16 09:17:49 -07004385 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004386 changes = [Changelist(branchref=b, auth_config=auth_config)
4387 for b in branches.splitlines()]
4388 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4389 statuses = get_cl_statuses(changes,
4390 fine_grained=True,
4391 max_processes=options.maxjobs)
4392 proposal = [(cl.GetBranch(),
4393 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4394 for cl, status in statuses
4395 if status == 'closed']
4396 proposal.sort()
4397
4398 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004399 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004400 return 0
4401
4402 current_branch = GetCurrentBranch()
4403
vapiera7fbd5a2016-06-16 09:17:49 -07004404 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004405 if options.notags:
4406 for next_item in proposal:
4407 print(' ' + next_item[0])
4408 else:
4409 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4410 for next_item in proposal:
4411 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004412
kmarshall9249e012016-08-23 12:02:16 -07004413 # Quit now on precondition failure or if instructed by the user, either
4414 # via an interactive prompt or by command line flags.
4415 if options.dry_run:
4416 print('\nNo changes were made (dry run).\n')
4417 return 0
4418 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004419 print('You are currently on a branch \'%s\' which is associated with a '
4420 'closed codereview issue, so archive cannot proceed. Please '
4421 'checkout another branch and run this command again.' %
4422 current_branch)
4423 return 1
kmarshall9249e012016-08-23 12:02:16 -07004424 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004425 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4426 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004427 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004428 return 1
4429
4430 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004431 if not options.notags:
4432 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004433 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004434
vapiera7fbd5a2016-06-16 09:17:49 -07004435 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004436
4437 return 0
4438
4439
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004440@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004442 """Show status of changelists.
4443
4444 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004445 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004446 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004447 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004448 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004449 - Magenta in the commit queue
4450 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004451 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004452
4453 Also see 'git cl comments'.
4454 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004456 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004457 parser.add_option('-f', '--fast', action='store_true',
4458 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004459 parser.add_option(
4460 '-j', '--maxjobs', action='store', type=int,
4461 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004462
4463 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004464 _add_codereview_issue_select_options(
4465 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004466 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004467 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004468 if args:
4469 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004470 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004471
iannuccie53c9352016-08-17 14:40:40 -07004472 if options.issue is not None and not options.field:
4473 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004474
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004476 cl = Changelist(auth_config=auth_config, issue=options.issue,
4477 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004479 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480 elif options.field == 'id':
4481 issueid = cl.GetIssue()
4482 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004483 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004484 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004485 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004486 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004487 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004488 elif options.field == 'status':
4489 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004490 elif options.field == 'url':
4491 url = cl.GetIssueURL()
4492 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004493 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004494 return 0
4495
4496 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4497 if not branches:
4498 print('No local branch found.')
4499 return 0
4500
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004501 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004502 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004503 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004504 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004505 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004506 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004507 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004508
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004509 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004510 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4511 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4512 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004513 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004514 c, status = output.next()
4515 branch_statuses[c.GetBranch()] = status
4516 status = branch_statuses.pop(branch)
4517 url = cl.GetIssueURL()
4518 if url and (not status or status == 'error'):
4519 # The issue probably doesn't exist anymore.
4520 url += ' (broken)'
4521
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004522 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004523 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004524 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004525 color = ''
4526 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004527 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004528 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004529 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004530 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004531
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004532
4533 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004534 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004535 print('Current branch: %s' % branch)
4536 for cl in changes:
4537 if cl.GetBranch() == branch:
4538 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004539 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004540 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004541 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004542 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004543 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004544 print('Issue description:')
4545 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004546 return 0
4547
4548
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004549def colorize_CMDstatus_doc():
4550 """To be called once in main() to add colors to git cl status help."""
4551 colors = [i for i in dir(Fore) if i[0].isupper()]
4552
4553 def colorize_line(line):
4554 for color in colors:
4555 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004556 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004557 indent = len(line) - len(line.lstrip(' ')) + 1
4558 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4559 return line
4560
4561 lines = CMDstatus.__doc__.splitlines()
4562 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4563
4564
phajdan.jre328cf92016-08-22 04:12:17 -07004565def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004566 if path == '-':
4567 json.dump(contents, sys.stdout)
4568 else:
4569 with open(path, 'w') as f:
4570 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004571
4572
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004573@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004574@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004576 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577
4578 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004579 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004580 parser.add_option('-r', '--reverse', action='store_true',
4581 help='Lookup the branch(es) for the specified issues. If '
4582 'no issues are specified, all branches with mapped '
4583 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004584 parser.add_option('--json',
4585 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004586 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004587 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004588 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004589
dnj@chromium.org406c4402015-03-03 17:22:28 +00004590 if options.reverse:
4591 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004592 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004593 # Reverse issue lookup.
4594 issue_branch_map = {}
4595 for branch in branches:
4596 cl = Changelist(branchref=branch)
4597 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4598 if not args:
4599 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004600 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004601 for issue in args:
4602 if not issue:
4603 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004604 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004605 print('Branch for issue number %s: %s' % (
4606 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004607 if options.json:
4608 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004609 return 0
4610
4611 if len(args) > 0:
4612 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4613 if not issue.valid:
4614 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4615 'or no argument to list it.\n'
4616 'Maybe you want to run git cl status?')
4617 cl = Changelist(codereview=issue.codereview)
4618 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004619 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004620 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004621 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4622 if options.json:
4623 write_json(options.json, {
4624 'issue': cl.GetIssue(),
4625 'issue_url': cl.GetIssueURL(),
4626 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004627 return 0
4628
4629
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004630@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004631def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004632 """Shows or posts review comments for any changelist."""
4633 parser.add_option('-a', '--add-comment', dest='comment',
4634 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004635 parser.add_option('-i', '--issue', dest='issue',
4636 help='review issue id (defaults to current issue). '
4637 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004638 parser.add_option('-m', '--machine-readable', dest='readable',
4639 action='store_false', default=True,
4640 help='output comments in a format compatible with '
4641 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004642 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004643 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004644 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004645 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004646 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004647 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004648 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004649
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004650 issue = None
4651 if options.issue:
4652 try:
4653 issue = int(options.issue)
4654 except ValueError:
4655 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004656 if not options.forced_codereview:
4657 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004658
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004659 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004660 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004661 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004662
4663 if options.comment:
4664 cl.AddComment(options.comment)
4665 return 0
4666
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004667 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4668 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004669 for comment in summary:
4670 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004671 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004672 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004673 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004674 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004675 color = Fore.MAGENTA
4676 else:
4677 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004678 print('\n%s%s %s%s\n%s' % (
4679 color,
4680 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4681 comment.sender,
4682 Fore.RESET,
4683 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4684
smut@google.comc85ac942015-09-15 16:34:43 +00004685 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004686 def pre_serialize(c):
4687 dct = c.__dict__.copy()
4688 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4689 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004690 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004691 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004692 return 0
4693
4694
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004695@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004696@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004697def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004698 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004699 parser.add_option('-d', '--display', action='store_true',
4700 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004701 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004702 help='New description to set for this issue (- for stdin, '
4703 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004704 parser.add_option('-f', '--force', action='store_true',
4705 help='Delete any unpublished Gerrit edits for this issue '
4706 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004707
4708 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004709 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004710 options, args = parser.parse_args(args)
4711 _process_codereview_select_options(parser, options)
4712
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004713 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004714 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004715 target_issue_arg = ParseIssueNumberArgument(args[0],
4716 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004717 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004718 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004719
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004720 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004721
martiniss6eda05f2016-06-30 10:18:35 -07004722 kwargs = {
4723 'auth_config': auth_config,
4724 'codereview': options.forced_codereview,
4725 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004726 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004727 if target_issue_arg:
4728 kwargs['issue'] = target_issue_arg.issue
4729 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004730 if target_issue_arg.codereview and not options.forced_codereview:
4731 detected_codereview_from_url = True
4732 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004733
4734 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004735 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004736 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004737 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004738
4739 if detected_codereview_from_url:
4740 logging.info('canonical issue/change URL: %s (type: %s)\n',
4741 cl.GetIssueURL(), target_issue_arg.codereview)
4742
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004743 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004744
smut@google.com34fb6b12015-07-13 20:03:26 +00004745 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004746 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004747 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004748
4749 if options.new_description:
4750 text = options.new_description
4751 if text == '-':
4752 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004753 elif text == '+':
4754 base_branch = cl.GetCommonAncestorWithUpstream()
4755 change = cl.GetChange(base_branch, None, local_description=True)
4756 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004757
4758 description.set_description(text)
4759 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004760 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004761
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004762 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004763 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004764 return 0
4765
4766
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004767def CreateDescriptionFromLog(args):
4768 """Pulls out the commit log to use as a base for the CL description."""
4769 log_args = []
4770 if len(args) == 1 and not args[0].endswith('.'):
4771 log_args = [args[0] + '..']
4772 elif len(args) == 1 and args[0].endswith('...'):
4773 log_args = [args[0][:-1]]
4774 elif len(args) == 2:
4775 log_args = [args[0] + '..' + args[1]]
4776 else:
4777 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004778 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004779
4780
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004781@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004782def CMDlint(parser, args):
4783 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004784 parser.add_option('--filter', action='append', metavar='-x,+y',
4785 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004786 auth.add_auth_options(parser)
4787 options, args = parser.parse_args(args)
4788 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004789
4790 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004791 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004792 try:
4793 import cpplint
4794 import cpplint_chromium
4795 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004796 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004797 return 1
4798
4799 # Change the current working directory before calling lint so that it
4800 # shows the correct base.
4801 previous_cwd = os.getcwd()
4802 os.chdir(settings.GetRoot())
4803 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004804 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004805 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4806 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004807 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004808 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004809 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004810
4811 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004812 command = args + files
4813 if options.filter:
4814 command = ['--filter=' + ','.join(options.filter)] + command
4815 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004816
4817 white_regex = re.compile(settings.GetLintRegex())
4818 black_regex = re.compile(settings.GetLintIgnoreRegex())
4819 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4820 for filename in filenames:
4821 if white_regex.match(filename):
4822 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004823 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004824 else:
4825 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4826 extra_check_functions)
4827 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004828 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004829 finally:
4830 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004831 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004832 if cpplint._cpplint_state.error_count != 0:
4833 return 1
4834 return 0
4835
4836
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004837@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004838def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004839 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004840 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004841 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004842 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004843 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004844 parser.add_option('--all', action='store_true',
4845 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004846 parser.add_option('--parallel', action='store_true',
4847 help='Run all tests specified by input_api.RunTests in all '
4848 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004849 auth.add_auth_options(parser)
4850 options, args = parser.parse_args(args)
4851 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004852
sbc@chromium.org71437c02015-04-09 19:29:40 +00004853 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004854 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004855 return 1
4856
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004857 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004858 if args:
4859 base_branch = args[0]
4860 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004861 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004862 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004863
Aaron Gable8076c282017-11-29 14:39:41 -08004864 if options.all:
4865 base_change = cl.GetChange(base_branch, None)
4866 files = [('M', f) for f in base_change.AllFiles()]
4867 change = presubmit_support.GitChange(
4868 base_change.Name(),
4869 base_change.FullDescriptionText(),
4870 base_change.RepositoryRoot(),
4871 files,
4872 base_change.issue,
4873 base_change.patchset,
4874 base_change.author_email,
4875 base_change._upstream)
4876 else:
4877 change = cl.GetChange(base_branch, None)
4878
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004879 cl.RunHook(
4880 committing=not options.upload,
4881 may_prompt=False,
4882 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004883 change=change,
4884 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004885 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004886
4887
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004888def GenerateGerritChangeId(message):
4889 """Returns Ixxxxxx...xxx change id.
4890
4891 Works the same way as
4892 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4893 but can be called on demand on all platforms.
4894
4895 The basic idea is to generate git hash of a state of the tree, original commit
4896 message, author/committer info and timestamps.
4897 """
4898 lines = []
4899 tree_hash = RunGitSilent(['write-tree'])
4900 lines.append('tree %s' % tree_hash.strip())
4901 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4902 if code == 0:
4903 lines.append('parent %s' % parent.strip())
4904 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4905 lines.append('author %s' % author.strip())
4906 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4907 lines.append('committer %s' % committer.strip())
4908 lines.append('')
4909 # Note: Gerrit's commit-hook actually cleans message of some lines and
4910 # whitespace. This code is not doing this, but it clearly won't decrease
4911 # entropy.
4912 lines.append(message)
4913 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4914 stdin='\n'.join(lines))
4915 return 'I%s' % change_hash.strip()
4916
4917
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004918def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004919 """Computes the remote branch ref to use for the CL.
4920
4921 Args:
4922 remote (str): The git remote for the CL.
4923 remote_branch (str): The git remote branch for the CL.
4924 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004925 """
4926 if not (remote and remote_branch):
4927 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004928
wittman@chromium.org455dc922015-01-26 20:15:50 +00004929 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004930 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004931 # refs, which are then translated into the remote full symbolic refs
4932 # below.
4933 if '/' not in target_branch:
4934 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4935 else:
4936 prefix_replacements = (
4937 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4938 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4939 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4940 )
4941 match = None
4942 for regex, replacement in prefix_replacements:
4943 match = re.search(regex, target_branch)
4944 if match:
4945 remote_branch = target_branch.replace(match.group(0), replacement)
4946 break
4947 if not match:
4948 # This is a branch path but not one we recognize; use as-is.
4949 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004950 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4951 # Handle the refs that need to land in different refs.
4952 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004953
wittman@chromium.org455dc922015-01-26 20:15:50 +00004954 # Create the true path to the remote branch.
4955 # Does the following translation:
4956 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4957 # * refs/remotes/origin/master -> refs/heads/master
4958 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4959 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4960 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4961 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4962 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4963 'refs/heads/')
4964 elif remote_branch.startswith('refs/remotes/branch-heads'):
4965 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004966
wittman@chromium.org455dc922015-01-26 20:15:50 +00004967 return remote_branch
4968
4969
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004970def cleanup_list(l):
4971 """Fixes a list so that comma separated items are put as individual items.
4972
4973 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4974 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4975 """
4976 items = sum((i.split(',') for i in l), [])
4977 stripped_items = (i.strip() for i in items)
4978 return sorted(filter(None, stripped_items))
4979
4980
Aaron Gable4db38df2017-11-03 14:59:07 -07004981@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004982@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004983def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004984 """Uploads the current changelist to codereview.
4985
4986 Can skip dependency patchset uploads for a branch by running:
4987 git config branch.branch_name.skip-deps-uploads True
4988 To unset run:
4989 git config --unset branch.branch_name.skip-deps-uploads
4990 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004991
4992 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4993 a bug number, this bug number is automatically populated in the CL
4994 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004995
4996 If subject contains text in square brackets or has "<text>: " prefix, such
4997 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4998 [git-cl] add support for hashtags
4999 Foo bar: implement foo
5000 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00005001 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00005002 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5003 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00005004 parser.add_option('--bypass-watchlists', action='store_true',
5005 dest='bypass_watchlists',
5006 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005007 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00005008 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005009 parser.add_option('--message', '-m', dest='message',
5010 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07005011 parser.add_option('-b', '--bug',
5012 help='pre-populate the bug number(s) for this issue. '
5013 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07005014 parser.add_option('--message-file', dest='message_file',
5015 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005016 parser.add_option('--title', '-t', dest='title',
5017 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00005018 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005019 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00005020 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005021 parser.add_option('--tbrs',
5022 action='append', default=[],
5023 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00005024 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005025 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00005026 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005027 parser.add_option('--hashtag', dest='hashtags',
5028 action='append', default=[],
5029 help=('Gerrit hashtag for new CL; '
5030 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00005031 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08005032 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00005033 parser.add_option('--emulate_svn_auto_props',
5034 '--emulate-svn-auto-props',
5035 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00005036 dest="emulate_svn_auto_props",
5037 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00005038 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07005039 help='tell the commit queue to commit this patchset; '
5040 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00005041 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00005042 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00005043 metavar='TARGET',
5044 help='Apply CL to remote ref TARGET. ' +
5045 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00005046 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005047 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00005048 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005049 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07005050 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005051 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07005052 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
5053 const='TBR', help='add a set of OWNERS to TBR')
5054 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
5055 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00005056 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
5057 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00005058 help='Send the patchset to do a CQ dry run right after '
5059 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00005060 parser.add_option('--dependencies', action='store_true',
5061 help='Uploads CLs of all the local branches that depend on '
5062 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04005063 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5064 help='Sends your change to the CQ after an approval. Only '
5065 'works on repos that have the Auto-Submit label '
5066 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04005067 parser.add_option('--parallel', action='store_true',
5068 help='Run all tests specified by input_api.RunTests in all '
5069 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00005070
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005071 # TODO: remove Rietveld flags
5072 parser.add_option('--private', action='store_true',
5073 help='set the review private (rietveld only)')
5074 parser.add_option('--email', default=None,
5075 help='email address to use to connect to Rietveld')
5076
rmistry@google.com2dd99862015-06-22 12:22:18 +00005077 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005078 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005079 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005080 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005081 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005082 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005083
sbc@chromium.org71437c02015-04-09 19:29:40 +00005084 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005085 return 1
5086
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005087 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005088 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005089 options.cc = cleanup_list(options.cc)
5090
tandriib80458a2016-06-23 12:20:07 -07005091 if options.message_file:
5092 if options.message:
5093 parser.error('only one of --message and --message-file allowed.')
5094 options.message = gclient_utils.FileRead(options.message_file)
5095 options.message_file = None
5096
tandrii4d0545a2016-07-06 03:56:49 -07005097 if options.cq_dry_run and options.use_commit_queue:
5098 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5099
Aaron Gableedbc4132017-09-11 13:22:28 -07005100 if options.use_commit_queue:
5101 options.send_mail = True
5102
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005103 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5104 settings.GetIsGerrit()
5105
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005106 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005107 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005108
5109
Francois Dorayd42c6812017-05-30 15:10:20 -04005110@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005111@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005112def CMDsplit(parser, args):
5113 """Splits a branch into smaller branches and uploads CLs.
5114
5115 Creates a branch and uploads a CL for each group of files modified in the
5116 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005117 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005118 the shared OWNERS file.
5119 """
5120 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005121 help="A text file containing a CL description in which "
5122 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005123 parser.add_option("-c", "--comment", dest="comment_file",
5124 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005125 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5126 default=False,
5127 help="List the files and reviewers for each CL that would "
5128 "be created, but don't create branches or CLs.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005129 options, _ = parser.parse_args(args)
5130
5131 if not options.description_file:
5132 parser.error('No --description flag specified.')
5133
5134 def WrappedCMDupload(args):
5135 return CMDupload(OptionParser(), args)
5136
5137 return split_cl.SplitCl(options.description_file, options.comment_file,
Chris Watkinsba28e462017-12-13 11:22:17 +11005138 Changelist, WrappedCMDupload, options.dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005139
5140
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005141@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005142@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005143def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005144 """DEPRECATED: Used to commit the current changelist via git-svn."""
5145 message = ('git-cl no longer supports committing to SVN repositories via '
5146 'git-svn. You probably want to use `git cl land` instead.')
5147 print(message)
5148 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005149
5150
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005151# Two special branches used by git cl land.
5152MERGE_BRANCH = 'git-cl-commit'
5153CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5154
5155
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005156@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005157@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005158def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005159 """Commits the current changelist via git.
5160
5161 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5162 upstream and closes the issue automatically and atomically.
5163
5164 Otherwise (in case of Rietveld):
5165 Squashes branch into a single commit.
5166 Updates commit message with metadata (e.g. pointer to review).
5167 Pushes the code upstream.
5168 Updates review and closes.
5169 """
5170 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5171 help='bypass upload presubmit hook')
5172 parser.add_option('-m', dest='message',
5173 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005174 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005175 help="force yes to questions (don't prompt)")
5176 parser.add_option('-c', dest='contributor',
5177 help="external contributor for patch (appended to " +
5178 "description and used as author for git). Should be " +
5179 "formatted as 'First Last <email@example.com>'")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005180 parser.add_option('--parallel', action='store_true',
5181 help='Run all tests specified by input_api.RunTests in all '
5182 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005183 auth.add_auth_options(parser)
5184 (options, args) = parser.parse_args(args)
5185 auth_config = auth.extract_auth_config_from_options(options)
5186
5187 cl = Changelist(auth_config=auth_config)
5188
Robert Iannucci2e73d432018-03-14 01:10:47 -07005189 if not cl.IsGerrit():
5190 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005191
Robert Iannucci2e73d432018-03-14 01:10:47 -07005192 if options.message:
5193 # This could be implemented, but it requires sending a new patch to
5194 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5195 # Besides, Gerrit has the ability to change the commit message on submit
5196 # automatically, thus there is no need to support this option (so far?).
5197 parser.error('-m MESSAGE option is not supported for Gerrit.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005198 if options.contributor:
Robert Iannucci2e73d432018-03-14 01:10:47 -07005199 parser.error(
5200 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5201 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5202 'the contributor\'s "name <email>". If you can\'t upload such a '
5203 'commit for review, contact your repository admin and request'
5204 '"Forge-Author" permission.')
5205 if not cl.GetIssue():
5206 DieWithError('You must upload the change first to Gerrit.\n'
5207 ' If you would rather have `git cl land` upload '
5208 'automatically for you, see http://crbug.com/642759')
5209 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005210 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005211
5212
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005213def PushToGitWithAutoRebase(remote, branch, original_description,
5214 git_numberer_enabled, max_attempts=3):
5215 """Pushes current HEAD commit on top of remote's branch.
5216
5217 Attempts to fetch and autorebase on push failures.
5218 Adds git number footers on the fly.
5219
5220 Returns integer code from last command.
5221 """
5222 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5223 code = 0
5224 attempts_left = max_attempts
5225 while attempts_left:
5226 attempts_left -= 1
5227 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5228
5229 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5230 # If fetch fails, retry.
5231 print('Fetching %s/%s...' % (remote, branch))
5232 code, out = RunGitWithCode(
5233 ['retry', 'fetch', remote,
5234 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5235 if code:
5236 print('Fetch failed with exit code %d.' % code)
5237 print(out.strip())
5238 continue
5239
5240 print('Cherry-picking commit on top of latest %s' % branch)
5241 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5242 suppress_stderr=True)
5243 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5244 code, out = RunGitWithCode(['cherry-pick', cherry])
5245 if code:
5246 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5247 'the following files have merge conflicts:' %
5248 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005249 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5250 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005251 print('Please rebase your patch and try again.')
5252 RunGitWithCode(['cherry-pick', '--abort'])
5253 break
5254
5255 commit_desc = ChangeDescription(original_description)
5256 if git_numberer_enabled:
5257 logging.debug('Adding git number footers')
5258 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5259 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5260 branch)
5261 # Ensure timestamps are monotonically increasing.
5262 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5263 _get_committer_timestamp('HEAD'))
5264 _git_amend_head(commit_desc.description, timestamp)
5265
5266 code, out = RunGitWithCode(
5267 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5268 print(out)
5269 if code == 0:
5270 break
5271 if IsFatalPushFailure(out):
5272 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005273 'user.email are correct and you have push access to the repo.\n'
5274 'Hint: run command below to diangose common Git/Gerrit credential '
5275 'problems:\n'
5276 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005277 break
5278 return code
5279
5280
5281def IsFatalPushFailure(push_stdout):
5282 """True if retrying push won't help."""
5283 return '(prohibited by Gerrit)' in push_stdout
5284
5285
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005286@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005287@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005288def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005289 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290 parser.add_option('-b', dest='newbranch',
5291 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005292 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005293 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005294 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005295 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005296 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005297 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005298 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005299 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005300 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005301 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005302
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005303
5304 group = optparse.OptionGroup(
5305 parser,
5306 'Options for continuing work on the current issue uploaded from a '
5307 'different clone (e.g. different machine). Must be used independently '
5308 'from the other options. No issue number should be specified, and the '
5309 'branch must have an issue number associated with it')
5310 group.add_option('--reapply', action='store_true', dest='reapply',
5311 help='Reset the branch and reapply the issue.\n'
5312 'CAUTION: This will undo any local changes in this '
5313 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005314
5315 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005316 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005317 parser.add_option_group(group)
5318
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005319 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005320 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005321 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005322 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005323 auth_config = auth.extract_auth_config_from_options(options)
5324
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005325 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005326 if options.newbranch:
5327 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005328 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005329 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005330
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005331 cl = Changelist(auth_config=auth_config,
5332 codereview=options.forced_codereview)
5333 if not cl.GetIssue():
5334 parser.error('current branch must have an associated issue')
5335
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005336 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005337 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005338 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005339
5340 RunGit(['reset', '--hard', upstream])
5341 if options.pull:
5342 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005343
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005344 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5345 options.directory)
5346
5347 if len(args) != 1 or not args[0]:
5348 parser.error('Must specify issue number or url')
5349
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005350 target_issue_arg = ParseIssueNumberArgument(args[0],
5351 options.forced_codereview)
5352 if not target_issue_arg.valid:
5353 parser.error('invalid codereview url or CL id')
5354
5355 cl_kwargs = {
5356 'auth_config': auth_config,
5357 'codereview_host': target_issue_arg.hostname,
5358 'codereview': options.forced_codereview,
5359 }
5360 detected_codereview_from_url = False
5361 if target_issue_arg.codereview and not options.forced_codereview:
5362 detected_codereview_from_url = True
5363 cl_kwargs['codereview'] = target_issue_arg.codereview
5364 cl_kwargs['issue'] = target_issue_arg.issue
5365
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005366 # We don't want uncommitted changes mixed up with the patch.
5367 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005368 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005369
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005370 if options.newbranch:
5371 if options.force:
5372 RunGit(['branch', '-D', options.newbranch],
5373 stderr=subprocess2.PIPE, error_ok=True)
5374 RunGit(['new-branch', options.newbranch])
5375
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005376 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005377
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005378 if cl.IsGerrit():
5379 if options.reject:
5380 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005381 if options.directory:
5382 parser.error('--directory is not supported with Gerrit codereview.')
5383
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005384 if detected_codereview_from_url:
5385 print('canonical issue/change URL: %s (type: %s)\n' %
5386 (cl.GetIssueURL(), target_issue_arg.codereview))
5387
5388 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005389 options.nocommit, options.directory,
5390 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005391
5392
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005393def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005394 """Fetches the tree status and returns either 'open', 'closed',
5395 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005396 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005397 if url:
5398 status = urllib2.urlopen(url).read().lower()
5399 if status.find('closed') != -1 or status == '0':
5400 return 'closed'
5401 elif status.find('open') != -1 or status == '1':
5402 return 'open'
5403 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005404 return 'unset'
5405
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005406
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005407def GetTreeStatusReason():
5408 """Fetches the tree status from a json url and returns the message
5409 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005410 url = settings.GetTreeStatusUrl()
5411 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005412 connection = urllib2.urlopen(json_url)
5413 status = json.loads(connection.read())
5414 connection.close()
5415 return status['message']
5416
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005417
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005419def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005420 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005421 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005422 status = GetTreeStatus()
5423 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005424 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005425 return 2
5426
vapiera7fbd5a2016-06-16 09:17:49 -07005427 print('The tree is %s' % status)
5428 print()
5429 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005430 if status != 'open':
5431 return 1
5432 return 0
5433
5434
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005435@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005436def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005437 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005438 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005439 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005440 '-b', '--bot', action='append',
5441 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5442 'times to specify multiple builders. ex: '
5443 '"-b win_rel -b win_layout". See '
5444 'the try server waterfall for the builders name and the tests '
5445 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005446 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005447 '-B', '--bucket', default='',
5448 help=('Buildbucket bucket to send the try requests.'))
5449 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005450 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005451 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005452 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005453 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005454 help='Revision to use for the try job; default: the revision will '
5455 'be determined by the try recipe that builder runs, which usually '
5456 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005458 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005459 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005460 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005461 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005462 '--category', default='git_cl_try', help='Specify custom build category.')
5463 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005464 '--project',
5465 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005466 'in recipe to determine to which repository or directory to '
5467 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005468 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005469 '-p', '--property', dest='properties', action='append', default=[],
5470 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005471 'key2=value2 etc. The value will be treated as '
5472 'json if decodable, or as string otherwise. '
5473 'NOTE: using this may make your try job not usable for CQ, '
5474 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005475 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005476 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5477 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005478 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005479 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005480 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005481 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005482 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005483 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005484
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005485 if options.master and options.master.startswith('luci.'):
5486 parser.error(
5487 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005488 # Make sure that all properties are prop=value pairs.
5489 bad_params = [x for x in options.properties if '=' not in x]
5490 if bad_params:
5491 parser.error('Got properties with missing "=": %s' % bad_params)
5492
maruel@chromium.org15192402012-09-06 12:38:29 +00005493 if args:
5494 parser.error('Unknown arguments: %s' % args)
5495
Koji Ishii31c14782018-01-08 17:17:33 +09005496 cl = Changelist(auth_config=auth_config, issue=options.issue,
5497 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005498 if not cl.GetIssue():
5499 parser.error('Need to upload first')
5500
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005501 if cl.IsGerrit():
5502 # HACK: warm up Gerrit change detail cache to save on RPCs.
5503 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5504
tandriie113dfd2016-10-11 10:20:12 -07005505 error_message = cl.CannotTriggerTryJobReason()
5506 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005507 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005508
borenet6c0efe62016-10-19 08:13:29 -07005509 if options.bucket and options.master:
5510 parser.error('Only one of --bucket and --master may be used.')
5511
qyearsley1fdfcb62016-10-24 13:22:03 -07005512 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005513
qyearsleydd49f942016-10-28 11:57:22 -07005514 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5515 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005516 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005517 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005518 print('git cl try with no bots now defaults to CQ dry run.')
5519 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5520 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005521
borenet6c0efe62016-10-19 08:13:29 -07005522 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005523 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005524 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005525 'of bot requires an initial job from a parent (usually a builder). '
5526 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005527 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005528 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005529
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005530 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005531 # TODO(tandrii): Checking local patchset against remote patchset is only
5532 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5533 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005534 print('Warning: Codereview server has newer patchsets (%s) than most '
5535 'recent upload from local checkout (%s). Did a previous upload '
5536 'fail?\n'
5537 'By default, git cl try uses the latest patchset from '
5538 'codereview, continuing to use patchset %s.\n' %
5539 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005540
tandrii568043b2016-10-11 07:49:18 -07005541 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005542 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005543 except BuildbucketResponseException as ex:
5544 print('ERROR: %s' % ex)
5545 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005546 return 0
5547
5548
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005549@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005550def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005551 """Prints info about try jobs associated with current CL."""
5552 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005553 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005554 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005555 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005556 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005557 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005558 '--color', action='store_true', default=setup_color.IS_TTY,
5559 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005560 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005561 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5562 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005563 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005564 '--json', help=('Path of JSON output file to write try job results to,'
5565 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005566 parser.add_option_group(group)
5567 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005568 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005569 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005570 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005571 if args:
5572 parser.error('Unrecognized args: %s' % ' '.join(args))
5573
5574 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005575 cl = Changelist(
5576 issue=options.issue, codereview=options.forced_codereview,
5577 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005578 if not cl.GetIssue():
5579 parser.error('Need to upload first')
5580
tandrii221ab252016-10-06 08:12:04 -07005581 patchset = options.patchset
5582 if not patchset:
5583 patchset = cl.GetMostRecentPatchset()
5584 if not patchset:
5585 parser.error('Codereview doesn\'t know about issue %s. '
5586 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005587 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005588 cl.GetIssue())
5589
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005590 # TODO(tandrii): Checking local patchset against remote patchset is only
5591 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5592 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005593 print('Warning: Codereview server has newer patchsets (%s) than most '
5594 'recent upload from local checkout (%s). Did a previous upload '
5595 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005596 'By default, git cl try-results uses the latest patchset from '
5597 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005598 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005599 try:
tandrii221ab252016-10-06 08:12:04 -07005600 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005601 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005602 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005603 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005604 if options.json:
5605 write_try_results_json(options.json, jobs)
5606 else:
5607 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005608 return 0
5609
5610
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005611@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005612@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005613def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005614 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005615 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005616 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005617 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005618
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005619 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005620 if args:
5621 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005622 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005623 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005624 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005625 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005626
5627 # Clear configured merge-base, if there is one.
5628 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005629 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005630 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005631 return 0
5632
5633
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005634@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005635def CMDweb(parser, args):
5636 """Opens the current CL in the web browser."""
5637 _, args = parser.parse_args(args)
5638 if args:
5639 parser.error('Unrecognized args: %s' % ' '.join(args))
5640
5641 issue_url = Changelist().GetIssueURL()
5642 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005643 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005644 return 1
5645
5646 webbrowser.open(issue_url)
5647 return 0
5648
5649
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005650@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005651def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005652 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005653 parser.add_option('-d', '--dry-run', action='store_true',
5654 help='trigger in dry run mode')
5655 parser.add_option('-c', '--clear', action='store_true',
5656 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005657 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005658 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005659 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005660 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005661 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005662 if args:
5663 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005664 if options.dry_run and options.clear:
5665 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5666
iannuccie53c9352016-08-17 14:40:40 -07005667 cl = Changelist(auth_config=auth_config, issue=options.issue,
5668 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005669 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005670 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005671 elif options.dry_run:
5672 state = _CQState.DRY_RUN
5673 else:
5674 state = _CQState.COMMIT
5675 if not cl.GetIssue():
5676 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005677 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005678 return 0
5679
5680
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005681@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005682def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005683 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005684 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005685 auth.add_auth_options(parser)
5686 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005687 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005688 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005689 if args:
5690 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005691 cl = Changelist(auth_config=auth_config, issue=options.issue,
5692 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005693 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005694 if not cl.GetIssue():
5695 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005696 cl.CloseIssue()
5697 return 0
5698
5699
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005700@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005701def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005702 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005703 parser.add_option(
5704 '--stat',
5705 action='store_true',
5706 dest='stat',
5707 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005708 auth.add_auth_options(parser)
5709 options, args = parser.parse_args(args)
5710 auth_config = auth.extract_auth_config_from_options(options)
5711 if args:
5712 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005713
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005714 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005715 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005716 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005717 if not issue:
5718 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005719
Aaron Gablea718c3e2017-08-28 17:47:28 -07005720 base = cl._GitGetBranchConfigValue('last-upload-hash')
5721 if not base:
5722 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5723 if not base:
5724 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5725 revision_info = detail['revisions'][detail['current_revision']]
5726 fetch_info = revision_info['fetch']['http']
5727 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5728 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005729
Aaron Gablea718c3e2017-08-28 17:47:28 -07005730 cmd = ['git', 'diff']
5731 if options.stat:
5732 cmd.append('--stat')
5733 cmd.append(base)
5734 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005735
5736 return 0
5737
5738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005739@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005740def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005741 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005742 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005743 '--ignore-current',
5744 action='store_true',
5745 help='Ignore the CL\'s current reviewers and start from scratch.')
5746 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005747 '--no-color',
5748 action='store_true',
5749 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005750 parser.add_option(
5751 '--batch',
5752 action='store_true',
5753 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005754 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005755 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005756 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005757
5758 author = RunGit(['config', 'user.email']).strip() or None
5759
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005760 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005761
5762 if args:
5763 if len(args) > 1:
5764 parser.error('Unknown args')
5765 base_branch = args[0]
5766 else:
5767 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005768 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005769
5770 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005771 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5772
5773 if options.batch:
5774 db = owners.Database(change.RepositoryRoot(), file, os.path)
5775 print('\n'.join(db.reviewers_for(affected_files, author)))
5776 return 0
5777
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005778 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005779 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005780 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005781 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005782 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005783 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005784 disable_color=options.no_color,
5785 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005786
5787
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005788def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005789 """Generates a diff command."""
5790 # Generate diff for the current branch's changes.
Aaron Gablef4068aa2017-12-12 15:14:09 -08005791 diff_cmd = ['-c', 'core.quotePath=false', 'diff',
5792 '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005793 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005794
5795 if args:
5796 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005797 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005798 diff_cmd.append(arg)
5799 else:
5800 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005801
5802 return diff_cmd
5803
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005804
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005805def MatchingFileType(file_name, extensions):
5806 """Returns true if the file name ends with one of the given extensions."""
5807 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005808
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005809
enne@chromium.org555cfe42014-01-29 18:21:39 +00005810@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005811@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005812def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005813 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005814 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005815 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005816 parser.add_option('--full', action='store_true',
5817 help='Reformat the full content of all touched files')
5818 parser.add_option('--dry-run', action='store_true',
5819 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005820 parser.add_option('--python', action='store_true',
5821 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005822 parser.add_option('--js', action='store_true',
5823 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005824 parser.add_option('--diff', action='store_true',
5825 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005826 parser.add_option('--presubmit', action='store_true',
5827 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005828 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005829
Daniel Chengc55eecf2016-12-30 03:11:02 -08005830 # Normalize any remaining args against the current path, so paths relative to
5831 # the current directory are still resolved as expected.
5832 args = [os.path.join(os.getcwd(), arg) for arg in args]
5833
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005834 # git diff generates paths against the root of the repository. Change
5835 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005836 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005837 if rel_base_path:
5838 os.chdir(rel_base_path)
5839
digit@chromium.org29e47272013-05-17 17:01:46 +00005840 # Grab the merge-base commit, i.e. the upstream commit of the current
5841 # branch when it was created or the last time it was rebased. This is
5842 # to cover the case where the user may have called "git fetch origin",
5843 # moving the origin branch to a newer commit, but hasn't rebased yet.
5844 upstream_commit = None
5845 cl = Changelist()
5846 upstream_branch = cl.GetUpstreamBranch()
5847 if upstream_branch:
5848 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5849 upstream_commit = upstream_commit.strip()
5850
5851 if not upstream_commit:
5852 DieWithError('Could not find base commit for this branch. '
5853 'Are you in detached state?')
5854
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005855 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5856 diff_output = RunGit(changed_files_cmd)
5857 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005858 # Filter out files deleted by this CL
5859 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005860
Christopher Lamc5ba6922017-01-24 11:19:14 +11005861 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005862 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005863
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005864 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5865 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5866 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005867 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005868
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005869 top_dir = os.path.normpath(
5870 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5871
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005872 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5873 # formatted. This is used to block during the presubmit.
5874 return_value = 0
5875
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005876 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005877 # Locate the clang-format binary in the checkout
5878 try:
5879 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005880 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005881 DieWithError(e)
5882
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005883 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005884 cmd = [clang_format_tool]
5885 if not opts.dry_run and not opts.diff:
5886 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005887 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005888 if opts.diff:
5889 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005890 else:
5891 env = os.environ.copy()
5892 env['PATH'] = str(os.path.dirname(clang_format_tool))
5893 try:
5894 script = clang_format.FindClangFormatScriptInChromiumTree(
5895 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005896 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005897 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005898
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005899 cmd = [sys.executable, script, '-p0']
5900 if not opts.dry_run and not opts.diff:
5901 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005902
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005903 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5904 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005905
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005906 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5907 if opts.diff:
5908 sys.stdout.write(stdout)
5909 if opts.dry_run and len(stdout) > 0:
5910 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005911
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005912 # Similar code to above, but using yapf on .py files rather than clang-format
5913 # on C/C++ files
5914 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005915 yapf_tool = gclient_utils.FindExecutable('yapf')
5916 if yapf_tool is None:
5917 DieWithError('yapf not found in PATH')
5918
5919 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005920 if python_diff_files:
Nodir Turakulovaf43f402018-05-31 14:54:24 -07005921 if opts.dry_run or opts.diff:
5922 cmd = [yapf_tool, '--diff'] + python_diff_files
5923 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5924 if opts.diff:
5925 sys.stdout.write(stdout)
5926 elif len(stdout) > 0:
5927 return_value = 2
5928 else:
5929 RunCommand([yapf_tool, '-i'] + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005930 else:
5931 # TODO(sbc): yapf --lines mode still has some issues.
5932 # https://github.com/google/yapf/issues/154
5933 DieWithError('--python currently only works with --full')
5934
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005935 # Dart's formatter does not have the nice property of only operating on
5936 # modified chunks, so hard code full.
5937 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005938 try:
5939 command = [dart_format.FindDartFmtToolInChromiumTree()]
5940 if not opts.dry_run and not opts.diff:
5941 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005942 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005943
ppi@chromium.org6593d932016-03-03 15:41:15 +00005944 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005945 if opts.dry_run and stdout:
5946 return_value = 2
5947 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005948 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5949 'found in this checkout. Files in other languages are still '
5950 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005951
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005952 # Format GN build files. Always run on full build files for canonical form.
5953 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005954 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005955 if opts.dry_run or opts.diff:
5956 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005957 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005958 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5959 shell=sys.platform == 'win32',
5960 cwd=top_dir)
5961 if opts.dry_run and gn_ret == 2:
5962 return_value = 2 # Not formatted.
5963 elif opts.diff and gn_ret == 2:
5964 # TODO this should compute and print the actual diff.
5965 print("This change has GN build file diff for " + gn_diff_file)
5966 elif gn_ret != 0:
5967 # For non-dry run cases (and non-2 return values for dry-run), a
5968 # nonzero error code indicates a failure, probably because the file
5969 # doesn't parse.
5970 DieWithError("gn format failed on " + gn_diff_file +
5971 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005972
Ilya Shermane081cbe2017-08-15 17:51:04 -07005973 # Skip the metrics formatting from the global presubmit hook. These files have
5974 # a separate presubmit hook that issues an error if the files need formatting,
5975 # whereas the top-level presubmit script merely issues a warning. Formatting
5976 # these files is somewhat slow, so it's important not to duplicate the work.
5977 if not opts.presubmit:
5978 for xml_dir in GetDirtyMetricsDirs(diff_files):
5979 tool_dir = os.path.join(top_dir, xml_dir)
5980 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5981 if opts.dry_run or opts.diff:
5982 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005983 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005984 if opts.diff:
5985 sys.stdout.write(stdout)
5986 if opts.dry_run and stdout:
5987 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005988
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005989 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005990
Steven Holte2e664bf2017-04-21 13:10:47 -07005991def GetDirtyMetricsDirs(diff_files):
5992 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5993 metrics_xml_dirs = [
5994 os.path.join('tools', 'metrics', 'actions'),
5995 os.path.join('tools', 'metrics', 'histograms'),
5996 os.path.join('tools', 'metrics', 'rappor'),
5997 os.path.join('tools', 'metrics', 'ukm')]
5998 for xml_dir in metrics_xml_dirs:
5999 if any(file.startswith(xml_dir) for file in xml_diff_files):
6000 yield xml_dir
6001
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006002
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006003@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006004@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006005def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006006 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006007 _, args = parser.parse_args(args)
6008
6009 if len(args) != 1:
6010 parser.print_help()
6011 return 1
6012
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006013 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006014 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006015 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006016
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006017 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006018
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006019 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006020 output = RunGit(['config', '--local', '--get-regexp',
6021 r'branch\..*\.%s' % issueprefix],
6022 error_ok=True)
6023 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006024 if issue == target_issue:
6025 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006026
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006027 branches = []
6028 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006029 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006030 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006031 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006032 return 1
6033 if len(branches) == 1:
6034 RunGit(['checkout', branches[0]])
6035 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006036 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006037 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006038 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006039 which = raw_input('Choose by index: ')
6040 try:
6041 RunGit(['checkout', branches[int(which)]])
6042 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006043 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006044 return 1
6045
6046 return 0
6047
6048
maruel@chromium.org29404b52014-09-08 22:58:00 +00006049def CMDlol(parser, args):
6050 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006051 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006052 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6053 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6054 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006055 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006056 return 0
6057
6058
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006059class OptionParser(optparse.OptionParser):
6060 """Creates the option parse and add --verbose support."""
6061 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006062 optparse.OptionParser.__init__(
6063 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006064 self.add_option(
6065 '-v', '--verbose', action='count', default=0,
6066 help='Use 2 times for more debugging info')
6067
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006068 def parse_args(self, args=None, _values=None):
6069 # Create an optparse.Values object that will store only the actual passed
6070 # options, without the defaults.
6071 actual_options = optparse.Values()
6072 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6073 # Create an optparse.Values object with the default options.
6074 options = optparse.Values(self.get_default_values().__dict__)
6075 # Update it with the options passed by the user.
6076 options._update_careful(actual_options.__dict__)
6077 # Store the options passed by the user in an _actual_options attribute.
6078 # We store only the keys, and not the values, since the values can contain
6079 # arbitrary information, which might be PII.
6080 metrics.collector.add('arguments', actual_options.__dict__.keys())
6081
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006082 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006083 logging.basicConfig(
6084 level=levels[min(options.verbose, len(levels) - 1)],
6085 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6086 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006087 return options, args
6088
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006090def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006091 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006092 print('\nYour python version %s is unsupported, please upgrade.\n' %
6093 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006094 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006095
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006096 # Reload settings.
6097 global settings
6098 settings = Settings()
6099
Edward Lemurad463c92018-07-25 21:31:23 +00006100 if not metrics.DISABLE_METRICS_COLLECTION:
6101 metrics.collector.add('project_urls', [settings.GetViewVCUrl().strip('/+')])
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006102 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006103 dispatcher = subcommand.CommandDispatcher(__name__)
6104 try:
6105 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006106 except auth.AuthenticationError as e:
6107 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006108 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006109 if e.code != 500:
6110 raise
6111 DieWithError(
6112 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6113 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006114 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006115
6116
6117if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006118 # These affect sys.stdout so do it outside of main() to simplify mocks in
6119 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006120 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006121 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006122 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006123 sys.exit(main(sys.argv[1:]))