blob: e79490b732482e2b6217988e72f9dafa49bddd4b [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
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
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on 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 Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000017import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000038from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000039from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000040import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000041import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000042import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000043import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000044import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000045import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000047import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000048import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000049import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000050import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000051import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000052import presubmit_support
53import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000054import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040055import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000056import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000057import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import watchlists
59
tandrii7400cf02016-06-21 08:48:07 -070060__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061
Edward Lemur0f58ae42019-04-30 17:24:12 +000062# Traces for git push will be stored in a traces directory inside the
63# depot_tools checkout.
64DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
65TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
66
67# When collecting traces, Git hashes will be reduced to 6 characters to reduce
68# the size after compression.
69GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
70# Used to redact the cookies from the gitcookies file.
71GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
72
Edward Lemurd4d1ba42019-09-20 21:46:37 +000073MAX_ATTEMPTS = 3
74
Edward Lemur1b52d872019-05-09 21:12:12 +000075# The maximum number of traces we will keep. Multiplied by 3 since we store
76# 3 files per trace.
77MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000078# Message to be displayed to the user to inform where to find the traces for a
79# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000080TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000081'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000082'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000083' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000084'Copies of your gitcookies file and git config have been recorded at:\n'
85' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000086# Format of the message to be stored as part of the traces to give developers a
87# better context when they go through traces.
88TRACES_README_FORMAT = (
89'Date: %(now)s\n'
90'\n'
91'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
92'Title: %(title)s\n'
93'\n'
94'%(description)s\n'
95'\n'
96'Execution time: %(execution_time)s\n'
97'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000098
tandrii9d2c7a32016-06-22 03:42:45 -070099COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800100POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000101DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000102REFS_THAT_ALIAS_TO_OTHER_REFS = {
103 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
104 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
105}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000106
thestig@chromium.org44202a22014-03-11 19:22:18 +0000107# Valid extensions for files we want to lint.
108DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
109DEFAULT_LINT_IGNORE_REGEX = r"$^"
110
Aiden Bennerc08566e2018-10-03 17:52:42 +0000111# File name for yapf style config files.
112YAPF_CONFIG_FILENAME = '.style.yapf'
113
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000114# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000115Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000116
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000117# Initialized in main()
118settings = None
119
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100120# Used by tests/git_cl_test.py to add extra logging.
121# Inside the weirdly failing test, add this:
122# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700123# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100124_IS_BEING_TESTED = False
125
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000126
Christopher Lamf732cd52017-01-24 12:40:11 +1100127def DieWithError(message, change_desc=None):
128 if change_desc:
129 SaveDescriptionBackup(change_desc)
130
vapiera7fbd5a2016-06-16 09:17:49 -0700131 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132 sys.exit(1)
133
134
Christopher Lamf732cd52017-01-24 12:40:11 +1100135def SaveDescriptionBackup(change_desc):
136 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000137 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100138 backup_file = open(backup_path, 'w')
139 backup_file.write(change_desc.description)
140 backup_file.close()
141
142
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000143def GetNoGitPagerEnv():
144 env = os.environ.copy()
145 # 'cat' is a magical git string that disables pagers on all platforms.
146 env['GIT_PAGER'] = 'cat'
147 return env
148
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000149
bsep@chromium.org627d9002016-04-29 00:00:52 +0000150def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000151 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000152 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000153 except subprocess2.CalledProcessError as e:
154 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000155 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000157 'Command "%s" failed.\n%s' % (
158 ' '.join(args), error_message or e.stdout or ''))
159 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160
161
162def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000164 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000167def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700169 if suppress_stderr:
170 stderr = subprocess2.VOID
171 else:
172 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000173 try:
tandrii5d48c322016-08-18 16:19:37 -0700174 (out, _), code = subprocess2.communicate(['git'] + args,
175 env=GetNoGitPagerEnv(),
176 stdout=subprocess2.PIPE,
177 stderr=stderr)
178 return code, out
179 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900180 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700181 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000182
183
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000184def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000185 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000186 return RunGitWithCode(args, suppress_stderr=True)[1]
187
188
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000189def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000190 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000191 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000192 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000193 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194
195
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000196def BranchExists(branch):
197 """Return True if specified branch exists."""
198 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
199 suppress_stderr=True)
200 return not code
201
202
tandrii2a16b952016-10-19 07:09:44 -0700203def time_sleep(seconds):
204 # Use this so that it can be mocked in tests without interfering with python
205 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700206 return time.sleep(seconds)
207
208
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000209def time_time():
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
212 return time.time()
213
214
Edward Lemur1b52d872019-05-09 21:12:12 +0000215def datetime_now():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return datetime.datetime.now()
219
220
maruel@chromium.org90541732011-04-01 17:54:18 +0000221def ask_for_data(prompt):
222 try:
223 return raw_input(prompt)
224 except KeyboardInterrupt:
225 # Hide the exception.
226 sys.exit(1)
227
228
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100229def confirm_or_exit(prefix='', action='confirm'):
230 """Asks user to press enter to continue or press Ctrl+C to abort."""
231 if not prefix or prefix.endswith('\n'):
232 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100233 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234 mid = ' Press'
235 elif prefix.endswith(' '):
236 mid = 'press'
237 else:
238 mid = ' press'
239 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
240
241
242def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000243 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
245 while True:
246 if 'yes'.startswith(result):
247 return True
248 if 'no'.startswith(result):
249 return False
250 result = ask_for_data('Please, type yes or no: ').lower()
251
252
tandrii5d48c322016-08-18 16:19:37 -0700253def _git_branch_config_key(branch, key):
254 """Helper method to return Git config key for a branch."""
255 assert branch, 'branch name is required to set git config for it'
256 return 'branch.%s.%s' % (branch, key)
257
258
259def _git_get_branch_config_value(key, default=None, value_type=str,
260 branch=False):
261 """Returns git config value of given or current branch if any.
262
263 Returns default in all other cases.
264 """
265 assert value_type in (int, str, bool)
266 if branch is False: # Distinguishing default arg value from None.
267 branch = GetCurrentBranch()
268
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000269 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700270 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000271
tandrii5d48c322016-08-18 16:19:37 -0700272 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700273 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700274 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000275 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 args.append(_git_branch_config_key(branch, key))
278 code, out = RunGitWithCode(args)
279 if code == 0:
280 value = out.strip()
281 if value_type == int:
282 return int(value)
283 if value_type == bool:
284 return bool(value.lower() == 'true')
285 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000286 return default
287
288
tandrii5d48c322016-08-18 16:19:37 -0700289def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000290 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700291
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000292 If value is None, the key will be unset, otherwise it will be set.
293 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700294 """
295 if not branch:
296 branch = GetCurrentBranch()
297 assert branch, 'a branch name OR currently checked out branch is required'
298 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700299 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700300 if value is None:
301 args.append('--unset')
302 elif isinstance(value, bool):
303 args.append('--bool')
304 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700305 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000306 # `git config` also has --int, but apparently git config suffers from
307 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700308 value = str(value)
309 args.append(_git_branch_config_key(branch, key))
310 if value is not None:
311 args.append(value)
312 RunGit(args, **kwargs)
313
314
machenbach@chromium.org45453142015-09-15 08:45:22 +0000315def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000316 prop_list = getattr(options, 'properties', [])
317 properties = dict(x.split('=', 1) for x in prop_list)
machenbach@chromium.org45453142015-09-15 08:45:22 +0000318 for key, val in properties.iteritems():
319 try:
320 properties[key] = json.loads(val)
321 except ValueError:
322 pass # If a value couldn't be evaluated, treat it as a string.
323 return properties
324
325
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326# TODO(crbug.com/976104): Remove this function once git-cl try-results has
327# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328def _buildbucket_retry(operation_name, http, *args, **kwargs):
329 """Retries requests to buildbucket service and returns parsed json content."""
330 try_count = 0
331 while True:
332 response, content = http.request(*args, **kwargs)
333 try:
334 content_json = json.loads(content)
335 except ValueError:
336 content_json = None
337
338 # Buildbucket could return an error even if status==200.
339 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000340 error = content_json.get('error')
341 if error.get('code') == 403:
342 raise BuildbucketResponseException(
343 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000344 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000345 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000346 raise BuildbucketResponseException(msg)
347
348 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700349 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000351 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700352 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000353 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000354 content)
355 return content_json
356 if response.status < 500 or try_count >= 2:
357 raise httplib2.HttpLib2Error(content)
358
359 # status >= 500 means transient failures.
360 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000361 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 try_count += 1
363 assert False, 'unreachable'
364
365
Edward Lemur4c707a22019-09-24 21:13:43 +0000366def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000367 """Calls a buildbucket v2 method and returns the parsed json response."""
368 headers = {
369 'Accept': 'application/json',
370 'Content-Type': 'application/json',
371 }
372 request = json.dumps(request)
373 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
374
375 logging.info('POST %s with %s' % (url, request))
376
377 attempts = 1
378 time_to_sleep = 1
379 while True:
380 response, content = http.request(url, 'POST', body=request, headers=headers)
381 if response.status == 200:
382 return json.loads(content[4:])
383 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
384 msg = '%s error when calling POST %s with %s: %s' % (
385 response.status, url, request, content)
386 raise BuildbucketResponseException(msg)
387 logging.debug(
388 '%s error when calling POST %s with %s. '
389 'Sleeping for %d seconds and retrying...' % (
390 response.status, url, request, time_to_sleep))
391 time.sleep(time_to_sleep)
392 time_to_sleep *= 2
393 attempts += 1
394
395 assert False, 'unreachable'
396
397
qyearsley1fdfcb62016-10-24 13:22:03 -0700398def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700399 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000400 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700401 """
qyearsleydd49f942016-10-28 11:57:22 -0700402 # If no bots are listed, we try to get a set of builders and tests based
403 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700404 if not options.bot:
405 change = changelist.GetChange(
406 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700407 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700408 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 change=change,
410 changed_files=change.LocalPaths(),
411 repository_root=settings.GetRoot(),
412 default_presubmit=None,
413 project=None,
414 verbose=options.verbose,
415 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700416 if masters is None:
417 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000418 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700419
qyearsley1fdfcb62016-10-24 13:22:03 -0700420 if options.bucket:
421 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000422 option_parser.error(
423 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700424
425
Edward Lemur6215c792019-10-03 21:59:05 +0000426def _parse_bucket(raw_bucket):
427 legacy = True
428 project = bucket = None
429 if '/' in raw_bucket:
430 legacy = False
431 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000433 elif raw_bucket.startswith('luci.'):
434 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000435 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000436 elif '.' in raw_bucket:
437 project = raw_bucket.split('.')[0]
438 bucket = raw_bucket
439 # Legacy buckets.
440 if legacy:
441 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
442 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000443
444
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800445def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000446 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700447
448 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700449 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 buckets: A nested dict mapping bucket names to builders to tests.
452 options: Command-line options.
453 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454 print('Scheduling jobs on:')
455 for bucket, builders_and_tests in sorted(buckets.iteritems()):
456 print('Bucket:', bucket)
457 print('\n'.join(
458 ' %s: %s' % (builder, tests)
459 for builder, tests in sorted(builders_and_tests.iteritems())))
460 print('To see results here, run: git cl try-results')
461 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700462
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000463 requests = _make_try_job_schedule_requests(
464 changelist, buckets, options, patchset)
465 if not requests:
466 return
467
Edward Lemurb4a587d2019-10-09 23:56:38 +0000468 http = auth.get_authenticator(auth_config).authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000469 http.force_exception_to_status_code = True
470
471 batch_request = {'requests': requests}
472 batch_response = _call_buildbucket(
473 http, options.buildbucket_host, 'Batch', batch_request)
474
475 errors = [
476 ' ' + response['error']['message']
477 for response in batch_response.get('responses', [])
478 if 'error' in response
479 ]
480 if errors:
481 raise BuildbucketResponseException(
482 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
483
484
485def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000486 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000487 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000488 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000489 shared_properties['clobber'] = True
490 shared_properties.update(_get_properties_from_options(options) or {})
491
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000492 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
493 if options.retry_failed:
494 shared_tags.append({'key': 'retry_failed',
495 'value': '1'})
496
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000497 requests = []
498 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
499 project, bucket = _parse_bucket(raw_bucket)
500 if not project or not bucket:
501 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
502 continue
503
504 for builder, tests in sorted(builders_and_tests.iteritems()):
505 properties = shared_properties.copy()
506 if 'presubmit' in builder.lower():
507 properties['dry_run'] = 'true'
508 if tests:
509 properties['testfilter'] = tests
510
511 requests.append({
512 'scheduleBuild': {
513 'requestId': str(uuid.uuid4()),
514 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000515 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000516 'bucket': bucket,
517 'builder': builder,
518 },
519 'gerritChanges': gerrit_changes,
520 'properties': properties,
521 'tags': [
522 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000523 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000524 }
525 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000526 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000527
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528
tandrii221ab252016-10-06 08:12:04 -0700529def fetch_try_jobs(auth_config, changelist, buildbucket_host,
530 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000531 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000532
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 """
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 fields = ['id', 'builder', 'status']
536 request = {
537 'predicate': {
538 'gerritChanges': [changelist.GetGerritChange(patchset)],
539 },
540 'fields': ','.join('builds.*.' + field for field in fields),
541 }
tandrii221ab252016-10-06 08:12:04 -0700542
Edward Lemurb4a587d2019-10-09 23:56:38 +0000543 authenticator = auth.get_authenticator(auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 if authenticator.has_cached_credentials():
545 http = authenticator.authorize(httplib2.Http())
546 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700547 print('Warning: Some results might be missing because %s' %
548 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000549 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 http.force_exception_to_status_code = True
552
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000553 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
554 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000556def _fetch_latest_builds(
557 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000558 """Fetches builds from the latest patchset that has builds (within
559 the last few patchsets).
560
561 Args:
562 auth_config (auth.AuthConfig): Auth info for Buildbucket
563 changelist (Changelist): The CL to fetch builds for
564 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000565 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
566 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000568 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
569 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000570 """
571 assert buildbucket_host
572 assert changelist.GetIssue(), 'CL must be uploaded first'
573 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000574 if latest_patchset is None:
575 assert changelist.GetMostRecentPatchset()
576 ps = changelist.GetMostRecentPatchset()
577 else:
578 assert latest_patchset > 0, latest_patchset
579 ps = latest_patchset
580
Quinten Yearsley983111f2019-09-26 17:18:48 +0000581 min_ps = max(1, ps - 5)
582 while ps >= min_ps:
583 builds = fetch_try_jobs(
584 auth_config, changelist, buildbucket_host, patchset=ps)
585 if len(builds):
586 return builds, ps
587 ps -= 1
588 return [], 0
589
590
591def _filter_failed(builds):
592 """Returns a list of buckets/builders that had failed builds.
593
594 Args:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000595 builds (list): Builds, in the format returned by fetch_try_jobs,
596 i.e. a list of buildbucket.v2.Builds which includes status and builder
597 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000598
599 Returns:
600 A dict of bucket to builder to tests (empty list). This is the same format
601 accepted by _trigger_try_jobs and returned by _get_bucket_map.
602 """
603 buckets = collections.defaultdict(dict)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 for build in builds:
605 if build['status'] in ('FAILURE', 'INFRA_FAILURE'):
606 project = build['builder']['project']
607 bucket = build['builder']['bucket']
608 builder = build['builder']['builder']
Quinten Yearsley983111f2019-09-26 17:18:48 +0000609 buckets[project + '/' + bucket][builder] = []
610 return buckets
611
612
qyearsleyeab3c042016-08-24 09:18:28 -0700613def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614 """Prints nicely result of fetch_try_jobs."""
615 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000616 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617 return
618
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 longest_builder = max(len(b['builder']['builder']) for b in builds)
620 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000622 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
623 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000625 builds_by_status = {}
626 for b in builds:
627 builds_by_status.setdefault(b['status'], []).append({
628 'id': b['id'],
629 'name': name_fmt.format(
630 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
631 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000633 sort_key = lambda b: (b['name'], b['id'])
634
635 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000637 if not builds:
638 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000640 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000641 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000643 else:
644 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
645
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000646 print(colorize(title))
647 for b in sorted(builds, key=sort_key):
648 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
650 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000651 print_builds(
652 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
653 print_builds(
654 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
655 color=Fore.MAGENTA)
656 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
657 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
658 color=Fore.MAGENTA)
659 print_builds('Started:', builds_by_status.pop('STARTED', []))
660 print_builds(
661 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000662 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print_builds(
664 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000665 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666
667
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668def _ComputeDiffLineRanges(files, upstream_commit):
669 """Gets the changed line ranges for each file since upstream_commit.
670
671 Parses a git diff on provided files and returns a dict that maps a file name
672 to an ordered list of range tuples in the form (start_line, count).
673 Ranges are in the same format as a git diff.
674 """
675 # If files is empty then diff_output will be a full diff.
676 if len(files) == 0:
677 return {}
678
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000679 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
681 diff_output = RunGit(diff_cmd)
682
683 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
684 # 2 capture groups
685 # 0 == fname of diff file
686 # 1 == 'diff_start,diff_count' or 'diff_start'
687 # will match each of
688 # diff --git a/foo.foo b/foo.py
689 # @@ -12,2 +14,3 @@
690 # @@ -12,2 +17 @@
691 # running re.findall on the above string with pattern will give
692 # [('foo.py', ''), ('', '14,3'), ('', '17')]
693
694 curr_file = None
695 line_diffs = {}
696 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
697 if match[0] != '':
698 # Will match the second filename in diff --git a/a.py b/b.py.
699 curr_file = match[0]
700 line_diffs[curr_file] = []
701 else:
702 # Matches +14,3
703 if ',' in match[1]:
704 diff_start, diff_count = match[1].split(',')
705 else:
706 # Single line changes are of the form +12 instead of +12,1.
707 diff_start = match[1]
708 diff_count = 1
709
710 diff_start = int(diff_start)
711 diff_count = int(diff_count)
712
713 # If diff_count == 0 this is a removal we can ignore.
714 line_diffs[curr_file].append((diff_start, diff_count))
715
716 return line_diffs
717
718
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000719def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000720 """Checks if a yapf file is in any parent directory of fpath until top_dir.
721
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000722 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000723 is found returns None. Uses yapf_config_cache as a cache for previously found
724 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000725 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000726 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000727 # Return result if we've already computed it.
728 if fpath in yapf_config_cache:
729 return yapf_config_cache[fpath]
730
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000731 parent_dir = os.path.dirname(fpath)
732 if os.path.isfile(fpath):
733 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000734 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000735 # Otherwise fpath is a directory
736 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
737 if os.path.isfile(yapf_file):
738 ret = yapf_file
739 elif fpath == top_dir or parent_dir == fpath:
740 # If we're at the top level directory, or if we're at root
741 # there is no provided style.
742 ret = None
743 else:
744 # Otherwise recurse on the current directory.
745 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000746 yapf_config_cache[fpath] = ret
747 return ret
748
749
Aaron Gable13101a62018-02-09 13:20:41 -0800750def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 """Prints statistics about the change to the user."""
752 # --no-ext-diff is broken in some versions of Git, so try to work around
753 # this by overriding the environment (but there is still a problem if the
754 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000755 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756 if 'GIT_EXTERNAL_DIFF' in env:
757 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000759 try:
760 stdout = sys.stdout.fileno()
761 except AttributeError:
762 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000763 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800764 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000765 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000766
767
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000768class BuildbucketResponseException(Exception):
769 pass
770
771
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000772class Settings(object):
773 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000774 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000775 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000776 self.tree_status_url = None
777 self.viewvc_url = None
778 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000779 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000780 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000781 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000782 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
784 def LazyUpdateIfNeeded(self):
785 """Updates the settings from a codereview.settings file, if available."""
786 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000787 # The only value that actually changes the behavior is
788 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000789 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000790 error_ok=True
791 ).strip().lower()
792
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000794 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 LoadCodereviewSettingsFromFile(cr_settings_file)
796 self.updated = True
797
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 @staticmethod
799 def GetRelativeRoot():
800 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000803 if self.root is None:
804 self.root = os.path.abspath(self.GetRelativeRoot())
805 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 def GetTreeStatusUrl(self, error_ok=False):
808 if not self.tree_status_url:
809 error_message = ('You must configure your tree status URL by running '
810 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000811 self.tree_status_url = self._GetConfig(
812 'rietveld.tree-status-url', error_ok=error_ok,
813 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.tree_status_url
815
816 def GetViewVCUrl(self):
817 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819 return self.viewvc_url
820
rmistry@google.com90752582014-01-14 21:04:50 +0000821 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000822 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000823
rmistry@google.com5626a922015-02-26 14:03:30 +0000824 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000825 run_post_upload_hook = self._GetConfig(
826 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 return run_post_upload_hook == "True"
828
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000829 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000830 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000831
ukai@chromium.orge8077812012-02-03 03:41:46 +0000832 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000833 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700835 self.is_gerrit = (
836 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 return self.is_gerrit
838
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000839 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000840 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000841 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700842 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
843 if self.squash_gerrit_uploads is None:
844 # Default is squash now (http://crbug.com/611892#c23).
845 self.squash_gerrit_uploads = not (
846 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
847 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 return self.squash_gerrit_uploads
849
tandriia60502f2016-06-20 02:01:53 -0700850 def GetSquashGerritUploadsOverride(self):
851 """Return True or False if codereview.settings should be overridden.
852
853 Returns None if no override has been defined.
854 """
855 # See also http://crbug.com/611892#c23
856 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
857 error_ok=True).strip()
858 if result == 'true':
859 return True
860 if result == 'false':
861 return False
862 return None
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
868 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000869 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 error_ok=True).strip() == 'true')
871 return self.gerrit_skip_ensure_authenticated
872
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000874 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000876 # Git requires single quotes for paths with spaces. We need to replace
877 # them with double quotes for Windows to treat such paths as a single
878 # path.
879 self.git_editor = self._GetConfig(
880 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000881 return self.git_editor or None
882
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000884 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000885 DEFAULT_LINT_REGEX)
886
887 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000888 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000889 DEFAULT_LINT_IGNORE_REGEX)
890
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000891 def _GetConfig(self, param, **kwargs):
892 self.LazyUpdateIfNeeded()
893 return RunGit(['config', param], **kwargs).strip()
894
895
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000896def ShortBranchName(branch):
897 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000898 return branch.replace('refs/heads/', '', 1)
899
900
901def GetCurrentBranchRef():
902 """Returns branch ref (e.g., refs/heads/master) or None."""
903 return RunGit(['symbolic-ref', 'HEAD'],
904 stderr=subprocess2.VOID, error_ok=True).strip() or None
905
906
907def GetCurrentBranch():
908 """Returns current branch or None.
909
910 For refs/heads/* branches, returns just last part. For others, full ref.
911 """
912 branchref = GetCurrentBranchRef()
913 if branchref:
914 return ShortBranchName(branchref)
915 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000916
917
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000918class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000919 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000920 NONE = 'none'
921 DRY_RUN = 'dry_run'
922 COMMIT = 'commit'
923
924 ALL_STATES = [NONE, DRY_RUN, COMMIT]
925
926
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000928 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000929 self.issue = issue
930 self.patchset = patchset
931 self.hostname = hostname
932
933 @property
934 def valid(self):
935 return self.issue is not None
936
937
Edward Lemurf38bc172019-09-03 21:02:13 +0000938def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
940 fail_result = _ParsedIssueNumberArgument()
941
Edward Lemur678a6842019-10-03 22:25:05 +0000942 if isinstance(arg, int):
943 return _ParsedIssueNumberArgument(issue=arg)
944 if not isinstance(arg, basestring):
945 return fail_result
946
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000948 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000949 if not arg.startswith('http'):
950 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700951
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000952 url = gclient_utils.UpgradeToHttps(arg)
953 try:
954 parsed_url = urlparse.urlparse(url)
955 except ValueError:
956 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200957
Edward Lemur678a6842019-10-03 22:25:05 +0000958 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
959 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
960 # Short urls like https://domain/<issue_number> can be used, but don't allow
961 # specifying the patchset (you'd 404), but we allow that here.
962 if parsed_url.path == '/':
963 part = parsed_url.fragment
964 else:
965 part = parsed_url.path
966
967 match = re.match(
968 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
969 if not match:
970 return fail_result
971
972 issue = int(match.group('issue'))
973 patchset = match.group('patchset')
974 return _ParsedIssueNumberArgument(
975 issue=issue,
976 patchset=int(patchset) if patchset else None,
977 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000978
979
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000980def _create_description_from_log(args):
981 """Pulls out the commit log to use as a base for the CL description."""
982 log_args = []
983 if len(args) == 1 and not args[0].endswith('.'):
984 log_args = [args[0] + '..']
985 elif len(args) == 1 and args[0].endswith('...'):
986 log_args = [args[0][:-1]]
987 elif len(args) == 2:
988 log_args = [args[0] + '..' + args[1]]
989 else:
990 log_args = args[:] # Hope for the best!
991 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
992
993
Aaron Gablea45ee112016-11-22 15:14:38 -0800994class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700995 def __init__(self, issue, url):
996 self.issue = issue
997 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800998 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700999
1000 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001001 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001002 self.issue, self.url)
1003
1004
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001006 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001007 # TODO(tandrii): these two aren't known in Gerrit.
1008 'approval', 'disapproval'])
1009
1010
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """Changelist works with one changelist in local branch.
1013
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001014 Notes:
1015 * Not safe for concurrent multi-{thread,process} use.
1016 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001017 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """
1019
Edward Lemur125d60a2019-09-13 18:25:41 +00001020 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001021 """Create a new ChangeList instance.
1022
Edward Lemurf38bc172019-09-03 21:02:13 +00001023 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001026 global settings
1027 if not settings:
1028 # Happens when git_cl.py is used as a utility library.
1029 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.branchref = branchref
1032 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001033 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.branch = ShortBranchName(self.branchref)
1035 else:
1036 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001038 self.lookedup_issue = False
1039 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.has_description = False
1041 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001042 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001045 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001047 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001048
Edward Lemur125d60a2019-09-13 18:25:41 +00001049 # Lazily cached values.
1050 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1051 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1052 # Map from change number (issue) to its detail cache.
1053 self._detail_cache = {}
1054
1055 if codereview_host is not None:
1056 assert not codereview_host.startswith('https://'), codereview_host
1057 self._gerrit_host = codereview_host
1058 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001059
1060 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001061 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001062
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001063 The return value is a string suitable for passing to git cl with the --cc
1064 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065 """
1066 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001067 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001068 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1070 return self.cc
1071
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001072 def GetCCListWithoutDefault(self):
1073 """Return the users cc'd on this CL excluding default ones."""
1074 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001075 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001076 return self.cc
1077
Daniel Cheng7227d212017-11-17 08:12:37 -08001078 def ExtendCC(self, more_cc):
1079 """Extends the list of users to cc on this CL based on the changed files."""
1080 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001081
1082 def GetBranch(self):
1083 """Returns the short branch name, e.g. 'master'."""
1084 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001085 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001086 if not branchref:
1087 return None
1088 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 self.branch = ShortBranchName(self.branchref)
1090 return self.branch
1091
1092 def GetBranchRef(self):
1093 """Returns the full branch name, e.g. 'refs/heads/master'."""
1094 self.GetBranch() # Poke the lazy loader.
1095 return self.branchref
1096
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001097 def ClearBranch(self):
1098 """Clears cached branch data of this object."""
1099 self.branch = self.branchref = None
1100
tandrii5d48c322016-08-18 16:19:37 -07001101 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1102 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1103 kwargs['branch'] = self.GetBranch()
1104 return _git_get_branch_config_value(key, default, **kwargs)
1105
1106 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1107 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1108 assert self.GetBranch(), (
1109 'this CL must have an associated branch to %sset %s%s' %
1110 ('un' if value is None else '',
1111 key,
1112 '' if value is None else ' to %r' % value))
1113 kwargs['branch'] = self.GetBranch()
1114 return _git_set_branch_config_value(key, value, **kwargs)
1115
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 @staticmethod
1117 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001118 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001119 e.g. 'origin', 'refs/heads/master'
1120 """
1121 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001122 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1123
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001125 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001127 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1128 error_ok=True).strip()
1129 if upstream_branch:
1130 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001132 # Else, try to guess the origin remote.
1133 remote_branches = RunGit(['branch', '-r']).split()
1134 if 'origin/master' in remote_branches:
1135 # Fall back on origin/master if it exits.
1136 remote = 'origin'
1137 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001139 DieWithError(
1140 'Unable to determine default branch to diff against.\n'
1141 'Either pass complete "git diff"-style arguments, like\n'
1142 ' git cl upload origin/master\n'
1143 'or verify this branch is set up to track another \n'
1144 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145
1146 return remote, upstream_branch
1147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001149 upstream_branch = self.GetUpstreamBranch()
1150 if not BranchExists(upstream_branch):
1151 DieWithError('The upstream for the current branch (%s) does not exist '
1152 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001153 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001154 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001155
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 def GetUpstreamBranch(self):
1157 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001159 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001160 upstream_branch = upstream_branch.replace('refs/heads/',
1161 'refs/remotes/%s/' % remote)
1162 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1163 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001164 self.upstream_branch = upstream_branch
1165 return self.upstream_branch
1166
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001168 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 remote, branch = None, self.GetBranch()
1170 seen_branches = set()
1171 while branch not in seen_branches:
1172 seen_branches.add(branch)
1173 remote, branch = self.FetchUpstreamTuple(branch)
1174 branch = ShortBranchName(branch)
1175 if remote != '.' or branch.startswith('refs/remotes'):
1176 break
1177 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 remotes = RunGit(['remote'], error_ok=True).split()
1179 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001181 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001183 logging.warn('Could not determine which remote this change is '
1184 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 else:
1186 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001187 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001188 branch = 'HEAD'
1189 if branch.startswith('refs/remotes'):
1190 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001191 elif branch.startswith('refs/branch-heads/'):
1192 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 else:
1194 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001195 return self._remote
1196
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001197 def GitSanityChecks(self, upstream_git_obj):
1198 """Checks git repo status and ensures diff is from local commits."""
1199
sbc@chromium.org79706062015-01-14 21:18:12 +00001200 if upstream_git_obj is None:
1201 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001202 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001203 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001204 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001205 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001206 return False
1207
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001208 # Verify the commit we're diffing against is in our current branch.
1209 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1210 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1211 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001212 print('ERROR: %s is not in the current branch. You may need to rebase '
1213 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001214 return False
1215
1216 # List the commits inside the diff, and verify they are all local.
1217 commits_in_diff = RunGit(
1218 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1219 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1220 remote_branch = remote_branch.strip()
1221 if code != 0:
1222 _, remote_branch = self.GetRemoteBranch()
1223
1224 commits_in_remote = RunGit(
1225 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1226
1227 common_commits = set(commits_in_diff) & set(commits_in_remote)
1228 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001229 print('ERROR: Your diff contains %d commits already in %s.\n'
1230 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1231 'the diff. If you are using a custom git flow, you can override'
1232 ' the reference used for this check with "git config '
1233 'gitcl.remotebranch <git-ref>".' % (
1234 len(common_commits), remote_branch, upstream_git_obj),
1235 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 return False
1237 return True
1238
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001239 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001240 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001241
1242 Returns None if it is not set.
1243 """
tandrii5d48c322016-08-18 16:19:37 -07001244 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 def GetRemoteUrl(self):
1247 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1248
1249 Returns None if there is no remote.
1250 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001251 is_cached, value = self._cached_remote_url
1252 if is_cached:
1253 return value
1254
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001255 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001256 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1257
Edward Lemur298f2cf2019-02-22 21:40:39 +00001258 # Check if the remote url can be parsed as an URL.
1259 host = urlparse.urlparse(url).netloc
1260 if host:
1261 self._cached_remote_url = (True, url)
1262 return url
1263
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001264 # If it cannot be parsed as an url, assume it is a local directory,
1265 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001266 logging.warning('"%s" doesn\'t appear to point to a git host. '
1267 'Interpreting it as a local directory.', url)
1268 if not os.path.isdir(url):
1269 logging.error(
1270 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001271 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001272 return None
1273
1274 cache_path = url
1275 url = RunGit(['config', 'remote.%s.url' % remote],
1276 error_ok=True,
1277 cwd=url).strip()
1278
1279 host = urlparse.urlparse(url).netloc
1280 if not host:
1281 logging.error(
1282 'Remote "%(remote)s" for branch "%(branch)s" points to '
1283 '"%(cache_path)s", but it is misconfigured.\n'
1284 '"%(cache_path)s" must be a git repo and must have a remote named '
1285 '"%(remote)s" pointing to the git host.', {
1286 'remote': remote,
1287 'cache_path': cache_path,
1288 'branch': self.GetBranch()})
1289 return None
1290
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001291 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001292 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001294 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001295 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001296 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001297 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001298 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 return self.issue
1301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def GetIssueURL(self):
1303 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001304 issue = self.GetIssue()
1305 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001306 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001307 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001309 def GetDescription(self, pretty=False, force=False):
1310 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001312 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001313 self.has_description = True
1314 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001315 # Set width to 72 columns + 2 space indent.
1316 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001317 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001318 lines = self.description.splitlines()
1319 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001320 return self.description
1321
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001322 def GetDescriptionFooters(self):
1323 """Returns (non_footer_lines, footers) for the commit message.
1324
1325 Returns:
1326 non_footer_lines (list(str)) - Simple list of description lines without
1327 any footer. The lines do not contain newlines, nor does the list contain
1328 the empty line between the message and the footers.
1329 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1330 [("Change-Id", "Ideadbeef...."), ...]
1331 """
1332 raw_description = self.GetDescription()
1333 msg_lines, _, footers = git_footers.split_footers(raw_description)
1334 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001335 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001336 return msg_lines, footers
1337
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001338 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001339 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001341 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001342 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001343 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001344 return self.patchset
1345
1346 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001347 """Set this branch's patchset. If patchset=0, clears the patchset."""
1348 assert self.GetBranch()
1349 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001350 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001351 else:
1352 self.patchset = int(patchset)
1353 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001354 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001356 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001357 """Set this branch's issue. If issue isn't given, clears the issue."""
1358 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001359 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001360 issue = int(issue)
1361 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001362 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001363 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001364 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001365 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001366 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001367 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001368 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 else:
tandrii5d48c322016-08-18 16:19:37 -07001370 # Reset all of these just to be clean.
1371 reset_suffixes = [
1372 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001373 self.IssueConfigKey(),
1374 self.PatchsetConfigKey(),
1375 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001376 ] + self._PostUnsetIssueProperties()
1377 for prop in reset_suffixes:
1378 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001379 msg = RunGit(['log', '-1', '--format=%B']).strip()
1380 if msg and git_footers.get_footer_change_id(msg):
1381 print('WARNING: The change patched into this branch has a Change-Id. '
1382 'Removing it.')
1383 RunGit(['commit', '--amend', '-m',
1384 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001385 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001386 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001387 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388
dnjba1b0f32016-09-02 12:37:42 -07001389 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001390 if not self.GitSanityChecks(upstream_branch):
1391 DieWithError('\nGit sanity check failure')
1392
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001393 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001394 if not root:
1395 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001396 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001397
1398 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001399 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001400 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001401 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001402 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001403 except subprocess2.CalledProcessError:
1404 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001405 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001406 'This branch probably doesn\'t exist anymore. To reset the\n'
1407 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001408 ' git branch --set-upstream-to origin/master %s\n'
1409 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001410 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001411
maruel@chromium.org52424302012-08-29 15:14:30 +00001412 issue = self.GetIssue()
1413 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001414 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001415 description = self.GetDescription()
1416 else:
1417 # If the change was never uploaded, use the log messages of all commits
1418 # up to the branch point, as git cl upload will prefill the description
1419 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001420 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1421 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001422
1423 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001424 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001425 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001426 name,
1427 description,
1428 absroot,
1429 files,
1430 issue,
1431 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001432 author,
1433 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001434
dsansomee2d6fd92016-09-08 00:10:47 -07001435 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001436 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001437 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001438 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001440 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1441 """Sets the description for this CL remotely.
1442
1443 You can get description_lines and footers with GetDescriptionFooters.
1444
1445 Args:
1446 description_lines (list(str)) - List of CL description lines without
1447 newline characters.
1448 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1449 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1450 `List-Of-Tokens`). It will be case-normalized so that each token is
1451 title-cased.
1452 """
1453 new_description = '\n'.join(description_lines)
1454 if footers:
1455 new_description += '\n'
1456 for k, v in footers:
1457 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1458 if not git_footers.FOOTER_PATTERN.match(foot):
1459 raise ValueError('Invalid footer %r' % foot)
1460 new_description += foot + '\n'
1461 self.UpdateDescription(new_description, force)
1462
Edward Lesmes8e282792018-04-03 18:50:29 -04001463 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1465 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001466 start = time_time()
1467 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001468 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1469 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001470 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001471 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001472 metrics.collector.add_repeated('sub_commands', {
1473 'command': 'presubmit',
1474 'execution_time': time_time() - start,
1475 'exit_code': 0 if result.should_continue() else 1,
1476 })
1477 return result
vapierfd77ac72016-06-16 08:33:57 -07001478 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001479 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001480
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001481 def CMDUpload(self, options, git_diff_args, orig_args):
1482 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001483 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001484 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001485 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001486 else:
1487 if self.GetBranch() is None:
1488 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1489
1490 # Default to diffing against common ancestor of upstream branch
1491 base_branch = self.GetCommonAncestorWithUpstream()
1492 git_diff_args = [base_branch, 'HEAD']
1493
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001494 # Fast best-effort checks to abort before running potentially expensive
1495 # hooks if uploading is likely to fail anyway. Passing these checks does
1496 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001497 self.EnsureAuthenticated(force=options.force)
1498 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499
1500 # Apply watchlists on upload.
1501 change = self.GetChange(base_branch, None)
1502 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1503 files = [f.LocalPath() for f in change.AffectedFiles()]
1504 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001505 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001506
1507 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001508 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509 # Set the reviewer list now so that presubmit checks can access it.
1510 change_description = ChangeDescription(change.FullDescriptionText())
1511 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001512 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001513 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001514 change)
1515 change.SetDescriptionText(change_description.description)
1516 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001517 may_prompt=not options.force,
1518 verbose=options.verbose,
1519 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 if not hook_results.should_continue():
1521 return 1
1522 if not options.reviewers and hook_results.reviewers:
1523 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001524 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525
Aaron Gable13101a62018-02-09 13:20:41 -08001526 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001527 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001529 _git_set_branch_config_value('last-upload-hash',
1530 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531 # Run post upload hooks, if specified.
1532 if settings.GetRunPostUploadHook():
1533 presubmit_support.DoPostUploadExecuter(
1534 change,
1535 self,
1536 settings.GetRoot(),
1537 options.verbose,
1538 sys.stdout)
1539
1540 # Upload all dependencies if specified.
1541 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001542 print()
1543 print('--dependencies has been specified.')
1544 print('All dependent local branches will be re-uploaded.')
1545 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 # Remove the dependencies flag from args so that we do not end up in a
1547 # loop.
1548 orig_args.remove('--dependencies')
1549 ret = upload_branch_deps(self, orig_args)
1550 return ret
1551
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001552 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001553 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001554
1555 Issue must have been already uploaded and known.
1556 """
1557 assert new_state in _CQState.ALL_STATES
1558 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001559 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001560 vote_map = {
1561 _CQState.NONE: 0,
1562 _CQState.DRY_RUN: 1,
1563 _CQState.COMMIT: 2,
1564 }
1565 labels = {'Commit-Queue': vote_map[new_state]}
1566 notify = False if new_state == _CQState.DRY_RUN else None
1567 gerrit_util.SetReview(
1568 self._GetGerritHost(), self._GerritChangeIdentifier(),
1569 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 return 0
1571 except KeyboardInterrupt:
1572 raise
1573 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001574 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001575 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001576 ' * Your project has no CQ,\n'
1577 ' * You don\'t have permission to change the CQ state,\n'
1578 ' * There\'s a bug in this code (see stack trace below).\n'
1579 'Consider specifying which bots to trigger manually or asking your '
1580 'project owners for permissions or contacting Chrome Infra at:\n'
1581 'https://www.chromium.org/infra\n\n' %
1582 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001583 # Still raise exception so that stack trace is printed.
1584 raise
1585
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001586 def _GetGerritHost(self):
1587 # Lazy load of configs.
1588 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001589 if self._gerrit_host and '.' not in self._gerrit_host:
1590 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1591 # This happens for internal stuff http://crbug.com/614312.
1592 parsed = urlparse.urlparse(self.GetRemoteUrl())
1593 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001594 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001595 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001596 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1597 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001598 return self._gerrit_host
1599
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 def _GetGitHost(self):
1601 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001602 remote_url = self.GetRemoteUrl()
1603 if not remote_url:
1604 return None
1605 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001606
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607 def GetCodereviewServer(self):
1608 if not self._gerrit_server:
1609 # If we're on a branch then get the server potentially associated
1610 # with that branch.
1611 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001612 self._gerrit_server = self._GitGetBranchConfigValue(
1613 self.CodereviewServerConfigKey())
1614 if self._gerrit_server:
1615 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001616 if not self._gerrit_server:
1617 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1618 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001620 parts[0] = parts[0] + '-review'
1621 self._gerrit_host = '.'.join(parts)
1622 self._gerrit_server = 'https://%s' % self._gerrit_host
1623 return self._gerrit_server
1624
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001625 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001626 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001627 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001628 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001629 logging.warn('can\'t detect Gerrit project.')
1630 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001631 project = urlparse.urlparse(remote_url).path.strip('/')
1632 if project.endswith('.git'):
1633 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001634 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1635 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1636 # gitiles/git-over-https protocol. E.g.,
1637 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1638 # as
1639 # https://chromium.googlesource.com/v8/v8
1640 if project.startswith('a/'):
1641 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001642 return project
1643
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001644 def _GerritChangeIdentifier(self):
1645 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1646
1647 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001648 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001649 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001650 project = self._GetGerritProject()
1651 if project:
1652 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1653 # Fall back on still unique, but less efficient change number.
1654 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001655
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001656 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001657 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001658 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659
tandrii5d48c322016-08-18 16:19:37 -07001660 @classmethod
1661 def PatchsetConfigKey(cls):
1662 return 'gerritpatchset'
1663
1664 @classmethod
1665 def CodereviewServerConfigKey(cls):
1666 return 'gerritserver'
1667
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001668 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001669 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001670 if settings.GetGerritSkipEnsureAuthenticated():
1671 # For projects with unusual authentication schemes.
1672 # See http://crbug.com/603378.
1673 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001674
1675 # Check presence of cookies only if using cookies-based auth method.
1676 cookie_auth = gerrit_util.Authenticator.get()
1677 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001679
Daniel Chengcf6269b2019-05-18 01:02:12 +00001680 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1681 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001682 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001683 return
1684
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001685 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001686 self.GetCodereviewServer()
1687 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001688 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001689
1690 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1691 git_auth = cookie_auth.get_auth_header(git_host)
1692 if gerrit_auth and git_auth:
1693 if gerrit_auth == git_auth:
1694 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001695 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001696 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001697 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698 ' %s\n'
1699 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001700 ' Consider running the following command:\n'
1701 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001702 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001703 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001704 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001705 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001706 cookie_auth.get_new_password_message(git_host)))
1707 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001708 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001709 return
1710 else:
1711 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001712 ([] if gerrit_auth else [self._gerrit_host]) +
1713 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 DieWithError('Credentials for the following hosts are required:\n'
1715 ' %s\n'
1716 'These are read from %s (or legacy %s)\n'
1717 '%s' % (
1718 '\n '.join(missing),
1719 cookie_auth.get_gitcookies_path(),
1720 cookie_auth.get_netrc_path(),
1721 cookie_auth.get_new_password_message(git_host)))
1722
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001723 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001724 if not self.GetIssue():
1725 return
1726
1727 # Warm change details cache now to avoid RPCs later, reducing latency for
1728 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001729 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001730 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001731
1732 status = self._GetChangeDetail()['status']
1733 if status in ('MERGED', 'ABANDONED'):
1734 DieWithError('Change %s has been %s, new uploads are not allowed' %
1735 (self.GetIssueURL(),
1736 'submitted' if status == 'MERGED' else 'abandoned'))
1737
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001738 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1739 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1740 # Apparently this check is not very important? Otherwise get_auth_email
1741 # could have been added to other implementations of Authenticator.
1742 cookies_auth = gerrit_util.Authenticator.get()
1743 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001744 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001745
1746 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001747 if self.GetIssueOwner() == cookies_user:
1748 return
1749 logging.debug('change %s owner is %s, cookies user is %s',
1750 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001751 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001752 # so ask what Gerrit thinks of this user.
1753 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1754 if details['email'] == self.GetIssueOwner():
1755 return
1756 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001757 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001758 'as %s.\n'
1759 'Uploading may fail due to lack of permissions.' %
1760 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1761 confirm_or_exit(action='upload')
1762
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001763 def _PostUnsetIssueProperties(self):
1764 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001765 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001766
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001767 def GetGerritObjForPresubmit(self):
1768 return presubmit_support.GerritAccessor(self._GetGerritHost())
1769
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001771 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001772 or CQ status, assuming adherence to a common workflow.
1773
1774 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001775 * 'error' - error from review tool (including deleted issues)
1776 * 'unsent' - no reviewers added
1777 * 'waiting' - waiting for review
1778 * 'reply' - waiting for uploader to reply to review
1779 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001780 * 'dry-run' - dry-running in the CQ
1781 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001782 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 """
1784 if not self.GetIssue():
1785 return None
1786
1787 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001788 data = self._GetChangeDetail([
1789 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001790 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001791 return 'error'
1792
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001793 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001794 return 'closed'
1795
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001796 cq_label = data['labels'].get('Commit-Queue', {})
1797 max_cq_vote = 0
1798 for vote in cq_label.get('all', []):
1799 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1800 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001801 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001802 if max_cq_vote == 1:
1803 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804
Aaron Gable9ab38c62017-04-06 14:36:33 -07001805 if data['labels'].get('Code-Review', {}).get('approved'):
1806 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807
1808 if not data.get('reviewers', {}).get('REVIEWER', []):
1809 return 'unsent'
1810
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001811 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1813 last_message_author = messages.pop().get('author', {})
1814 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001815 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1816 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001818 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 if last_message_author.get('_account_id') == owner:
1820 # Most recent message was by owner.
1821 return 'waiting'
1822 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001823 # Some reply from non-owner.
1824 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001825
1826 # Somehow there are no messages even though there are reviewers.
1827 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001828
1829 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001830 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001831 patchset = data['revisions'][data['current_revision']]['_number']
1832 self.SetPatchset(patchset)
1833 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001834
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001835 def FetchDescription(self, force=False):
1836 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1837 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001838 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001839 return data['revisions'][current_rev]['commit']['message'].encode(
1840 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841
dsansomee2d6fd92016-09-08 00:10:47 -07001842 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001843 if gerrit_util.HasPendingChangeEdit(
1844 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001845 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001846 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001847 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001848 'unpublished edit. Either publish the edit in the Gerrit web UI '
1849 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001850
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001851 gerrit_util.DeletePendingChangeEdit(
1852 self._GetGerritHost(), self._GerritChangeIdentifier())
1853 gerrit_util.SetCommitMessage(
1854 self._GetGerritHost(), self._GerritChangeIdentifier(),
1855 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001856
Aaron Gable636b13f2017-07-14 10:42:48 -07001857 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001858 gerrit_util.SetReview(
1859 self._GetGerritHost(), self._GerritChangeIdentifier(),
1860 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001861
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001862 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001863 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001864 # CURRENT_REVISION is included to get the latest patchset so that
1865 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001866 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001867 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1868 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001869 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001870 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001871 robot_file_comments = gerrit_util.GetChangeRobotComments(
1872 self._GetGerritHost(), self._GerritChangeIdentifier())
1873
1874 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001875 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001876 latest_patch_set = self.GetMostRecentPatchset()
1877 for path, robot_comments in robot_file_comments.iteritems():
1878 line_comments = file_comments.setdefault(path, [])
1879 line_comments.extend(
1880 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001881
1882 # Build dictionary of file comments for easy access and sorting later.
1883 # {author+date: {path: {patchset: {line: url+message}}}}
1884 comments = collections.defaultdict(
1885 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1886 for path, line_comments in file_comments.iteritems():
1887 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001888 tag = comment.get('tag', '')
1889 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001890 continue
1891 key = (comment['author']['email'], comment['updated'])
1892 if comment.get('side', 'REVISION') == 'PARENT':
1893 patchset = 'Base'
1894 else:
1895 patchset = 'PS%d' % comment['patch_set']
1896 line = comment.get('line', 0)
1897 url = ('https://%s/c/%s/%s/%s#%s%s' %
1898 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1899 'b' if comment.get('side') == 'PARENT' else '',
1900 str(line) if line else ''))
1901 comments[key][path][patchset][line] = (url, comment['message'])
1902
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001904 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001905 summary = self._BuildCommentSummary(msg, comments, readable)
1906 if summary:
1907 summaries.append(summary)
1908 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001909
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001910 @staticmethod
1911 def _BuildCommentSummary(msg, comments, readable):
1912 key = (msg['author']['email'], msg['date'])
1913 # Don't bother showing autogenerated messages that don't have associated
1914 # file or line comments. this will filter out most autogenerated
1915 # messages, but will keep robot comments like those from Tricium.
1916 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1917 if is_autogenerated and not comments.get(key):
1918 return None
1919 message = msg['message']
1920 # Gerrit spits out nanoseconds.
1921 assert len(msg['date'].split('.')[-1]) == 9
1922 date = datetime.datetime.strptime(msg['date'][:-3],
1923 '%Y-%m-%d %H:%M:%S.%f')
1924 if key in comments:
1925 message += '\n'
1926 for path, patchsets in sorted(comments.get(key, {}).items()):
1927 if readable:
1928 message += '\n%s' % path
1929 for patchset, lines in sorted(patchsets.items()):
1930 for line, (url, content) in sorted(lines.items()):
1931 if line:
1932 line_str = 'Line %d' % line
1933 path_str = '%s:%d:' % (path, line)
1934 else:
1935 line_str = 'File comment'
1936 path_str = '%s:0:' % path
1937 if readable:
1938 message += '\n %s, %s: %s' % (patchset, line_str, url)
1939 message += '\n %s\n' % content
1940 else:
1941 message += '\n%s ' % path_str
1942 message += '\n%s\n' % content
1943
1944 return _CommentSummary(
1945 date=date,
1946 message=message,
1947 sender=msg['author']['email'],
1948 autogenerated=is_autogenerated,
1949 # These could be inferred from the text messages and correlated with
1950 # Code-Review label maximum, however this is not reliable.
1951 # Leaving as is until the need arises.
1952 approval=False,
1953 disapproval=False,
1954 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001955
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001956 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001957 gerrit_util.AbandonChange(
1958 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001960 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001961 gerrit_util.SubmitChange(
1962 self._GetGerritHost(), self._GerritChangeIdentifier(),
1963 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001964
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001965 def _GetChangeDetail(self, options=None, no_cache=False):
1966 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001967
1968 If fresh data is needed, set no_cache=True which will clear cache and
1969 thus new data will be fetched from Gerrit.
1970 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001971 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001972 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001973
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001974 # Optimization to avoid multiple RPCs:
1975 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1976 'CURRENT_COMMIT' not in options):
1977 options.append('CURRENT_COMMIT')
1978
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001979 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001980 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001981 options = [o.upper() for o in options]
1982
1983 # Check in cache first unless no_cache is True.
1984 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001985 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001986 else:
1987 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001988 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001989 # Assumption: data fetched before with extra options is suitable
1990 # for return for a smaller set of options.
1991 # For example, if we cached data for
1992 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1993 # and request is for options=[CURRENT_REVISION],
1994 # THEN we can return prior cached data.
1995 if options_set.issubset(cached_options_set):
1996 return data
1997
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001998 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001999 data = gerrit_util.GetChangeDetail(
2000 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002001 except gerrit_util.GerritError as e:
2002 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002003 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002004 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002005
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002006 self._detail_cache.setdefault(cache_key, []).append(
2007 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002008 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002009
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002010 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002011 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002012 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002013 data = gerrit_util.GetChangeCommit(
2014 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002015 except gerrit_util.GerritError as e:
2016 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002017 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002018 raise
agable32978d92016-11-01 12:55:02 -07002019 return data
2020
Karen Qian40c19422019-03-13 21:28:29 +00002021 def _IsCqConfigured(self):
2022 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002023 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002024 return False
2025 # TODO(crbug/753213): Remove temporary hack
2026 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002027 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002028 detail['branch'].startswith('refs/branch-heads/')):
2029 return False
2030 return True
2031
Olivier Robin75ee7252018-04-13 10:02:56 +02002032 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033 if git_common.is_dirty_git_tree('land'):
2034 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002035
tandriid60367b2016-06-22 05:25:12 -07002036 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002037 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002038 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002039 'which can test and land changes for you. '
2040 'Are you sure you wish to bypass it?\n',
2041 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002042 differs = True
tandriic4344b52016-08-29 06:04:54 -07002043 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 # Note: git diff outputs nothing if there is no diff.
2045 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002046 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002047 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002048 if detail['current_revision'] == last_upload:
2049 differs = False
2050 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002051 print('WARNING: Local branch contents differ from latest uploaded '
2052 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002053 if differs:
2054 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002055 confirm_or_exit(
2056 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2057 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002058 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 elif not bypass_hooks:
2060 hook_results = self.RunHook(
2061 committing=True,
2062 may_prompt=not force,
2063 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002064 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2065 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 if not hook_results.should_continue():
2067 return 1
2068
2069 self.SubmitIssue(wait_for_merge=True)
2070 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002071 links = self._GetChangeCommit().get('web_links', [])
2072 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002073 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002074 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002075 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002076 return 0
2077
Edward Lemurf38bc172019-09-03 21:02:13 +00002078 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002079 assert parsed_issue_arg.valid
2080
Edward Lemur125d60a2019-09-13 18:25:41 +00002081 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002082
2083 if parsed_issue_arg.hostname:
2084 self._gerrit_host = parsed_issue_arg.hostname
2085 self._gerrit_server = 'https://%s' % self._gerrit_host
2086
tandriic2405f52016-10-10 08:13:15 -07002087 try:
2088 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002089 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002090 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091
2092 if not parsed_issue_arg.patchset:
2093 # Use current revision by default.
2094 revision_info = detail['revisions'][detail['current_revision']]
2095 patchset = int(revision_info['_number'])
2096 else:
2097 patchset = parsed_issue_arg.patchset
2098 for revision_info in detail['revisions'].itervalues():
2099 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2100 break
2101 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002102 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 (parsed_issue_arg.patchset, self.GetIssue()))
2104
Edward Lemur125d60a2019-09-13 18:25:41 +00002105 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002106 if remote_url.endswith('.git'):
2107 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002108 remote_url = remote_url.rstrip('/')
2109
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002110 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002111 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002112
2113 if remote_url != fetch_info['url']:
2114 DieWithError('Trying to patch a change from %s but this repo appears '
2115 'to be %s.' % (fetch_info['url'], remote_url))
2116
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002118
Aaron Gable62619a32017-06-16 08:22:09 -07002119 if force:
2120 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2121 print('Checked out commit for change %i patchset %i locally' %
2122 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002123 elif nocommit:
2124 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2125 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002126 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002127 RunGit(['cherry-pick', 'FETCH_HEAD'])
2128 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002129 (parsed_issue_arg.issue, patchset))
2130 print('Note: this created a local commit which does not have '
2131 'the same hash as the one uploaded for review. This will make '
2132 'uploading changes based on top of this branch difficult.\n'
2133 'If you want to do that, use "git cl patch --force" instead.')
2134
Stefan Zagerd08043c2017-10-12 12:07:02 -07002135 if self.GetBranch():
2136 self.SetIssue(parsed_issue_arg.issue)
2137 self.SetPatchset(patchset)
2138 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2139 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2140 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2141 else:
2142 print('WARNING: You are in detached HEAD state.\n'
2143 'The patch has been applied to your checkout, but you will not be '
2144 'able to upload a new patch set to the gerrit issue.\n'
2145 'Try using the \'-b\' option if you would like to work on a '
2146 'branch and/or upload a new patch set.')
2147
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002148 return 0
2149
tandrii16e0b4e2016-06-07 10:34:28 -07002150 def _GerritCommitMsgHookCheck(self, offer_removal):
2151 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2152 if not os.path.exists(hook):
2153 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002154 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2155 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002156 data = gclient_utils.FileRead(hook)
2157 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2158 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002159 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002160 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002161 'and may interfere with it in subtle ways.\n'
2162 'We recommend you remove the commit-msg hook.')
2163 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002164 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002165 gclient_utils.rm_file_or_tree(hook)
2166 print('Gerrit commit-msg hook removed.')
2167 else:
2168 print('OK, will keep Gerrit commit-msg hook in place.')
2169
Edward Lemur1b52d872019-05-09 21:12:12 +00002170 def _CleanUpOldTraces(self):
2171 """Keep only the last |MAX_TRACES| traces."""
2172 try:
2173 traces = sorted([
2174 os.path.join(TRACES_DIR, f)
2175 for f in os.listdir(TRACES_DIR)
2176 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2177 and not f.startswith('tmp'))
2178 ])
2179 traces_to_delete = traces[:-MAX_TRACES]
2180 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002181 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002182 except OSError:
2183 print('WARNING: Failed to remove old git traces from\n'
2184 ' %s'
2185 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002186
Edward Lemur5737f022019-05-17 01:24:00 +00002187 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002188 """Zip and write the git push traces stored in traces_dir."""
2189 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002190 traces_zip = trace_name + '-traces'
2191 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002192 # Create a temporary dir to store git config and gitcookies in. It will be
2193 # compressed and stored next to the traces.
2194 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002195 git_info_zip = trace_name + '-git-info'
2196
Edward Lemur5737f022019-05-17 01:24:00 +00002197 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002198 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002199 git_push_metadata['now'] = git_push_metadata['now'].decode(
2200 sys.stdin.encoding)
2201
Edward Lemur1b52d872019-05-09 21:12:12 +00002202 git_push_metadata['trace_name'] = trace_name
2203 gclient_utils.FileWrite(
2204 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2205
2206 # Keep only the first 6 characters of the git hashes on the packet
2207 # trace. This greatly decreases size after compression.
2208 packet_traces = os.path.join(traces_dir, 'trace-packet')
2209 if os.path.isfile(packet_traces):
2210 contents = gclient_utils.FileRead(packet_traces)
2211 gclient_utils.FileWrite(
2212 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2213 shutil.make_archive(traces_zip, 'zip', traces_dir)
2214
2215 # Collect and compress the git config and gitcookies.
2216 git_config = RunGit(['config', '-l'])
2217 gclient_utils.FileWrite(
2218 os.path.join(git_info_dir, 'git-config'),
2219 git_config)
2220
2221 cookie_auth = gerrit_util.Authenticator.get()
2222 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2223 gitcookies_path = cookie_auth.get_gitcookies_path()
2224 if os.path.isfile(gitcookies_path):
2225 gitcookies = gclient_utils.FileRead(gitcookies_path)
2226 gclient_utils.FileWrite(
2227 os.path.join(git_info_dir, 'gitcookies'),
2228 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2229 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2230
Edward Lemur1b52d872019-05-09 21:12:12 +00002231 gclient_utils.rmtree(git_info_dir)
2232
2233 def _RunGitPushWithTraces(
2234 self, change_desc, refspec, refspec_opts, git_push_metadata):
2235 """Run git push and collect the traces resulting from the execution."""
2236 # Create a temporary directory to store traces in. Traces will be compressed
2237 # and stored in a 'traces' dir inside depot_tools.
2238 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002239 trace_name = os.path.join(
2240 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002241
2242 env = os.environ.copy()
2243 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2244 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002245 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002246 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2247 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2248 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2249
2250 try:
2251 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002252 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002253 before_push = time_time()
2254 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002255 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002256 env=env,
2257 print_stdout=True,
2258 # Flush after every line: useful for seeing progress when running as
2259 # recipe.
2260 filter_fn=lambda _: sys.stdout.flush())
2261 except subprocess2.CalledProcessError as e:
2262 push_returncode = e.returncode
2263 DieWithError('Failed to create a change. Please examine output above '
2264 'for the reason of the failure.\n'
2265 'Hint: run command below to diagnose common Git/Gerrit '
2266 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002267 ' git cl creds-check\n'
2268 '\n'
2269 'If git-cl is not working correctly, file a bug under the '
2270 'Infra>SDK component including the files below.\n'
2271 'Review the files before upload, since they might contain '
2272 'sensitive information.\n'
2273 'Set the Restrict-View-Google label so that they are not '
2274 'publicly accessible.\n'
2275 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002276 change_desc)
2277 finally:
2278 execution_time = time_time() - before_push
2279 metrics.collector.add_repeated('sub_commands', {
2280 'command': 'git push',
2281 'execution_time': execution_time,
2282 'exit_code': push_returncode,
2283 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2284 })
2285
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 git_push_metadata['execution_time'] = execution_time
2287 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002288 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289
Edward Lemur1b52d872019-05-09 21:12:12 +00002290 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002291 gclient_utils.rmtree(traces_dir)
2292
2293 return push_stdout
2294
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002295 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002296 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002297 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002298 # Load default for user, repo, squash=true, in this order.
2299 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002300
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002302 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002303 # This may be None; default fallback value is determined in logic below.
2304 title = options.title
2305
Dominic Battre7d1c4842017-10-27 09:17:28 +02002306 # Extract bug number from branch name.
2307 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002308 fixed = options.fixed
2309 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2310 self.GetBranch())
2311 if not bug and not fixed and match:
2312 if match.group('type') == 'bug':
2313 bug = match.group('bugnum')
2314 else:
2315 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002316
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002318 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002319 if self.GetIssue():
2320 # Try to get the message from a previous upload.
2321 message = self.GetDescription()
2322 if not message:
2323 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002324 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002326 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002327 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002328 # When uploading a subsequent patchset, -m|--message is taken
2329 # as the patchset title if --title was not provided.
2330 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002331 else:
2332 default_title = RunGit(
2333 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002334 if options.force:
2335 title = default_title
2336 else:
2337 title = ask_for_data(
2338 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002339 change_id = self._GetChangeDetail()['change_id']
2340 while True:
2341 footer_change_ids = git_footers.get_footer_change_id(message)
2342 if footer_change_ids == [change_id]:
2343 break
2344 if not footer_change_ids:
2345 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002346 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 continue
2348 # There is already a valid footer but with different or several ids.
2349 # Doing this automatically is non-trivial as we don't want to lose
2350 # existing other footers, yet we want to append just 1 desired
2351 # Change-Id. Thus, just create a new footer, but let user verify the
2352 # new description.
2353 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002354 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002356 print(
2357 'WARNING: change %s has Change-Id footer(s):\n'
2358 ' %s\n'
2359 'but change has Change-Id %s, according to Gerrit.\n'
2360 'Please, check the proposed correction to the description, '
2361 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2362 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2363 change_id))
2364 confirm_or_exit(action='edit')
2365 change_desc.prompt()
2366
2367 message = change_desc.description
2368 if not message:
2369 DieWithError("Description is empty. Aborting...")
2370
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 # Continue the while loop.
2372 # Sanity check of this code - we should end up with proper message
2373 # footer.
2374 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002375 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002376 else: # if not self.GetIssue()
2377 if options.message:
2378 message = options.message
2379 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002380 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002381 if options.title:
2382 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002383 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002385 change_desc.prompt()
2386
Aaron Gableb56ad332017-01-06 15:24:31 -08002387 # On first upload, patchset title is always this string, while
2388 # --title flag gets converted to first line of message.
2389 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002390 if not change_desc.description:
2391 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002392 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 if len(change_ids) > 1:
2394 DieWithError('too many Change-Id footers, at most 1 allowed.')
2395 if not change_ids:
2396 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002397 change_desc.set_description(git_footers.add_footer_change_id(
2398 change_desc.description,
2399 GenerateGerritChangeId(change_desc.description)))
2400 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002401 assert len(change_ids) == 1
2402 change_id = change_ids[0]
2403
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002404 if options.reviewers or options.tbrs or options.add_owners_to:
2405 change_desc.update_reviewers(options.reviewers, options.tbrs,
2406 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002407 if options.preserve_tryjobs:
2408 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002409
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002411 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2412 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002414 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2415 desc_tempfile.write(change_desc.description)
2416 desc_tempfile.close()
2417 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2418 '-F', desc_tempfile.name]).strip()
2419 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002420 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002421 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002422 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002423 if not change_desc.description:
2424 DieWithError("Description is empty. Aborting...")
2425
2426 if not git_footers.get_footer_change_id(change_desc.description):
2427 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002428 change_desc.set_description(
2429 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002430 if options.reviewers or options.tbrs or options.add_owners_to:
2431 change_desc.update_reviewers(options.reviewers, options.tbrs,
2432 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002434 # For no-squash mode, we assume the remote called "origin" is the one we
2435 # want. It is not worthwhile to support different workflows for
2436 # no-squash mode.
2437 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2439
2440 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002441 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002442 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2443 ref_to_push)]).splitlines()
2444 if len(commits) > 1:
2445 print('WARNING: This will upload %d commits. Run the following command '
2446 'to see which commits will be uploaded: ' % len(commits))
2447 print('git log %s..%s' % (parent, ref_to_push))
2448 print('You can also use `git squash-branch` to squash these into a '
2449 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002450 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002451
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002452 if options.reviewers or options.tbrs or options.add_owners_to:
2453 change_desc.update_reviewers(options.reviewers, options.tbrs,
2454 options.add_owners_to, change)
2455
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002456 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002457 cc = []
2458 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2459 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2460 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002461 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002462 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002463 if options.cc:
2464 cc.extend(options.cc)
2465 cc = filter(None, [email.strip() for email in cc])
2466 if change_desc.get_cced():
2467 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002468 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2469 valid_accounts = set(reviewers + cc)
2470 # TODO(crbug/877717): relax this for all hosts.
2471 else:
2472 valid_accounts = gerrit_util.ValidAccounts(
2473 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002474 logging.info('accounts %s are recognized, %s invalid',
2475 sorted(valid_accounts),
2476 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002477
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002478 # Extra options that can be specified at push time. Doc:
2479 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002480 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002481
Aaron Gable844cf292017-06-28 11:32:59 -07002482 # By default, new changes are started in WIP mode, and subsequent patchsets
2483 # don't send email. At any time, passing --send-mail will mark the change
2484 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002485 if options.send_mail:
2486 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002487 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002488 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002489 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002490 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002491 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002492
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002493 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002494 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002495
Aaron Gable9b713dd2016-12-14 16:04:21 -08002496 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002497 # Punctuation and whitespace in |title| must be percent-encoded.
2498 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002499
agablec6787972016-09-09 16:13:34 -07002500 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002501 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002502
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002503 for r in sorted(reviewers):
2504 if r in valid_accounts:
2505 refspec_opts.append('r=%s' % r)
2506 reviewers.remove(r)
2507 else:
2508 # TODO(tandrii): this should probably be a hard failure.
2509 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2510 % r)
2511 for c in sorted(cc):
2512 # refspec option will be rejected if cc doesn't correspond to an
2513 # account, even though REST call to add such arbitrary cc may succeed.
2514 if c in valid_accounts:
2515 refspec_opts.append('cc=%s' % c)
2516 cc.remove(c)
2517
rmistry9eadede2016-09-19 11:22:43 -07002518 if options.topic:
2519 # Documentation on Gerrit topics is here:
2520 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002521 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002522
Edward Lemur687ca902018-12-05 02:30:30 +00002523 if options.enable_auto_submit:
2524 refspec_opts.append('l=Auto-Submit+1')
2525 if options.use_commit_queue:
2526 refspec_opts.append('l=Commit-Queue+2')
2527 elif options.cq_dry_run:
2528 refspec_opts.append('l=Commit-Queue+1')
2529
2530 if change_desc.get_reviewers(tbr_only=True):
2531 score = gerrit_util.GetCodeReviewTbrScore(
2532 self._GetGerritHost(),
2533 self._GetGerritProject())
2534 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002535
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002536 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002537 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002538 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002539 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002540 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2541
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002542 refspec_suffix = ''
2543 if refspec_opts:
2544 refspec_suffix = '%' + ','.join(refspec_opts)
2545 assert ' ' not in refspec_suffix, (
2546 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2547 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2548
Edward Lemur1b52d872019-05-09 21:12:12 +00002549 git_push_metadata = {
2550 'gerrit_host': self._GetGerritHost(),
2551 'title': title or '<untitled>',
2552 'change_id': change_id,
2553 'description': change_desc.description,
2554 }
2555 push_stdout = self._RunGitPushWithTraces(
2556 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002557
2558 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002559 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002560 change_numbers = [m.group(1)
2561 for m in map(regex.match, push_stdout.splitlines())
2562 if m]
2563 if len(change_numbers) != 1:
2564 DieWithError(
2565 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002566 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002567 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002568 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002569
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002570 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002571 # GetIssue() is not set in case of non-squash uploads according to tests.
2572 # TODO(agable): non-squash uploads in git cl should be removed.
2573 gerrit_util.AddReviewers(
2574 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002575 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002576 reviewers, cc,
2577 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002578
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002579 return 0
2580
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002581 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2582 change_desc):
2583 """Computes parent of the generated commit to be uploaded to Gerrit.
2584
2585 Returns revision or a ref name.
2586 """
2587 if custom_cl_base:
2588 # Try to avoid creating additional unintended CLs when uploading, unless
2589 # user wants to take this risk.
2590 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2591 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2592 local_ref_of_target_remote])
2593 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002594 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002595 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2596 'If you proceed with upload, more than 1 CL may be created by '
2597 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2598 'If you are certain that specified base `%s` has already been '
2599 'uploaded to Gerrit as another CL, you may proceed.\n' %
2600 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2601 if not force:
2602 confirm_or_exit(
2603 'Do you take responsibility for cleaning up potential mess '
2604 'resulting from proceeding with upload?',
2605 action='upload')
2606 return custom_cl_base
2607
Aaron Gablef97e33d2017-03-30 15:44:27 -07002608 if remote != '.':
2609 return self.GetCommonAncestorWithUpstream()
2610
2611 # If our upstream branch is local, we base our squashed commit on its
2612 # squashed version.
2613 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2614
Aaron Gablef97e33d2017-03-30 15:44:27 -07002615 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002616 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002617
2618 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002619 # TODO(tandrii): consider checking parent change in Gerrit and using its
2620 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2621 # the tree hash of the parent branch. The upside is less likely bogus
2622 # requests to reupload parent change just because it's uploadhash is
2623 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002624 parent = RunGit(['config',
2625 'branch.%s.gerritsquashhash' % upstream_branch_name],
2626 error_ok=True).strip()
2627 # Verify that the upstream branch has been uploaded too, otherwise
2628 # Gerrit will create additional CLs when uploading.
2629 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2630 RunGitSilent(['rev-parse', parent + ':'])):
2631 DieWithError(
2632 '\nUpload upstream branch %s first.\n'
2633 'It is likely that this branch has been rebased since its last '
2634 'upload, so you just need to upload it again.\n'
2635 '(If you uploaded it with --no-squash, then branch dependencies '
2636 'are not supported, and you should reupload with --squash.)'
2637 % upstream_branch_name,
2638 change_desc)
2639 return parent
2640
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002641 def _AddChangeIdToCommitMessage(self, options, args):
2642 """Re-commits using the current message, assumes the commit hook is in
2643 place.
2644 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002645 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002646 git_command = ['commit', '--amend', '-m', log_desc]
2647 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002648 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002649 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002650 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002651 return new_log_desc
2652 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002653 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002654
tandriie113dfd2016-10-11 10:20:12 -07002655 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002656 try:
2657 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002658 except GerritChangeNotExists:
2659 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002660
2661 if data['status'] in ('ABANDONED', 'MERGED'):
2662 return 'CL %s is closed' % self.GetIssue()
2663
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002664 def GetGerritChange(self, patchset=None):
2665 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2666 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2667 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002668 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002669 data = self._GetChangeDetail(['ALL_REVISIONS'])
2670
2671 assert host and issue and patchset, 'CL must be uploaded first'
2672
2673 has_patchset = any(
2674 int(revision_data['_number']) == patchset
2675 for revision_data in data['revisions'].itervalues())
2676 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002677 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002678 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002679
tandrii8c5a3532016-11-04 07:52:02 -07002680 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002681 'host': host,
2682 'change': issue,
2683 'project': data['project'],
2684 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002685 }
tandriie113dfd2016-10-11 10:20:12 -07002686
tandriide281ae2016-10-12 06:02:30 -07002687 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002688 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002689
Edward Lemur707d70b2018-02-07 00:50:14 +01002690 def GetReviewers(self):
2691 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002692 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002693
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002694
2695_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002696 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002697}
2698
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002699
iannuccie53c9352016-08-17 14:40:40 -07002700def _add_codereview_issue_select_options(parser, extra=""):
2701 _add_codereview_select_options(parser)
2702
2703 text = ('Operate on this issue number instead of the current branch\'s '
2704 'implicit issue.')
2705 if extra:
2706 text += ' '+extra
2707 parser.add_option('-i', '--issue', type=int, help=text)
2708
2709
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002710def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002711 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002712 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002713 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002714 parser.add_option_group(parser.codereview_group)
2715 parser.codereview_group.add_option(
2716 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002717 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002718
2719
tandriif9aefb72016-07-01 09:06:51 -07002720def _get_bug_line_values(default_project, bugs):
2721 """Given default_project and comma separated list of bugs, yields bug line
2722 values.
2723
2724 Each bug can be either:
2725 * a number, which is combined with default_project
2726 * string, which is left as is.
2727
2728 This function may produce more than one line, because bugdroid expects one
2729 project per line.
2730
2731 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2732 ['v8:123', 'chromium:789']
2733 """
2734 default_bugs = []
2735 others = []
2736 for bug in bugs.split(','):
2737 bug = bug.strip()
2738 if bug:
2739 try:
2740 default_bugs.append(int(bug))
2741 except ValueError:
2742 others.append(bug)
2743
2744 if default_bugs:
2745 default_bugs = ','.join(map(str, default_bugs))
2746 if default_project:
2747 yield '%s:%s' % (default_project, default_bugs)
2748 else:
2749 yield default_bugs
2750 for other in sorted(others):
2751 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2752 yield other
2753
2754
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002755class ChangeDescription(object):
2756 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002757 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002758 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002759 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002760 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002761 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002762 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2763 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2764 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2765 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002766
Dan Beamd8b04ca2019-10-10 21:23:26 +00002767 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002768 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002769 if bug:
2770 regexp = re.compile(self.BUG_LINE)
2771 prefix = settings.GetBugPrefix()
2772 if not any((regexp.match(line) for line in self._description_lines)):
2773 values = list(_get_bug_line_values(prefix, bug))
2774 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002775 if fixed:
2776 regexp = re.compile(self.FIXED_LINE)
2777 prefix = settings.GetBugPrefix()
2778 if not any((regexp.match(line) for line in self._description_lines)):
2779 values = list(_get_bug_line_values(prefix, fixed))
2780 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002781
agable@chromium.org42c20792013-09-12 17:34:49 +00002782 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002783 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002784 return '\n'.join(self._description_lines)
2785
2786 def set_description(self, desc):
2787 if isinstance(desc, basestring):
2788 lines = desc.splitlines()
2789 else:
2790 lines = [line.rstrip() for line in desc]
2791 while lines and not lines[0]:
2792 lines.pop(0)
2793 while lines and not lines[-1]:
2794 lines.pop(-1)
2795 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002796
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2798 """Rewrites the R=/TBR= line(s) as a single line each.
2799
2800 Args:
2801 reviewers (list(str)) - list of additional emails to use for reviewers.
2802 tbrs (list(str)) - list of additional emails to use for TBRs.
2803 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2804 the change that are missing OWNER coverage. If this is not None, you
2805 must also pass a value for `change`.
2806 change (Change) - The Change that should be used for OWNERS lookups.
2807 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002808 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002809 assert isinstance(tbrs, list), tbrs
2810
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002811 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002812 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002813
2814 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002815 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002816
2817 reviewers = set(reviewers)
2818 tbrs = set(tbrs)
2819 LOOKUP = {
2820 'TBR': tbrs,
2821 'R': reviewers,
2822 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002823
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002824 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002825 regexp = re.compile(self.R_LINE)
2826 matches = [regexp.match(line) for line in self._description_lines]
2827 new_desc = [l for i, l in enumerate(self._description_lines)
2828 if not matches[i]]
2829 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002830
agable@chromium.org42c20792013-09-12 17:34:49 +00002831 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002832
2833 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002834 for match in matches:
2835 if not match:
2836 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002837 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2838
2839 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002840 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002841 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002842 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002843 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002844 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002845 LOOKUP[add_owners_to].update(
2846 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002847
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002848 # If any folks ended up in both groups, remove them from tbrs.
2849 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002850
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002851 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2852 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002853
2854 # Put the new lines in the description where the old first R= line was.
2855 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2856 if 0 <= line_loc < len(self._description_lines):
2857 if new_tbr_line:
2858 self._description_lines.insert(line_loc, new_tbr_line)
2859 if new_r_line:
2860 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002861 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002862 if new_r_line:
2863 self.append_footer(new_r_line)
2864 if new_tbr_line:
2865 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002867 def set_preserve_tryjobs(self):
2868 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2869 footers = git_footers.parse_footers(self.description)
2870 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2871 if v.lower() == 'true':
2872 return
2873 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2874
Anthony Polito8b955342019-09-24 19:01:36 +00002875 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002876 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002877 self.set_description([
2878 '# Enter a description of the change.',
2879 '# This will be displayed on the codereview site.',
2880 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002881 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002882 '--------------------',
2883 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002884 bug_regexp = re.compile(self.BUG_LINE)
2885 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002886 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002887 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2888 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002889 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002890
agable@chromium.org42c20792013-09-12 17:34:49 +00002891 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002892 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002893 if not content:
2894 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002895 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002896
Bruce Dawson2377b012018-01-11 16:46:49 -08002897 # Strip off comments and default inserted "Bug:" line.
2898 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002899 (line.startswith('#') or
2900 line.rstrip() == "Bug:" or
2901 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002903 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002904 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002905
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002906 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002907 """Adds a footer line to the description.
2908
2909 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2910 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2911 that Gerrit footers are always at the end.
2912 """
2913 parsed_footer_line = git_footers.parse_footer(line)
2914 if parsed_footer_line:
2915 # Line is a gerrit footer in the form: Footer-Key: any value.
2916 # Thus, must be appended observing Gerrit footer rules.
2917 self.set_description(
2918 git_footers.add_footer(self.description,
2919 key=parsed_footer_line[0],
2920 value=parsed_footer_line[1]))
2921 return
2922
2923 if not self._description_lines:
2924 self._description_lines.append(line)
2925 return
2926
2927 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2928 if gerrit_footers:
2929 # git_footers.split_footers ensures that there is an empty line before
2930 # actual (gerrit) footers, if any. We have to keep it that way.
2931 assert top_lines and top_lines[-1] == ''
2932 top_lines, separator = top_lines[:-1], top_lines[-1:]
2933 else:
2934 separator = [] # No need for separator if there are no gerrit_footers.
2935
2936 prev_line = top_lines[-1] if top_lines else ''
2937 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2938 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2939 top_lines.append('')
2940 top_lines.append(line)
2941 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002942
tandrii99a72f22016-08-17 14:33:24 -07002943 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002944 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002945 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002946 reviewers = [match.group(2).strip()
2947 for match in matches
2948 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002949 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002950
bradnelsond975b302016-10-23 12:20:23 -07002951 def get_cced(self):
2952 """Retrieves the list of reviewers."""
2953 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2954 cced = [match.group(2).strip() for match in matches if match]
2955 return cleanup_list(cced)
2956
Nodir Turakulov23b82142017-11-16 11:04:25 -08002957 def get_hash_tags(self):
2958 """Extracts and sanitizes a list of Gerrit hashtags."""
2959 subject = (self._description_lines or ('',))[0]
2960 subject = re.sub(
2961 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2962
2963 tags = []
2964 start = 0
2965 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2966 while True:
2967 m = bracket_exp.match(subject, start)
2968 if not m:
2969 break
2970 tags.append(self.sanitize_hash_tag(m.group(1)))
2971 start = m.end()
2972
2973 if not tags:
2974 # Try "Tag: " prefix.
2975 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2976 if m:
2977 tags.append(self.sanitize_hash_tag(m.group(1)))
2978 return tags
2979
2980 @classmethod
2981 def sanitize_hash_tag(cls, tag):
2982 """Returns a sanitized Gerrit hash tag.
2983
2984 A sanitized hashtag can be used as a git push refspec parameter value.
2985 """
2986 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2987
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002988 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2989 """Updates this commit description given the parent.
2990
2991 This is essentially what Gnumbd used to do.
2992 Consult https://goo.gl/WMmpDe for more details.
2993 """
2994 assert parent_msg # No, orphan branch creation isn't supported.
2995 assert parent_hash
2996 assert dest_ref
2997 parent_footer_map = git_footers.parse_footers(parent_msg)
2998 # This will also happily parse svn-position, which GnumbD is no longer
2999 # supporting. While we'd generate correct footers, the verifier plugin
3000 # installed in Gerrit will block such commit (ie git push below will fail).
3001 parent_position = git_footers.get_position(parent_footer_map)
3002
3003 # Cherry-picks may have last line obscuring their prior footers,
3004 # from git_footers perspective. This is also what Gnumbd did.
3005 cp_line = None
3006 if (self._description_lines and
3007 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3008 cp_line = self._description_lines.pop()
3009
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003010 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003011
3012 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3013 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003014 for i, line in enumerate(footer_lines):
3015 k, v = git_footers.parse_footer(line) or (None, None)
3016 if k and k.startswith('Cr-'):
3017 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003018
3019 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003020 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003021 if parent_position[0] == dest_ref:
3022 # Same branch as parent.
3023 number = int(parent_position[1]) + 1
3024 else:
3025 number = 1 # New branch, and extra lineage.
3026 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3027 int(parent_position[1])))
3028
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003029 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3030 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003031
3032 self._description_lines = top_lines
3033 if cp_line:
3034 self._description_lines.append(cp_line)
3035 if self._description_lines[-1] != '':
3036 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003037 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003038
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003039
Aaron Gablea1bab272017-04-11 16:38:18 -07003040def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003041 """Retrieves the reviewers that approved a CL from the issue properties with
3042 messages.
3043
3044 Note that the list may contain reviewers that are not committer, thus are not
3045 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003046
3047 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003048 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003049 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003050 return sorted(
3051 set(
3052 message['sender']
3053 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003054 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003055 )
3056 )
3057
3058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003059def FindCodereviewSettingsFile(filename='codereview.settings'):
3060 """Finds the given file starting in the cwd and going up.
3061
3062 Only looks up to the top of the repository unless an
3063 'inherit-review-settings-ok' file exists in the root of the repository.
3064 """
3065 inherit_ok_file = 'inherit-review-settings-ok'
3066 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003067 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003068 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3069 root = '/'
3070 while True:
3071 if filename in os.listdir(cwd):
3072 if os.path.isfile(os.path.join(cwd, filename)):
3073 return open(os.path.join(cwd, filename))
3074 if cwd == root:
3075 break
3076 cwd = os.path.dirname(cwd)
3077
3078
3079def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003080 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003081 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003082
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003083 def SetProperty(name, setting, unset_error_ok=False):
3084 fullname = 'rietveld.' + name
3085 if setting in keyvals:
3086 RunGit(['config', fullname, keyvals[setting]])
3087 else:
3088 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3089
tandrii48df5812016-10-17 03:55:37 -07003090 if not keyvals.get('GERRIT_HOST', False):
3091 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003092 # Only server setting is required. Other settings can be absent.
3093 # In that case, we ignore errors raised during option deletion attempt.
3094 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3095 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3096 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003097 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003098 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3099 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003100 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3101 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003102
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003103 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003104 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003105
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003106 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003107 RunGit(['config', 'gerrit.squash-uploads',
3108 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003109
tandrii@chromium.org28253532016-04-14 13:46:56 +00003110 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003111 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003112 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003114 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003115 # should be of the form
3116 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3117 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003118 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3119 keyvals['ORIGIN_URL_CONFIG']])
3120
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003121
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003122def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003123 """Downloads a network object to a local file, like urllib.urlretrieve.
3124
3125 This is necessary because urllib is broken for SSL connections via a proxy.
3126 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003127 with open(destination, 'w') as f:
3128 f.write(urllib2.urlopen(source).read())
3129
3130
ukai@chromium.org712d6102013-11-27 00:52:58 +00003131def hasSheBang(fname):
3132 """Checks fname is a #! script."""
3133 with open(fname) as f:
3134 return f.read(2).startswith('#!')
3135
3136
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003137# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3138def DownloadHooks(*args, **kwargs):
3139 pass
3140
3141
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003142def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003143 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003144
3145 Args:
3146 force: True to update hooks. False to install hooks if not present.
3147 """
3148 if not settings.GetIsGerrit():
3149 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003150 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003151 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3152 if not os.access(dst, os.X_OK):
3153 if os.path.exists(dst):
3154 if not force:
3155 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003156 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003157 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003158 if not hasSheBang(dst):
3159 DieWithError('Not a script: %s\n'
3160 'You need to download from\n%s\n'
3161 'into .git/hooks/commit-msg and '
3162 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003163 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3164 except Exception:
3165 if os.path.exists(dst):
3166 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003167 DieWithError('\nFailed to download hooks.\n'
3168 'You need to download from\n%s\n'
3169 'into .git/hooks/commit-msg and '
3170 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003171
3172
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003173class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003174 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003175
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003176 _GOOGLESOURCE = 'googlesource.com'
3177
3178 def __init__(self):
3179 # Cached list of [host, identity, source], where source is either
3180 # .gitcookies or .netrc.
3181 self._all_hosts = None
3182
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003183 def ensure_configured_gitcookies(self):
3184 """Runs checks and suggests fixes to make git use .gitcookies from default
3185 path."""
3186 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3187 configured_path = RunGitSilent(
3188 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003189 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003190 if configured_path:
3191 self._ensure_default_gitcookies_path(configured_path, default)
3192 else:
3193 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003194
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003195 @staticmethod
3196 def _ensure_default_gitcookies_path(configured_path, default_path):
3197 assert configured_path
3198 if configured_path == default_path:
3199 print('git is already configured to use your .gitcookies from %s' %
3200 configured_path)
3201 return
3202
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003203 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003204 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3205 (configured_path, default_path))
3206
3207 if not os.path.exists(configured_path):
3208 print('However, your configured .gitcookies file is missing.')
3209 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3210 action='reconfigure')
3211 RunGit(['config', '--global', 'http.cookiefile', default_path])
3212 return
3213
3214 if os.path.exists(default_path):
3215 print('WARNING: default .gitcookies file already exists %s' %
3216 default_path)
3217 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3218 default_path)
3219
3220 confirm_or_exit('Move existing .gitcookies to default location?',
3221 action='move')
3222 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003223 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003224 print('Moved and reconfigured git to use .gitcookies from %s' %
3225 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003226
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003227 @staticmethod
3228 def _configure_gitcookies_path(default_path):
3229 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3230 if os.path.exists(netrc_path):
3231 print('You seem to be using outdated .netrc for git credentials: %s' %
3232 netrc_path)
3233 print('This tool will guide you through setting up recommended '
3234 '.gitcookies store for git credentials.\n'
3235 '\n'
3236 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3237 ' git config --global --unset http.cookiefile\n'
3238 ' mv %s %s.backup\n\n' % (default_path, default_path))
3239 confirm_or_exit(action='setup .gitcookies')
3240 RunGit(['config', '--global', 'http.cookiefile', default_path])
3241 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003242
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003243 def get_hosts_with_creds(self, include_netrc=False):
3244 if self._all_hosts is None:
3245 a = gerrit_util.CookiesAuthenticator()
3246 self._all_hosts = [
3247 (h, u, s)
3248 for h, u, s in itertools.chain(
3249 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3250 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3251 )
3252 if h.endswith(self._GOOGLESOURCE)
3253 ]
3254
3255 if include_netrc:
3256 return self._all_hosts
3257 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3258
3259 def print_current_creds(self, include_netrc=False):
3260 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3261 if not hosts:
3262 print('No Git/Gerrit credentials found')
3263 return
3264 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3265 header = [('Host', 'User', 'Which file'),
3266 ['=' * l for l in lengths]]
3267 for row in (header + hosts):
3268 print('\t'.join((('%%+%ds' % l) % s)
3269 for l, s in zip(lengths, row)))
3270
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003271 @staticmethod
3272 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003273 """Parses identity "git-<username>.domain" into <username> and domain."""
3274 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003275 # distinguishable from sub-domains. But we do know typical domains:
3276 if identity.endswith('.chromium.org'):
3277 domain = 'chromium.org'
3278 username = identity[:-len('.chromium.org')]
3279 else:
3280 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003281 if username.startswith('git-'):
3282 username = username[len('git-'):]
3283 return username, domain
3284
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003285 def _canonical_git_googlesource_host(self, host):
3286 """Normalizes Gerrit hosts (with '-review') to Git host."""
3287 assert host.endswith(self._GOOGLESOURCE)
3288 # Prefix doesn't include '.' at the end.
3289 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3290 if prefix.endswith('-review'):
3291 prefix = prefix[:-len('-review')]
3292 return prefix + '.' + self._GOOGLESOURCE
3293
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003294 def _canonical_gerrit_googlesource_host(self, host):
3295 git_host = self._canonical_git_googlesource_host(host)
3296 prefix = git_host.split('.', 1)[0]
3297 return prefix + '-review.' + self._GOOGLESOURCE
3298
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003299 def _get_counterpart_host(self, host):
3300 assert host.endswith(self._GOOGLESOURCE)
3301 git = self._canonical_git_googlesource_host(host)
3302 gerrit = self._canonical_gerrit_googlesource_host(git)
3303 return git if gerrit == host else gerrit
3304
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003305 def has_generic_host(self):
3306 """Returns whether generic .googlesource.com has been configured.
3307
3308 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3309 """
3310 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3311 if host == '.' + self._GOOGLESOURCE:
3312 return True
3313 return False
3314
3315 def _get_git_gerrit_identity_pairs(self):
3316 """Returns map from canonic host to pair of identities (Git, Gerrit).
3317
3318 One of identities might be None, meaning not configured.
3319 """
3320 host_to_identity_pairs = {}
3321 for host, identity, _ in self.get_hosts_with_creds():
3322 canonical = self._canonical_git_googlesource_host(host)
3323 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3324 idx = 0 if canonical == host else 1
3325 pair[idx] = identity
3326 return host_to_identity_pairs
3327
3328 def get_partially_configured_hosts(self):
3329 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003330 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3331 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3332 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003333
3334 def get_conflicting_hosts(self):
3335 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003336 host
3337 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003338 if None not in (i1, i2) and i1 != i2)
3339
3340 def get_duplicated_hosts(self):
3341 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3342 return set(host for host, count in counters.iteritems() if count > 1)
3343
3344 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3345 'chromium.googlesource.com': 'chromium.org',
3346 'chrome-internal.googlesource.com': 'google.com',
3347 }
3348
3349 def get_hosts_with_wrong_identities(self):
3350 """Finds hosts which **likely** reference wrong identities.
3351
3352 Note: skips hosts which have conflicting identities for Git and Gerrit.
3353 """
3354 hosts = set()
3355 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3356 pair = self._get_git_gerrit_identity_pairs().get(host)
3357 if pair and pair[0] == pair[1]:
3358 _, domain = self._parse_identity(pair[0])
3359 if domain != expected:
3360 hosts.add(host)
3361 return hosts
3362
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003363 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003364 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003365 hosts = sorted(hosts)
3366 assert hosts
3367 if extra_column_func is None:
3368 extras = [''] * len(hosts)
3369 else:
3370 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003371 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3372 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003373 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003374 lines.append(tmpl % he)
3375 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003376
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003377 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003378 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003379 yield ('.googlesource.com wildcard record detected',
3380 ['Chrome Infrastructure team recommends to list full host names '
3381 'explicitly.'],
3382 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003383
3384 dups = self.get_duplicated_hosts()
3385 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003386 yield ('The following hosts were defined twice',
3387 self._format_hosts(dups),
3388 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003389
3390 partial = self.get_partially_configured_hosts()
3391 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003392 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3393 'These hosts are missing',
3394 self._format_hosts(partial, lambda host: 'but %s defined' %
3395 self._get_counterpart_host(host)),
3396 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003397
3398 conflicting = self.get_conflicting_hosts()
3399 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003400 yield ('The following Git hosts have differing credentials from their '
3401 'Gerrit counterparts',
3402 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3403 tuple(self._get_git_gerrit_identity_pairs()[host])),
3404 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003405
3406 wrong = self.get_hosts_with_wrong_identities()
3407 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 yield ('These hosts likely use wrong identity',
3409 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3410 (self._get_git_gerrit_identity_pairs()[host][0],
3411 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3412 wrong)
3413
3414 def find_and_report_problems(self):
3415 """Returns True if there was at least one problem, else False."""
3416 found = False
3417 bad_hosts = set()
3418 for title, sublines, hosts in self._find_problems():
3419 if not found:
3420 found = True
3421 print('\n\n.gitcookies problem report:\n')
3422 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003423 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003424 if sublines:
3425 print()
3426 print(' %s' % '\n '.join(sublines))
3427 print()
3428
3429 if bad_hosts:
3430 assert found
3431 print(' You can manually remove corresponding lines in your %s file and '
3432 'visit the following URLs with correct account to generate '
3433 'correct credential lines:\n' %
3434 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3435 print(' %s' % '\n '.join(sorted(set(
3436 gerrit_util.CookiesAuthenticator().get_new_password_url(
3437 self._canonical_git_googlesource_host(host))
3438 for host in bad_hosts
3439 ))))
3440 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003441
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003442
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003443@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003444def CMDcreds_check(parser, args):
3445 """Checks credentials and suggests changes."""
3446 _, _ = parser.parse_args(args)
3447
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003448 # Code below checks .gitcookies. Abort if using something else.
3449 authn = gerrit_util.Authenticator.get()
3450 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3451 if isinstance(authn, gerrit_util.GceAuthenticator):
3452 DieWithError(
3453 'This command is not designed for GCE, are you on a bot?\n'
3454 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3455 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003456 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003457 'This command is not designed for bot environment. It checks '
3458 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003459
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003460 checker = _GitCookiesChecker()
3461 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003462
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003463 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003464 checker.print_current_creds(include_netrc=True)
3465
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003466 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003467 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003468 return 0
3469 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003470
3471
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003472@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003473def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003474 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003475 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3476 branch = ShortBranchName(branchref)
3477 _, args = parser.parse_args(args)
3478 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003479 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003480 return RunGit(['config', 'branch.%s.base-url' % branch],
3481 error_ok=False).strip()
3482 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003483 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003484 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3485 error_ok=False).strip()
3486
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003487
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003488def color_for_status(status):
3489 """Maps a Changelist status to color, for CMDstatus and other tools."""
3490 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003491 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003492 'waiting': Fore.BLUE,
3493 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003494 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003495 'lgtm': Fore.GREEN,
3496 'commit': Fore.MAGENTA,
3497 'closed': Fore.CYAN,
3498 'error': Fore.WHITE,
3499 }.get(status, Fore.WHITE)
3500
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003501
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003502def get_cl_statuses(changes, fine_grained, max_processes=None):
3503 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003504
3505 If fine_grained is true, this will fetch CL statuses from the server.
3506 Otherwise, simply indicate if there's a matching url for the given branches.
3507
3508 If max_processes is specified, it is used as the maximum number of processes
3509 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3510 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003511
3512 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003513 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003514 if not changes:
3515 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003516
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003517 if not fine_grained:
3518 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003519 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003520 for cl in changes:
3521 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003522 return
3523
3524 # First, sort out authentication issues.
3525 logging.debug('ensuring credentials exist')
3526 for cl in changes:
3527 cl.EnsureAuthenticated(force=False, refresh=True)
3528
3529 def fetch(cl):
3530 try:
3531 return (cl, cl.GetStatus())
3532 except:
3533 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003534 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003535 raise
3536
3537 threads_count = len(changes)
3538 if max_processes:
3539 threads_count = max(1, min(threads_count, max_processes))
3540 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3541
3542 pool = ThreadPool(threads_count)
3543 fetched_cls = set()
3544 try:
3545 it = pool.imap_unordered(fetch, changes).__iter__()
3546 while True:
3547 try:
3548 cl, status = it.next(timeout=5)
3549 except multiprocessing.TimeoutError:
3550 break
3551 fetched_cls.add(cl)
3552 yield cl, status
3553 finally:
3554 pool.close()
3555
3556 # Add any branches that failed to fetch.
3557 for cl in set(changes) - fetched_cls:
3558 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003559
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560
3561def upload_branch_deps(cl, args):
3562 """Uploads CLs of local branches that are dependents of the current branch.
3563
3564 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003565
3566 test1 -> test2.1 -> test3.1
3567 -> test3.2
3568 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003569
3570 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3571 run on the dependent branches in this order:
3572 test2.1, test3.1, test3.2, test2.2, test3.3
3573
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003574 Note: This function does not rebase your local dependent branches. Use it
3575 when you make a change to the parent branch that will not conflict
3576 with its dependent branches, and you would like their dependencies
3577 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003578 """
3579 if git_common.is_dirty_git_tree('upload-branch-deps'):
3580 return 1
3581
3582 root_branch = cl.GetBranch()
3583 if root_branch is None:
3584 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3585 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003586 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003587 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3588 'patchset dependencies without an uploaded CL.')
3589
3590 branches = RunGit(['for-each-ref',
3591 '--format=%(refname:short) %(upstream:short)',
3592 'refs/heads'])
3593 if not branches:
3594 print('No local branches found.')
3595 return 0
3596
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003597 # Create a dictionary of all local branches to the branches that are
3598 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003599 tracked_to_dependents = collections.defaultdict(list)
3600 for b in branches.splitlines():
3601 tokens = b.split()
3602 if len(tokens) == 2:
3603 branch_name, tracked = tokens
3604 tracked_to_dependents[tracked].append(branch_name)
3605
vapiera7fbd5a2016-06-16 09:17:49 -07003606 print()
3607 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003608 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003609
rmistry@google.com2dd99862015-06-22 12:22:18 +00003610 def traverse_dependents_preorder(branch, padding=''):
3611 dependents_to_process = tracked_to_dependents.get(branch, [])
3612 padding += ' '
3613 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003614 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003615 dependents.append(dependent)
3616 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003617
rmistry@google.com2dd99862015-06-22 12:22:18 +00003618 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003620
3621 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003622 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003623 return 0
3624
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003625 confirm_or_exit('This command will checkout all dependent branches and run '
3626 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003627
rmistry@google.com2dd99862015-06-22 12:22:18 +00003628 # Record all dependents that failed to upload.
3629 failures = {}
3630 # Go through all dependents, checkout the branch and upload.
3631 try:
3632 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003633 print()
3634 print('--------------------------------------')
3635 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003636 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003637 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003638 try:
3639 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003640 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003641 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003642 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003643 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003644 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003645 finally:
3646 # Swap back to the original root branch.
3647 RunGit(['checkout', '-q', root_branch])
3648
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print()
3650 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003651 for dependent_branch in dependents:
3652 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003653 print(' %s : %s' % (dependent_branch, upload_status))
3654 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003655
3656 return 0
3657
3658
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003659@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003660def CMDarchive(parser, args):
3661 """Archives and deletes branches associated with closed changelists."""
3662 parser.add_option(
3663 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003664 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003665 parser.add_option(
3666 '-f', '--force', action='store_true',
3667 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003668 parser.add_option(
3669 '-d', '--dry-run', action='store_true',
3670 help='Skip the branch tagging and removal steps.')
3671 parser.add_option(
3672 '-t', '--notags', action='store_true',
3673 help='Do not tag archived branches. '
3674 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003675
kmarshall3bff56b2016-06-06 18:31:47 -07003676 options, args = parser.parse_args(args)
3677 if args:
3678 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003679
3680 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3681 if not branches:
3682 return 0
3683
vapiera7fbd5a2016-06-16 09:17:49 -07003684 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003685 changes = [Changelist(branchref=b)
3686 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003687 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3688 statuses = get_cl_statuses(changes,
3689 fine_grained=True,
3690 max_processes=options.maxjobs)
3691 proposal = [(cl.GetBranch(),
3692 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3693 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003694 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003695 proposal.sort()
3696
3697 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003698 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003699 return 0
3700
3701 current_branch = GetCurrentBranch()
3702
vapiera7fbd5a2016-06-16 09:17:49 -07003703 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003704 if options.notags:
3705 for next_item in proposal:
3706 print(' ' + next_item[0])
3707 else:
3708 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3709 for next_item in proposal:
3710 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003711
kmarshall9249e012016-08-23 12:02:16 -07003712 # Quit now on precondition failure or if instructed by the user, either
3713 # via an interactive prompt or by command line flags.
3714 if options.dry_run:
3715 print('\nNo changes were made (dry run).\n')
3716 return 0
3717 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003718 print('You are currently on a branch \'%s\' which is associated with a '
3719 'closed codereview issue, so archive cannot proceed. Please '
3720 'checkout another branch and run this command again.' %
3721 current_branch)
3722 return 1
kmarshall9249e012016-08-23 12:02:16 -07003723 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003724 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3725 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003726 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003727 return 1
3728
3729 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003730 if not options.notags:
3731 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003732 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003733
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003735
3736 return 0
3737
3738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003739@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003740def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003741 """Show status of changelists.
3742
3743 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003744 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003745 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003746 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003747 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003748 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003749 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003750 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003751
3752 Also see 'git cl comments'.
3753 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003754 parser.add_option(
3755 '--no-branch-color',
3756 action='store_true',
3757 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003758 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003759 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003760 parser.add_option('-f', '--fast', action='store_true',
3761 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003762 parser.add_option(
3763 '-j', '--maxjobs', action='store', type=int,
3764 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003765
iannuccie53c9352016-08-17 14:40:40 -07003766 _add_codereview_issue_select_options(
3767 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003768 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003769 if args:
3770 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003771
iannuccie53c9352016-08-17 14:40:40 -07003772 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003773 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003774
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003775 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003776 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003777 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003778 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003779 elif options.field == 'id':
3780 issueid = cl.GetIssue()
3781 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003782 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003783 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003784 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003785 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003786 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003787 elif options.field == 'status':
3788 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003789 elif options.field == 'url':
3790 url = cl.GetIssueURL()
3791 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003792 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003793 return 0
3794
3795 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3796 if not branches:
3797 print('No local branch found.')
3798 return 0
3799
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003800 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003801 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003802 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003803 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003804 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003805 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003806 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003807
Daniel McArdlea23bf592019-02-12 00:25:12 +00003808 current_branch = GetCurrentBranch()
3809
3810 def FormatBranchName(branch, colorize=False):
3811 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3812 an asterisk when it is the current branch."""
3813
3814 asterisk = ""
3815 color = Fore.RESET
3816 if branch == current_branch:
3817 asterisk = "* "
3818 color = Fore.GREEN
3819 branch_name = ShortBranchName(branch)
3820
3821 if colorize:
3822 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003823 return asterisk + branch_name
3824
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003825 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003826
3827 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003828 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3829 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003830 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003831 c, status = output.next()
3832 branch_statuses[c.GetBranch()] = status
3833 status = branch_statuses.pop(branch)
3834 url = cl.GetIssueURL()
3835 if url and (not status or status == 'error'):
3836 # The issue probably doesn't exist anymore.
3837 url += ' (broken)'
3838
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003839 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003840 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003841 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003842 color = ''
3843 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003844 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003845
Alan Cuttera3be9a52019-03-04 18:50:33 +00003846 branch_display = FormatBranchName(branch)
3847 padding = ' ' * (alignment - len(branch_display))
3848 if not options.no_branch_color:
3849 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003850
Alan Cuttera3be9a52019-03-04 18:50:33 +00003851 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3852 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003853
vapiera7fbd5a2016-06-16 09:17:49 -07003854 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003855 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003856 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003857 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003858 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003859 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003860 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003861 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003862 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003863 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003864 print('Issue description:')
3865 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866 return 0
3867
3868
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003869def colorize_CMDstatus_doc():
3870 """To be called once in main() to add colors to git cl status help."""
3871 colors = [i for i in dir(Fore) if i[0].isupper()]
3872
3873 def colorize_line(line):
3874 for color in colors:
3875 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003876 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003877 indent = len(line) - len(line.lstrip(' ')) + 1
3878 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3879 return line
3880
3881 lines = CMDstatus.__doc__.splitlines()
3882 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3883
3884
phajdan.jre328cf92016-08-22 04:12:17 -07003885def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003886 if path == '-':
3887 json.dump(contents, sys.stdout)
3888 else:
3889 with open(path, 'w') as f:
3890 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003891
3892
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003893@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003894@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003895def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003896 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003897
3898 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003899 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003900 parser.add_option('-r', '--reverse', action='store_true',
3901 help='Lookup the branch(es) for the specified issues. If '
3902 'no issues are specified, all branches with mapped '
3903 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003904 parser.add_option('--json',
3905 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003906 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003907 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003908
dnj@chromium.org406c4402015-03-03 17:22:28 +00003909 if options.reverse:
3910 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003911 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003912 # Reverse issue lookup.
3913 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003914
3915 git_config = {}
3916 for config in RunGit(['config', '--get-regexp',
3917 r'branch\..*issue']).splitlines():
3918 name, _space, val = config.partition(' ')
3919 git_config[name] = val
3920
dnj@chromium.org406c4402015-03-03 17:22:28 +00003921 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003922 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3923 config_key = _git_branch_config_key(ShortBranchName(branch),
3924 cls.IssueConfigKey())
3925 issue = git_config.get(config_key)
3926 if issue:
3927 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003928 if not args:
3929 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003930 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003931 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003932 try:
3933 issue_num = int(issue)
3934 except ValueError:
3935 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003936 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003937 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003938 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003939 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003940 if options.json:
3941 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003942 return 0
3943
3944 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003945 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003946 if not issue.valid:
3947 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3948 'or no argument to list it.\n'
3949 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003950 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003951 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003952 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003953 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003954 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3955 if options.json:
3956 write_json(options.json, {
3957 'issue': cl.GetIssue(),
3958 'issue_url': cl.GetIssueURL(),
3959 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003960 return 0
3961
3962
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003963@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003964def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 """Shows or posts review comments for any changelist."""
3966 parser.add_option('-a', '--add-comment', dest='comment',
3967 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003968 parser.add_option('-p', '--publish', action='store_true',
3969 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003970 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003971 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003972 parser.add_option('-m', '--machine-readable', dest='readable',
3973 action='store_false', default=True,
3974 help='output comments in a format compatible with '
3975 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003976 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003977 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003978 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003979 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003980
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003981 issue = None
3982 if options.issue:
3983 try:
3984 issue = int(options.issue)
3985 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003986 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003987
Edward Lemur934836a2019-09-09 20:16:54 +00003988 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003989
3990 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003991 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003992 return 0
3993
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003994 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3995 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003996 for comment in summary:
3997 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003998 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003999 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004000 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004001 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004002 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004003 elif comment.autogenerated:
4004 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004005 else:
4006 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004007 print('\n%s%s %s%s\n%s' % (
4008 color,
4009 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4010 comment.sender,
4011 Fore.RESET,
4012 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4013
smut@google.comc85ac942015-09-15 16:34:43 +00004014 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004015 def pre_serialize(c):
4016 dct = c.__dict__.copy()
4017 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4018 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004019 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004020 return 0
4021
4022
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004023@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004024@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004025def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004026 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004027 parser.add_option('-d', '--display', action='store_true',
4028 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004029 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004030 help='New description to set for this issue (- for stdin, '
4031 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004032 parser.add_option('-f', '--force', action='store_true',
4033 help='Delete any unpublished Gerrit edits for this issue '
4034 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004035
4036 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004037 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004038
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004039 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004040 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004041 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004042 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004043 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004044
Edward Lemur934836a2019-09-09 20:16:54 +00004045 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004046 if target_issue_arg:
4047 kwargs['issue'] = target_issue_arg.issue
4048 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004049
4050 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004051 if not cl.GetIssue():
4052 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004053
Edward Lemur678a6842019-10-03 22:25:05 +00004054 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004055 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004056
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004057 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004058
smut@google.com34fb6b12015-07-13 20:03:26 +00004059 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004060 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004061 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004062
4063 if options.new_description:
4064 text = options.new_description
4065 if text == '-':
4066 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004067 elif text == '+':
4068 base_branch = cl.GetCommonAncestorWithUpstream()
4069 change = cl.GetChange(base_branch, None, local_description=True)
4070 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004071
4072 description.set_description(text)
4073 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004074 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004075 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004076 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004077 return 0
4078
4079
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004080@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004081def CMDlint(parser, args):
4082 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004083 parser.add_option('--filter', action='append', metavar='-x,+y',
4084 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004085 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004086
4087 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004088 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004089 try:
4090 import cpplint
4091 import cpplint_chromium
4092 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004094 return 1
4095
4096 # Change the current working directory before calling lint so that it
4097 # shows the correct base.
4098 previous_cwd = os.getcwd()
4099 os.chdir(settings.GetRoot())
4100 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004101 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004102 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4103 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004104 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004105 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004106 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004107
4108 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004109 command = args + files
4110 if options.filter:
4111 command = ['--filter=' + ','.join(options.filter)] + command
4112 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004113
4114 white_regex = re.compile(settings.GetLintRegex())
4115 black_regex = re.compile(settings.GetLintIgnoreRegex())
4116 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4117 for filename in filenames:
4118 if white_regex.match(filename):
4119 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004120 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004121 else:
4122 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4123 extra_check_functions)
4124 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004125 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004126 finally:
4127 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004128 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004129 if cpplint._cpplint_state.error_count != 0:
4130 return 1
4131 return 0
4132
4133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004134@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004135def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004136 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004137 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004138 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004139 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004140 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004141 parser.add_option('--all', action='store_true',
4142 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004143 parser.add_option('--parallel', action='store_true',
4144 help='Run all tests specified by input_api.RunTests in all '
4145 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004146 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004147
sbc@chromium.org71437c02015-04-09 19:29:40 +00004148 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004149 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004150 return 1
4151
Edward Lemur934836a2019-09-09 20:16:54 +00004152 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004153 if args:
4154 base_branch = args[0]
4155 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004156 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004157 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004158
Aaron Gable8076c282017-11-29 14:39:41 -08004159 if options.all:
4160 base_change = cl.GetChange(base_branch, None)
4161 files = [('M', f) for f in base_change.AllFiles()]
4162 change = presubmit_support.GitChange(
4163 base_change.Name(),
4164 base_change.FullDescriptionText(),
4165 base_change.RepositoryRoot(),
4166 files,
4167 base_change.issue,
4168 base_change.patchset,
4169 base_change.author_email,
4170 base_change._upstream)
4171 else:
4172 change = cl.GetChange(base_branch, None)
4173
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004174 cl.RunHook(
4175 committing=not options.upload,
4176 may_prompt=False,
4177 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004178 change=change,
4179 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004180 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004181
4182
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004183def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004184 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004185
4186 Works the same way as
4187 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4188 but can be called on demand on all platforms.
4189
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004190 The basic idea is to generate git hash of a state of the tree, original
4191 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004192 """
4193 lines = []
4194 tree_hash = RunGitSilent(['write-tree'])
4195 lines.append('tree %s' % tree_hash.strip())
4196 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4197 if code == 0:
4198 lines.append('parent %s' % parent.strip())
4199 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4200 lines.append('author %s' % author.strip())
4201 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4202 lines.append('committer %s' % committer.strip())
4203 lines.append('')
4204 # Note: Gerrit's commit-hook actually cleans message of some lines and
4205 # whitespace. This code is not doing this, but it clearly won't decrease
4206 # entropy.
4207 lines.append(message)
4208 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004209 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004210 return 'I%s' % change_hash.strip()
4211
4212
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004213def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004214 """Computes the remote branch ref to use for the CL.
4215
4216 Args:
4217 remote (str): The git remote for the CL.
4218 remote_branch (str): The git remote branch for the CL.
4219 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004220 """
4221 if not (remote and remote_branch):
4222 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004223
wittman@chromium.org455dc922015-01-26 20:15:50 +00004224 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004225 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004226 # refs, which are then translated into the remote full symbolic refs
4227 # below.
4228 if '/' not in target_branch:
4229 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4230 else:
4231 prefix_replacements = (
4232 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4233 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4234 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4235 )
4236 match = None
4237 for regex, replacement in prefix_replacements:
4238 match = re.search(regex, target_branch)
4239 if match:
4240 remote_branch = target_branch.replace(match.group(0), replacement)
4241 break
4242 if not match:
4243 # This is a branch path but not one we recognize; use as-is.
4244 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004245 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4246 # Handle the refs that need to land in different refs.
4247 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004248
wittman@chromium.org455dc922015-01-26 20:15:50 +00004249 # Create the true path to the remote branch.
4250 # Does the following translation:
4251 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4252 # * refs/remotes/origin/master -> refs/heads/master
4253 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4254 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4255 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4256 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4257 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4258 'refs/heads/')
4259 elif remote_branch.startswith('refs/remotes/branch-heads'):
4260 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004261
wittman@chromium.org455dc922015-01-26 20:15:50 +00004262 return remote_branch
4263
4264
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004265def cleanup_list(l):
4266 """Fixes a list so that comma separated items are put as individual items.
4267
4268 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4269 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4270 """
4271 items = sum((i.split(',') for i in l), [])
4272 stripped_items = (i.strip() for i in items)
4273 return sorted(filter(None, stripped_items))
4274
4275
Aaron Gable4db38df2017-11-03 14:59:07 -07004276@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004277@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004278def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004279 """Uploads the current changelist to codereview.
4280
4281 Can skip dependency patchset uploads for a branch by running:
4282 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004283 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004284 git config --unset branch.branch_name.skip-deps-uploads
4285 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004286
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004287 If the name of the checked out branch starts with "bug-" or "fix-" followed
4288 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004289 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004290
4291 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004292 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004293 [git-cl] add support for hashtags
4294 Foo bar: implement foo
4295 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004296 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004297 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4298 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004299 parser.add_option('--bypass-watchlists', action='store_true',
4300 dest='bypass_watchlists',
4301 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004302 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004303 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004304 parser.add_option('--message', '-m', dest='message',
4305 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004306 parser.add_option('-b', '--bug',
4307 help='pre-populate the bug number(s) for this issue. '
4308 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004309 parser.add_option('--message-file', dest='message_file',
4310 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004311 parser.add_option('--title', '-t', dest='title',
4312 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004313 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004314 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004315 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004316 parser.add_option('--tbrs',
4317 action='append', default=[],
4318 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004319 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004320 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004321 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004322 parser.add_option('--hashtag', dest='hashtags',
4323 action='append', default=[],
4324 help=('Gerrit hashtag for new CL; '
4325 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004326 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004327 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004328 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004329 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004330 metavar='TARGET',
4331 help='Apply CL to remote ref TARGET. ' +
4332 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004333 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004334 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004335 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004336 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004337 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004338 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004339 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4340 const='TBR', help='add a set of OWNERS to TBR')
4341 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4342 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004343 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004344 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004345 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004346 'implies --send-mail')
4347 parser.add_option('-d', '--cq-dry-run',
4348 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004349 help='Send the patchset to do a CQ dry run right after '
4350 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004351 parser.add_option('--preserve-tryjobs', action='store_true',
4352 help='instruct the CQ to let tryjobs running even after '
4353 'new patchsets are uploaded instead of canceling '
4354 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004355 parser.add_option('--dependencies', action='store_true',
4356 help='Uploads CLs of all the local branches that depend on '
4357 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004358 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4359 help='Sends your change to the CQ after an approval. Only '
4360 'works on repos that have the Auto-Submit label '
4361 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004362 parser.add_option('--parallel', action='store_true',
4363 help='Run all tests specified by input_api.RunTests in all '
4364 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004365 parser.add_option('--no-autocc', action='store_true',
4366 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004367 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004368 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004369 parser.add_option('-R', '--retry-failed', action='store_true',
4370 help='Retry failed tryjobs from old patchset immediately '
4371 'after uploading new patchset. Cannot be used with '
4372 '--use-commit-queue or --cq-dry-run.')
4373 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4374 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004375 parser.add_option('--fixed', '-x',
4376 help='List of bugs that will be commented on and marked '
4377 'fixed (pre-populates "Fixed:" tag). Same format as '
4378 '-b option / "Bug:" tag. If fixing several issues, '
4379 'separate with commas.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004380 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004381
rmistry@google.com2dd99862015-06-22 12:22:18 +00004382 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004383 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004384 (options, args) = parser.parse_args(args)
4385
sbc@chromium.org71437c02015-04-09 19:29:40 +00004386 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004387 return 1
4388
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004389 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004390 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004391 options.cc = cleanup_list(options.cc)
4392
tandriib80458a2016-06-23 12:20:07 -07004393 if options.message_file:
4394 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004395 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004396 options.message = gclient_utils.FileRead(options.message_file)
4397 options.message_file = None
4398
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004399 if ([options.cq_dry_run,
4400 options.use_commit_queue,
4401 options.retry_failed].count(True) > 1):
4402 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4403 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004404
Aaron Gableedbc4132017-09-11 13:22:28 -07004405 if options.use_commit_queue:
4406 options.send_mail = True
4407
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004408 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4409 settings.GetIsGerrit()
4410
Edward Lemur934836a2019-09-09 20:16:54 +00004411 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004412 if options.retry_failed and not cl.GetIssue():
4413 print('No previous patchsets, so --retry-failed has no effect.')
4414 options.retry_failed = False
4415 # cl.GetMostRecentPatchset uses cached information, and can return the last
4416 # patchset before upload. Calling it here makes it clear that it's the
4417 # last patchset before upload. Note that GetMostRecentPatchset will fail
4418 # if no CL has been uploaded yet.
4419 if options.retry_failed:
4420 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004421
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004422 ret = cl.CMDUpload(options, args, orig_args)
4423
4424 if options.retry_failed:
4425 if ret != 0:
4426 print('Upload failed, so --retry-failed has no effect.')
4427 return ret
4428 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004429 builds, _ = _fetch_latest_builds(
4430 auth_config, cl, options.buildbucket_host,
4431 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004432 buckets = _filter_failed(builds)
4433 if len(buckets) == 0:
4434 print('No failed tryjobs, so --retry-failed has no effect.')
4435 return ret
4436 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4437
4438 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004439
4440
Francois Dorayd42c6812017-05-30 15:10:20 -04004441@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004442@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004443def CMDsplit(parser, args):
4444 """Splits a branch into smaller branches and uploads CLs.
4445
4446 Creates a branch and uploads a CL for each group of files modified in the
4447 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004448 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004449 the shared OWNERS file.
4450 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004451 parser.add_option('-d', '--description', dest='description_file',
4452 help='A text file containing a CL description in which '
4453 '$directory will be replaced by each CL\'s directory.')
4454 parser.add_option('-c', '--comment', dest='comment_file',
4455 help='A text file containing a CL comment.')
4456 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004457 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004458 help='List the files and reviewers for each CL that would '
4459 'be created, but don\'t create branches or CLs.')
4460 parser.add_option('--cq-dry-run', action='store_true',
4461 help='If set, will do a cq dry run for each uploaded CL. '
4462 'Please be careful when doing this; more than ~10 CLs '
4463 'has the potential to overload our build '
4464 'infrastructure. Try to upload these not during high '
4465 'load times (usually 11-3 Mountain View time). Email '
4466 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004467 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4468 default=True,
4469 help='Sends your change to the CQ after an approval. Only '
4470 'works on repos that have the Auto-Submit label '
4471 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004472 options, _ = parser.parse_args(args)
4473
4474 if not options.description_file:
4475 parser.error('No --description flag specified.')
4476
4477 def WrappedCMDupload(args):
4478 return CMDupload(OptionParser(), args)
4479
4480 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004481 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004482 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004483
4484
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004485@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004486@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004488 """DEPRECATED: Used to commit the current changelist via git-svn."""
4489 message = ('git-cl no longer supports committing to SVN repositories via '
4490 'git-svn. You probably want to use `git cl land` instead.')
4491 print(message)
4492 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493
4494
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004495@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004496@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004497def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004498 """Commits the current changelist via git.
4499
4500 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4501 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004502 """
4503 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4504 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004505 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004506 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004507 parser.add_option('--parallel', action='store_true',
4508 help='Run all tests specified by input_api.RunTests in all '
4509 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004510 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004511
Edward Lemur934836a2019-09-09 20:16:54 +00004512 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004513
Robert Iannucci2e73d432018-03-14 01:10:47 -07004514 if not cl.GetIssue():
4515 DieWithError('You must upload the change first to Gerrit.\n'
4516 ' If you would rather have `git cl land` upload '
4517 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004518 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004519 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004520
4521
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004522@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004523@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004524def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004525 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004526 parser.add_option('-b', dest='newbranch',
4527 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004528 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004529 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004531 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004532
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004533 group = optparse.OptionGroup(
4534 parser,
4535 'Options for continuing work on the current issue uploaded from a '
4536 'different clone (e.g. different machine). Must be used independently '
4537 'from the other options. No issue number should be specified, and the '
4538 'branch must have an issue number associated with it')
4539 group.add_option('--reapply', action='store_true', dest='reapply',
4540 help='Reset the branch and reapply the issue.\n'
4541 'CAUTION: This will undo any local changes in this '
4542 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004543
4544 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004545 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004546 parser.add_option_group(group)
4547
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004548 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004549 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004550
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004551 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004552 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004553 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004554 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004555 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004556
Edward Lemur934836a2019-09-09 20:16:54 +00004557 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004558 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004559 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004560
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004561 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004562 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004563 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004564
4565 RunGit(['reset', '--hard', upstream])
4566 if options.pull:
4567 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004568
Edward Lemur678a6842019-10-03 22:25:05 +00004569 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4570 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004571
4572 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004573 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004574
Edward Lemurf38bc172019-09-03 21:02:13 +00004575 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004576 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004577 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004578
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004579 # We don't want uncommitted changes mixed up with the patch.
4580 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004581 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004583 if options.newbranch:
4584 if options.force:
4585 RunGit(['branch', '-D', options.newbranch],
4586 stderr=subprocess2.PIPE, error_ok=True)
4587 RunGit(['new-branch', options.newbranch])
4588
Edward Lemur678a6842019-10-03 22:25:05 +00004589 cl = Changelist(
4590 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004591
Edward Lemur678a6842019-10-03 22:25:05 +00004592 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004593 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004594
Edward Lemurf38bc172019-09-03 21:02:13 +00004595 return cl.CMDPatchWithParsedIssue(
4596 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004597
4598
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004599def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004600 """Fetches the tree status and returns either 'open', 'closed',
4601 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004602 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603 if url:
4604 status = urllib2.urlopen(url).read().lower()
4605 if status.find('closed') != -1 or status == '0':
4606 return 'closed'
4607 elif status.find('open') != -1 or status == '1':
4608 return 'open'
4609 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 return 'unset'
4611
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004612
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613def GetTreeStatusReason():
4614 """Fetches the tree status from a json url and returns the message
4615 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004616 url = settings.GetTreeStatusUrl()
4617 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004618 connection = urllib2.urlopen(json_url)
4619 status = json.loads(connection.read())
4620 connection.close()
4621 return status['message']
4622
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004623
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004624@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004625def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004626 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004627 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004628 status = GetTreeStatus()
4629 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004630 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631 return 2
4632
vapiera7fbd5a2016-06-16 09:17:49 -07004633 print('The tree is %s' % status)
4634 print()
4635 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004636 if status != 'open':
4637 return 1
4638 return 0
4639
4640
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004641@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004642def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004643 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4644 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004645 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004646 '-b', '--bot', action='append',
4647 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4648 'times to specify multiple builders. ex: '
4649 '"-b win_rel -b win_layout". See '
4650 'the try server waterfall for the builders name and the tests '
4651 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004652 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004653 '-B', '--bucket', default='',
4654 help=('Buildbucket bucket to send the try requests.'))
4655 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004656 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004657 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004658 'be determined by the try recipe that builder runs, which usually '
4659 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004660 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004661 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004662 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004663 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004664 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004665 '--category', default='git_cl_try', help='Specify custom build category.')
4666 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004667 '--project',
4668 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004669 'in recipe to determine to which repository or directory to '
4670 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004671 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004672 '-p', '--property', dest='properties', action='append', default=[],
4673 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004674 'key2=value2 etc. The value will be treated as '
4675 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004676 'NOTE: using this may make your tryjob not usable for CQ, '
4677 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004678 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004679 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4680 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004681 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004682 parser.add_option(
4683 '-R', '--retry-failed', action='store_true', default=False,
4684 help='Retry failed jobs from the latest set of tryjobs. '
4685 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004686 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004687 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004688 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004689 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004690
machenbach@chromium.org45453142015-09-15 08:45:22 +00004691 # Make sure that all properties are prop=value pairs.
4692 bad_params = [x for x in options.properties if '=' not in x]
4693 if bad_params:
4694 parser.error('Got properties with missing "=": %s' % bad_params)
4695
maruel@chromium.org15192402012-09-06 12:38:29 +00004696 if args:
4697 parser.error('Unknown arguments: %s' % args)
4698
Edward Lemur934836a2019-09-09 20:16:54 +00004699 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004700 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004701 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004702
Edward Lemurf38bc172019-09-03 21:02:13 +00004703 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004704 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004705
tandriie113dfd2016-10-11 10:20:12 -07004706 error_message = cl.CannotTriggerTryJobReason()
4707 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004708 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004709
Quinten Yearsley983111f2019-09-26 17:18:48 +00004710 if options.retry_failed:
4711 if options.bot or options.bucket:
4712 print('ERROR: The option --retry-failed is not compatible with '
4713 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4714 return 1
4715 print('Searching for failed tryjobs...')
4716 builds, patchset = _fetch_latest_builds(
4717 auth_config, cl, options.buildbucket_host)
4718 if options.verbose:
4719 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4720 buckets = _filter_failed(builds)
4721 if not buckets:
4722 print('There are no failed jobs in the latest set of jobs '
4723 '(patchset #%d), doing nothing.' % patchset)
4724 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004725 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004726 if num_builders > 10:
4727 confirm_or_exit('There are %d builders with failed builds.'
4728 % num_builders, action='continue')
4729 else:
4730 buckets = _get_bucket_map(cl, options, parser)
4731 if buckets and any(b.startswith('master.') for b in buckets):
4732 print('ERROR: Buildbot masters are not supported.')
4733 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004734
qyearsleydd49f942016-10-28 11:57:22 -07004735 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4736 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004737 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004738 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004739 print('git cl try with no bots now defaults to CQ dry run.')
4740 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4741 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004742
borenet6c0efe62016-10-19 08:13:29 -07004743 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004744 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004745 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004746 'of bot requires an initial job from a parent (usually a builder). '
4747 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004748 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004749 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004750
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004751 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004752 try:
4753 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4754 except BuildbucketResponseException as ex:
4755 print('ERROR: %s' % ex)
4756 return 1
4757 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004758
4759
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004760@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004761def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004762 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004763 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004764 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004765 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004766 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004767 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004768 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004769 '--color', action='store_true', default=setup_color.IS_TTY,
4770 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004771 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004772 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4773 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004774 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004775 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004776 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777 parser.add_option_group(group)
4778 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004779 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004780 options, args = parser.parse_args(args)
4781 if args:
4782 parser.error('Unrecognized args: %s' % ' '.join(args))
4783
4784 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004785 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004787 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004788
tandrii221ab252016-10-06 08:12:04 -07004789 patchset = options.patchset
4790 if not patchset:
4791 patchset = cl.GetMostRecentPatchset()
4792 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004793 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004794 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004795 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004796 cl.GetIssue())
4797
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004798 try:
tandrii221ab252016-10-06 08:12:04 -07004799 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004800 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004801 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004802 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004803 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004804 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004805 else:
4806 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004807 return 0
4808
4809
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004810@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004811@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004812def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004813 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004814 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004815 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004816 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004817
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004818 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004819 if args:
4820 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004821 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004822 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004823 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004824 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004825
4826 # Clear configured merge-base, if there is one.
4827 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004828 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004829 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004830 return 0
4831
4832
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004833@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004834def CMDweb(parser, args):
4835 """Opens the current CL in the web browser."""
4836 _, args = parser.parse_args(args)
4837 if args:
4838 parser.error('Unrecognized args: %s' % ' '.join(args))
4839
4840 issue_url = Changelist().GetIssueURL()
4841 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004842 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004843 return 1
4844
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004845 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004846 # allows us to hide the "Created new window in existing browser session."
4847 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004848 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004849 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004850 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004851 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004852 os.open(os.devnull, os.O_RDWR)
4853 try:
4854 webbrowser.open(issue_url)
4855 finally:
4856 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004857 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004858 return 0
4859
4860
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004861@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004862def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004863 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004864 parser.add_option('-d', '--dry-run', action='store_true',
4865 help='trigger in dry run mode')
4866 parser.add_option('-c', '--clear', action='store_true',
4867 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004868 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004869 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004870 if args:
4871 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004872 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004873 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004874
Edward Lemur934836a2019-09-09 20:16:54 +00004875 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004876 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004877 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004878 elif options.dry_run:
4879 state = _CQState.DRY_RUN
4880 else:
4881 state = _CQState.COMMIT
4882 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004883 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004884 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004885 return 0
4886
4887
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004888@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004889def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004890 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004891 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004892 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004893 if args:
4894 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004895 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004896 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004897 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004898 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004899 cl.CloseIssue()
4900 return 0
4901
4902
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004903@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004904def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004905 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004906 parser.add_option(
4907 '--stat',
4908 action='store_true',
4909 dest='stat',
4910 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004911 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004912 if args:
4913 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004914
Edward Lemur934836a2019-09-09 20:16:54 +00004915 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004916 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004917 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004918 if not issue:
4919 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004920
Aaron Gablea718c3e2017-08-28 17:47:28 -07004921 base = cl._GitGetBranchConfigValue('last-upload-hash')
4922 if not base:
4923 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4924 if not base:
4925 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4926 revision_info = detail['revisions'][detail['current_revision']]
4927 fetch_info = revision_info['fetch']['http']
4928 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4929 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004930
Aaron Gablea718c3e2017-08-28 17:47:28 -07004931 cmd = ['git', 'diff']
4932 if options.stat:
4933 cmd.append('--stat')
4934 cmd.append(base)
4935 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004936
4937 return 0
4938
4939
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004940@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004941def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004942 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004943 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004944 '--ignore-current',
4945 action='store_true',
4946 help='Ignore the CL\'s current reviewers and start from scratch.')
4947 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004948 '--ignore-self',
4949 action='store_true',
4950 help='Do not consider CL\'s author as an owners.')
4951 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004952 '--no-color',
4953 action='store_true',
4954 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004955 parser.add_option(
4956 '--batch',
4957 action='store_true',
4958 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004959 # TODO: Consider moving this to another command, since other
4960 # git-cl owners commands deal with owners for a given CL.
4961 parser.add_option(
4962 '--show-all',
4963 action='store_true',
4964 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004965 options, args = parser.parse_args(args)
4966
4967 author = RunGit(['config', 'user.email']).strip() or None
4968
Edward Lemur934836a2019-09-09 20:16:54 +00004969 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970
Yang Guo6e269a02019-06-26 11:17:02 +00004971 if options.show_all:
4972 for arg in args:
4973 base_branch = cl.GetCommonAncestorWithUpstream()
4974 change = cl.GetChange(base_branch, None)
4975 database = owners.Database(change.RepositoryRoot(), file, os.path)
4976 database.load_data_needed_for([arg])
4977 print('Owners for %s:' % arg)
4978 for owner in sorted(database.all_possible_owners([arg], None)):
4979 print(' - %s' % owner)
4980 return 0
4981
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004982 if args:
4983 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004984 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004985 base_branch = args[0]
4986 else:
4987 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004988 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004989
4990 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004991 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4992
4993 if options.batch:
4994 db = owners.Database(change.RepositoryRoot(), file, os.path)
4995 print('\n'.join(db.reviewers_for(affected_files, author)))
4996 return 0
4997
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004998 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004999 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005000 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005001 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005002 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005003 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005004 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005005 override_files=change.OriginalOwnersFiles(),
5006 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005007
5008
Aiden Bennerc08566e2018-10-03 17:52:42 +00005009def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010 """Generates a diff command."""
5011 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005012 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5013
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005014 if allow_prefix:
5015 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5016 # case that diff.noprefix is set in the user's git config.
5017 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5018 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005019 diff_cmd += ['--no-prefix']
5020
5021 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005022
5023 if args:
5024 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005025 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005026 diff_cmd.append(arg)
5027 else:
5028 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005029
5030 return diff_cmd
5031
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005032
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005033def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005034 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005035 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005036
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005037
enne@chromium.org555cfe42014-01-29 18:21:39 +00005038@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005039@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005040def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005041 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005042 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005043 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005044 parser.add_option('--full', action='store_true',
5045 help='Reformat the full content of all touched files')
5046 parser.add_option('--dry-run', action='store_true',
5047 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005048 parser.add_option(
5049 '--python',
5050 action='store_true',
5051 default=None,
5052 help='Enables python formatting on all python files.')
5053 parser.add_option(
5054 '--no-python',
5055 action='store_true',
5056 dest='python',
5057 help='Disables python formatting on all python files. '
5058 'Takes precedence over --python. '
5059 'If neither --python or --no-python are set, python '
5060 'files that have a .style.yapf file in an ancestor '
5061 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005062 parser.add_option('--js', action='store_true',
5063 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005064 parser.add_option('--diff', action='store_true',
5065 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005066 parser.add_option('--presubmit', action='store_true',
5067 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005068 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005069
Daniel Chengc55eecf2016-12-30 03:11:02 -08005070 # Normalize any remaining args against the current path, so paths relative to
5071 # the current directory are still resolved as expected.
5072 args = [os.path.join(os.getcwd(), arg) for arg in args]
5073
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005074 # git diff generates paths against the root of the repository. Change
5075 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005076 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005077 if rel_base_path:
5078 os.chdir(rel_base_path)
5079
digit@chromium.org29e47272013-05-17 17:01:46 +00005080 # Grab the merge-base commit, i.e. the upstream commit of the current
5081 # branch when it was created or the last time it was rebased. This is
5082 # to cover the case where the user may have called "git fetch origin",
5083 # moving the origin branch to a newer commit, but hasn't rebased yet.
5084 upstream_commit = None
5085 cl = Changelist()
5086 upstream_branch = cl.GetUpstreamBranch()
5087 if upstream_branch:
5088 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5089 upstream_commit = upstream_commit.strip()
5090
5091 if not upstream_commit:
5092 DieWithError('Could not find base commit for this branch. '
5093 'Are you in detached state?')
5094
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005095 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5096 diff_output = RunGit(changed_files_cmd)
5097 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005098 # Filter out files deleted by this CL
5099 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005100
Christopher Lamc5ba6922017-01-24 11:19:14 +11005101 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005102 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005103
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005104 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5105 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5106 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005107 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005108
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005109 top_dir = os.path.normpath(
5110 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5111
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005112 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5113 # formatted. This is used to block during the presubmit.
5114 return_value = 0
5115
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005116 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005117 # Locate the clang-format binary in the checkout
5118 try:
5119 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005120 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005121 DieWithError(e)
5122
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005123 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005124 cmd = [clang_format_tool]
5125 if not opts.dry_run and not opts.diff:
5126 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005127 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005128 if opts.diff:
5129 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005130 else:
5131 env = os.environ.copy()
5132 env['PATH'] = str(os.path.dirname(clang_format_tool))
5133 try:
5134 script = clang_format.FindClangFormatScriptInChromiumTree(
5135 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005136 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005137 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005138
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005139 cmd = [sys.executable, script, '-p0']
5140 if not opts.dry_run and not opts.diff:
5141 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005142
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005143 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5144 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005145
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005146 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5147 if opts.diff:
5148 sys.stdout.write(stdout)
5149 if opts.dry_run and len(stdout) > 0:
5150 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005151
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005152 # Similar code to above, but using yapf on .py files rather than clang-format
5153 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005154 py_explicitly_disabled = opts.python is not None and not opts.python
5155 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005156 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5157 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5158 if sys.platform.startswith('win'):
5159 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005160
Aiden Bennerc08566e2018-10-03 17:52:42 +00005161 # If we couldn't find a yapf file we'll default to the chromium style
5162 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005163 chromium_default_yapf_style = os.path.join(depot_tools_path,
5164 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005165 # Used for caching.
5166 yapf_configs = {}
5167 for f in python_diff_files:
5168 # Find the yapf style config for the current file, defaults to depot
5169 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005170 _FindYapfConfigFile(f, yapf_configs, top_dir)
5171
5172 # Turn on python formatting by default if a yapf config is specified.
5173 # This breaks in the case of this repo though since the specified
5174 # style file is also the global default.
5175 if opts.python is None:
5176 filtered_py_files = []
5177 for f in python_diff_files:
5178 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5179 filtered_py_files.append(f)
5180 else:
5181 filtered_py_files = python_diff_files
5182
5183 # Note: yapf still seems to fix indentation of the entire file
5184 # even if line ranges are specified.
5185 # See https://github.com/google/yapf/issues/499
5186 if not opts.full and filtered_py_files:
5187 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5188
5189 for f in filtered_py_files:
5190 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5191 if yapf_config is None:
5192 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005193
5194 cmd = [yapf_tool, '--style', yapf_config, f]
5195
5196 has_formattable_lines = False
5197 if not opts.full:
5198 # Only run yapf over changed line ranges.
5199 for diff_start, diff_len in py_line_diffs[f]:
5200 diff_end = diff_start + diff_len - 1
5201 # Yapf errors out if diff_end < diff_start but this
5202 # is a valid line range diff for a removal.
5203 if diff_end >= diff_start:
5204 has_formattable_lines = True
5205 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5206 # If all line diffs were removals we have nothing to format.
5207 if not has_formattable_lines:
5208 continue
5209
5210 if opts.diff or opts.dry_run:
5211 cmd += ['--diff']
5212 # Will return non-zero exit code if non-empty diff.
5213 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5214 if opts.diff:
5215 sys.stdout.write(stdout)
5216 elif len(stdout) > 0:
5217 return_value = 2
5218 else:
5219 cmd += ['-i']
5220 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005221
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005222 # Dart's formatter does not have the nice property of only operating on
5223 # modified chunks, so hard code full.
5224 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005225 try:
5226 command = [dart_format.FindDartFmtToolInChromiumTree()]
5227 if not opts.dry_run and not opts.diff:
5228 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005229 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005230
ppi@chromium.org6593d932016-03-03 15:41:15 +00005231 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005232 if opts.dry_run and stdout:
5233 return_value = 2
5234 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005235 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5236 'found in this checkout. Files in other languages are still '
5237 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005238
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005239 # Format GN build files. Always run on full build files for canonical form.
5240 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005241 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005242 if opts.dry_run or opts.diff:
5243 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005244 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005245 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5246 shell=sys.platform == 'win32',
5247 cwd=top_dir)
5248 if opts.dry_run and gn_ret == 2:
5249 return_value = 2 # Not formatted.
5250 elif opts.diff and gn_ret == 2:
5251 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005252 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005253 elif gn_ret != 0:
5254 # For non-dry run cases (and non-2 return values for dry-run), a
5255 # nonzero error code indicates a failure, probably because the file
5256 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005257 DieWithError('gn format failed on ' + gn_diff_file +
5258 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005259
Ilya Shermane081cbe2017-08-15 17:51:04 -07005260 # Skip the metrics formatting from the global presubmit hook. These files have
5261 # a separate presubmit hook that issues an error if the files need formatting,
5262 # whereas the top-level presubmit script merely issues a warning. Formatting
5263 # these files is somewhat slow, so it's important not to duplicate the work.
5264 if not opts.presubmit:
5265 for xml_dir in GetDirtyMetricsDirs(diff_files):
5266 tool_dir = os.path.join(top_dir, xml_dir)
5267 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5268 if opts.dry_run or opts.diff:
5269 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005270 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005271 if opts.diff:
5272 sys.stdout.write(stdout)
5273 if opts.dry_run and stdout:
5274 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005275
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005276 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005277
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005278
Steven Holte2e664bf2017-04-21 13:10:47 -07005279def GetDirtyMetricsDirs(diff_files):
5280 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5281 metrics_xml_dirs = [
5282 os.path.join('tools', 'metrics', 'actions'),
5283 os.path.join('tools', 'metrics', 'histograms'),
5284 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005285 os.path.join('tools', 'metrics', 'ukm'),
5286 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005287 for xml_dir in metrics_xml_dirs:
5288 if any(file.startswith(xml_dir) for file in xml_diff_files):
5289 yield xml_dir
5290
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005291
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005292@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005293@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005294def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005295 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005296 _, args = parser.parse_args(args)
5297
5298 if len(args) != 1:
5299 parser.print_help()
5300 return 1
5301
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005302 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005303 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005304 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005305
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005306 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005308 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005309 output = RunGit(['config', '--local', '--get-regexp',
5310 r'branch\..*\.%s' % issueprefix],
5311 error_ok=True)
5312 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005313 if issue == target_issue:
5314 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005315
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005316 branches = []
5317 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005318 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005319 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005320 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 return 1
5322 if len(branches) == 1:
5323 RunGit(['checkout', branches[0]])
5324 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005325 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005326 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005327 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005328 which = raw_input('Choose by index: ')
5329 try:
5330 RunGit(['checkout', branches[int(which)]])
5331 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005332 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005333 return 1
5334
5335 return 0
5336
5337
maruel@chromium.org29404b52014-09-08 22:58:00 +00005338def CMDlol(parser, args):
5339 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005340 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005341 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5342 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5343 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005344 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005345 return 0
5346
5347
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005348class OptionParser(optparse.OptionParser):
5349 """Creates the option parse and add --verbose support."""
5350 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005351 optparse.OptionParser.__init__(
5352 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005353 self.add_option(
5354 '-v', '--verbose', action='count', default=0,
5355 help='Use 2 times for more debugging info')
5356
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005357 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005358 try:
5359 return self._parse_args(args)
5360 finally:
5361 # Regardless of success or failure of args parsing, we want to report
5362 # metrics, but only after logging has been initialized (if parsing
5363 # succeeded).
5364 global settings
5365 settings = Settings()
5366
5367 if not metrics.DISABLE_METRICS_COLLECTION:
5368 # GetViewVCUrl ultimately calls logging method.
5369 project_url = settings.GetViewVCUrl().strip('/+')
5370 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5371 metrics.collector.add('project_urls', [project_url])
5372
5373 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005374 # Create an optparse.Values object that will store only the actual passed
5375 # options, without the defaults.
5376 actual_options = optparse.Values()
5377 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5378 # Create an optparse.Values object with the default options.
5379 options = optparse.Values(self.get_default_values().__dict__)
5380 # Update it with the options passed by the user.
5381 options._update_careful(actual_options.__dict__)
5382 # Store the options passed by the user in an _actual_options attribute.
5383 # We store only the keys, and not the values, since the values can contain
5384 # arbitrary information, which might be PII.
5385 metrics.collector.add('arguments', actual_options.__dict__.keys())
5386
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005387 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005388 logging.basicConfig(
5389 level=levels[min(options.verbose, len(levels) - 1)],
5390 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5391 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005392
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005393 return options, args
5394
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005395
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005396def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005397 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005398 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005399 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005400 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005401
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005402 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005403 dispatcher = subcommand.CommandDispatcher(__name__)
5404 try:
5405 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005406 except auth.AuthenticationError as e:
5407 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005408 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005409 if e.code != 500:
5410 raise
5411 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005412 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005413 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005414 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005415
5416
5417if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005418 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5419 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005420 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005421 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005422 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005423 sys.exit(main(sys.argv[1:]))