blob: 0b1d91507e46a6d904c00cd6e3afa9d62ac055d6 [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
468 codereview_url = changelist.GetCodereviewServer()
469 codereview_host = urlparse.urlparse(codereview_url).hostname
470
471 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
472 http = authenticator.authorize(httplib2.Http())
473 http.force_exception_to_status_code = True
474
475 batch_request = {'requests': requests}
476 batch_response = _call_buildbucket(
477 http, options.buildbucket_host, 'Batch', batch_request)
478
479 errors = [
480 ' ' + response['error']['message']
481 for response in batch_response.get('responses', [])
482 if 'error' in response
483 ]
484 if errors:
485 raise BuildbucketResponseException(
486 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
487
488
489def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000490 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000491 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000492 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000493 shared_properties['clobber'] = True
494 shared_properties.update(_get_properties_from_options(options) or {})
495
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000496 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
497 if options.retry_failed:
498 shared_tags.append({'key': 'retry_failed',
499 'value': '1'})
500
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000501 requests = []
502 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
503 project, bucket = _parse_bucket(raw_bucket)
504 if not project or not bucket:
505 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
506 continue
507
508 for builder, tests in sorted(builders_and_tests.iteritems()):
509 properties = shared_properties.copy()
510 if 'presubmit' in builder.lower():
511 properties['dry_run'] = 'true'
512 if tests:
513 properties['testfilter'] = tests
514
515 requests.append({
516 'scheduleBuild': {
517 'requestId': str(uuid.uuid4()),
518 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000519 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000520 'bucket': bucket,
521 'builder': builder,
522 },
523 'gerritChanges': gerrit_changes,
524 'properties': properties,
525 'tags': [
526 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000527 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000528 }
529 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000530 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000531
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000532
tandrii221ab252016-10-06 08:12:04 -0700533def fetch_try_jobs(auth_config, changelist, buildbucket_host,
534 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000535 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 """
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 fields = ['id', 'builder', 'status']
540 request = {
541 'predicate': {
542 'gerritChanges': [changelist.GetGerritChange(patchset)],
543 },
544 'fields': ','.join('builds.*.' + field for field in fields),
545 }
tandrii221ab252016-10-06 08:12:04 -0700546
547 codereview_url = changelist.GetCodereviewServer()
548 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000549
tandrii221ab252016-10-06 08:12:04 -0700550 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 if authenticator.has_cached_credentials():
552 http = authenticator.authorize(httplib2.Http())
553 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700554 print('Warning: Some results might be missing because %s' %
555 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000556 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 http.force_exception_to_status_code = True
559
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000560 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
561 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000563def _fetch_latest_builds(
564 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000565 """Fetches builds from the latest patchset that has builds (within
566 the last few patchsets).
567
568 Args:
569 auth_config (auth.AuthConfig): Auth info for Buildbucket
570 changelist (Changelist): The CL to fetch builds for
571 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000572 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
573 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000574 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
576 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000577 """
578 assert buildbucket_host
579 assert changelist.GetIssue(), 'CL must be uploaded first'
580 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000581 if latest_patchset is None:
582 assert changelist.GetMostRecentPatchset()
583 ps = changelist.GetMostRecentPatchset()
584 else:
585 assert latest_patchset > 0, latest_patchset
586 ps = latest_patchset
587
Quinten Yearsley983111f2019-09-26 17:18:48 +0000588 min_ps = max(1, ps - 5)
589 while ps >= min_ps:
590 builds = fetch_try_jobs(
591 auth_config, changelist, buildbucket_host, patchset=ps)
592 if len(builds):
593 return builds, ps
594 ps -= 1
595 return [], 0
596
597
598def _filter_failed(builds):
599 """Returns a list of buckets/builders that had failed builds.
600
601 Args:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 builds (list): Builds, in the format returned by fetch_try_jobs,
603 i.e. a list of buildbucket.v2.Builds which includes status and builder
604 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000605
606 Returns:
607 A dict of bucket to builder to tests (empty list). This is the same format
608 accepted by _trigger_try_jobs and returned by _get_bucket_map.
609 """
610 buckets = collections.defaultdict(dict)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000611 for build in builds:
612 if build['status'] in ('FAILURE', 'INFRA_FAILURE'):
613 project = build['builder']['project']
614 bucket = build['builder']['bucket']
615 builder = build['builder']['builder']
Quinten Yearsley983111f2019-09-26 17:18:48 +0000616 buckets[project + '/' + bucket][builder] = []
617 return buckets
618
619
qyearsleyeab3c042016-08-24 09:18:28 -0700620def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621 """Prints nicely result of fetch_try_jobs."""
622 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000623 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624 return
625
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000626 longest_builder = max(len(b['builder']['builder']) for b in builds)
627 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000628 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000629 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
630 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000632 builds_by_status = {}
633 for b in builds:
634 builds_by_status.setdefault(b['status'], []).append({
635 'id': b['id'],
636 'name': name_fmt.format(
637 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
638 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000640 sort_key = lambda b: (b['name'], b['id'])
641
642 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000643 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000644 if not builds:
645 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000646
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000647 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000648 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000649 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000650 else:
651 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
652
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000653 print(colorize(title))
654 for b in sorted(builds, key=sort_key):
655 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656
657 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000658 print_builds(
659 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
660 print_builds(
661 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
662 color=Fore.MAGENTA)
663 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
664 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
665 color=Fore.MAGENTA)
666 print_builds('Started:', builds_by_status.pop('STARTED', []))
667 print_builds(
668 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000669 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000670 print_builds(
671 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000672 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675def _ComputeDiffLineRanges(files, upstream_commit):
676 """Gets the changed line ranges for each file since upstream_commit.
677
678 Parses a git diff on provided files and returns a dict that maps a file name
679 to an ordered list of range tuples in the form (start_line, count).
680 Ranges are in the same format as a git diff.
681 """
682 # If files is empty then diff_output will be a full diff.
683 if len(files) == 0:
684 return {}
685
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000686 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
688 diff_output = RunGit(diff_cmd)
689
690 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
691 # 2 capture groups
692 # 0 == fname of diff file
693 # 1 == 'diff_start,diff_count' or 'diff_start'
694 # will match each of
695 # diff --git a/foo.foo b/foo.py
696 # @@ -12,2 +14,3 @@
697 # @@ -12,2 +17 @@
698 # running re.findall on the above string with pattern will give
699 # [('foo.py', ''), ('', '14,3'), ('', '17')]
700
701 curr_file = None
702 line_diffs = {}
703 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
704 if match[0] != '':
705 # Will match the second filename in diff --git a/a.py b/b.py.
706 curr_file = match[0]
707 line_diffs[curr_file] = []
708 else:
709 # Matches +14,3
710 if ',' in match[1]:
711 diff_start, diff_count = match[1].split(',')
712 else:
713 # Single line changes are of the form +12 instead of +12,1.
714 diff_start = match[1]
715 diff_count = 1
716
717 diff_start = int(diff_start)
718 diff_count = int(diff_count)
719
720 # If diff_count == 0 this is a removal we can ignore.
721 line_diffs[curr_file].append((diff_start, diff_count))
722
723 return line_diffs
724
725
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000726def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000727 """Checks if a yapf file is in any parent directory of fpath until top_dir.
728
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000729 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000730 is found returns None. Uses yapf_config_cache as a cache for previously found
731 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000732 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000733 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000734 # Return result if we've already computed it.
735 if fpath in yapf_config_cache:
736 return yapf_config_cache[fpath]
737
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000738 parent_dir = os.path.dirname(fpath)
739 if os.path.isfile(fpath):
740 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000741 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000742 # Otherwise fpath is a directory
743 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
744 if os.path.isfile(yapf_file):
745 ret = yapf_file
746 elif fpath == top_dir or parent_dir == fpath:
747 # If we're at the top level directory, or if we're at root
748 # there is no provided style.
749 ret = None
750 else:
751 # Otherwise recurse on the current directory.
752 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000753 yapf_config_cache[fpath] = ret
754 return ret
755
756
Aaron Gable13101a62018-02-09 13:20:41 -0800757def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758 """Prints statistics about the change to the user."""
759 # --no-ext-diff is broken in some versions of Git, so try to work around
760 # this by overriding the environment (but there is still a problem if the
761 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000762 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000763 if 'GIT_EXTERNAL_DIFF' in env:
764 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000765
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000766 try:
767 stdout = sys.stdout.fileno()
768 except AttributeError:
769 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000770 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800771 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000772 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000773
774
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000775class BuildbucketResponseException(Exception):
776 pass
777
778
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000779class Settings(object):
780 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000781 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000782 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783 self.tree_status_url = None
784 self.viewvc_url = None
785 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000786 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000787 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000788 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000789 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790
791 def LazyUpdateIfNeeded(self):
792 """Updates the settings from a codereview.settings file, if available."""
793 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000794 # The only value that actually changes the behavior is
795 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000796 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000797 error_ok=True
798 ).strip().lower()
799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000801 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 LoadCodereviewSettingsFromFile(cr_settings_file)
803 self.updated = True
804
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000805 @staticmethod
806 def GetRelativeRoot():
807 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000810 if self.root is None:
811 self.root = os.path.abspath(self.GetRelativeRoot())
812 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 def GetTreeStatusUrl(self, error_ok=False):
815 if not self.tree_status_url:
816 error_message = ('You must configure your tree status URL by running '
817 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 self.tree_status_url = self._GetConfig(
819 'rietveld.tree-status-url', error_ok=error_ok,
820 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821 return self.tree_status_url
822
823 def GetViewVCUrl(self):
824 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000825 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826 return self.viewvc_url
827
rmistry@google.com90752582014-01-14 21:04:50 +0000828 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000829 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000830
rmistry@google.com5626a922015-02-26 14:03:30 +0000831 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000832 run_post_upload_hook = self._GetConfig(
833 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000834 return run_post_upload_hook == "True"
835
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000836 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000837 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000838
ukai@chromium.orge8077812012-02-03 03:41:46 +0000839 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000840 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000841 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700842 self.is_gerrit = (
843 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000844 return self.is_gerrit
845
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000846 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000847 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700849 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
850 if self.squash_gerrit_uploads is None:
851 # Default is squash now (http://crbug.com/611892#c23).
852 self.squash_gerrit_uploads = not (
853 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
854 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000855 return self.squash_gerrit_uploads
856
tandriia60502f2016-06-20 02:01:53 -0700857 def GetSquashGerritUploadsOverride(self):
858 """Return True or False if codereview.settings should be overridden.
859
860 Returns None if no override has been defined.
861 """
862 # See also http://crbug.com/611892#c23
863 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
864 error_ok=True).strip()
865 if result == 'true':
866 return True
867 if result == 'false':
868 return False
869 return None
870
tandrii@chromium.org28253532016-04-14 13:46:56 +0000871 def GetGerritSkipEnsureAuthenticated(self):
872 """Return True if EnsureAuthenticated should not be done for Gerrit
873 uploads."""
874 if self.gerrit_skip_ensure_authenticated is None:
875 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000876 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000877 error_ok=True).strip() == 'true')
878 return self.gerrit_skip_ensure_authenticated
879
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000880 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000881 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000882 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000883 # Git requires single quotes for paths with spaces. We need to replace
884 # them with double quotes for Windows to treat such paths as a single
885 # path.
886 self.git_editor = self._GetConfig(
887 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000888 return self.git_editor or None
889
thestig@chromium.org44202a22014-03-11 19:22:18 +0000890 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000892 DEFAULT_LINT_REGEX)
893
894 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000895 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000896 DEFAULT_LINT_IGNORE_REGEX)
897
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000898 def _GetConfig(self, param, **kwargs):
899 self.LazyUpdateIfNeeded()
900 return RunGit(['config', param], **kwargs).strip()
901
902
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000903def ShortBranchName(branch):
904 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000905 return branch.replace('refs/heads/', '', 1)
906
907
908def GetCurrentBranchRef():
909 """Returns branch ref (e.g., refs/heads/master) or None."""
910 return RunGit(['symbolic-ref', 'HEAD'],
911 stderr=subprocess2.VOID, error_ok=True).strip() or None
912
913
914def GetCurrentBranch():
915 """Returns current branch or None.
916
917 For refs/heads/* branches, returns just last part. For others, full ref.
918 """
919 branchref = GetCurrentBranchRef()
920 if branchref:
921 return ShortBranchName(branchref)
922 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000923
924
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000925class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000926 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000927 NONE = 'none'
928 DRY_RUN = 'dry_run'
929 COMMIT = 'commit'
930
931 ALL_STATES = [NONE, DRY_RUN, COMMIT]
932
933
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000934class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000935 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000936 self.issue = issue
937 self.patchset = patchset
938 self.hostname = hostname
939
940 @property
941 def valid(self):
942 return self.issue is not None
943
944
Edward Lemurf38bc172019-09-03 21:02:13 +0000945def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
947 fail_result = _ParsedIssueNumberArgument()
948
Edward Lemur678a6842019-10-03 22:25:05 +0000949 if isinstance(arg, int):
950 return _ParsedIssueNumberArgument(issue=arg)
951 if not isinstance(arg, basestring):
952 return fail_result
953
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000954 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000955 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000956 if not arg.startswith('http'):
957 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700958
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000959 url = gclient_utils.UpgradeToHttps(arg)
960 try:
961 parsed_url = urlparse.urlparse(url)
962 except ValueError:
963 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200964
Edward Lemur678a6842019-10-03 22:25:05 +0000965 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
966 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
967 # Short urls like https://domain/<issue_number> can be used, but don't allow
968 # specifying the patchset (you'd 404), but we allow that here.
969 if parsed_url.path == '/':
970 part = parsed_url.fragment
971 else:
972 part = parsed_url.path
973
974 match = re.match(
975 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
976 if not match:
977 return fail_result
978
979 issue = int(match.group('issue'))
980 patchset = match.group('patchset')
981 return _ParsedIssueNumberArgument(
982 issue=issue,
983 patchset=int(patchset) if patchset else None,
984 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000985
986
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000987def _create_description_from_log(args):
988 """Pulls out the commit log to use as a base for the CL description."""
989 log_args = []
990 if len(args) == 1 and not args[0].endswith('.'):
991 log_args = [args[0] + '..']
992 elif len(args) == 1 and args[0].endswith('...'):
993 log_args = [args[0][:-1]]
994 elif len(args) == 2:
995 log_args = [args[0] + '..' + args[1]]
996 else:
997 log_args = args[:] # Hope for the best!
998 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
999
1000
Aaron Gablea45ee112016-11-22 15:14:38 -08001001class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001002 def __init__(self, issue, url):
1003 self.issue = issue
1004 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001005 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001006
1007 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001008 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001009 self.issue, self.url)
1010
1011
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001012_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001013 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001014 # TODO(tandrii): these two aren't known in Gerrit.
1015 'approval', 'disapproval'])
1016
1017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """Changelist works with one changelist in local branch.
1020
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001021 Notes:
1022 * Not safe for concurrent multi-{thread,process} use.
1023 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001024 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025 """
1026
Edward Lemur125d60a2019-09-13 18:25:41 +00001027 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028 """Create a new ChangeList instance.
1029
Edward Lemurf38bc172019-09-03 21:02:13 +00001030 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001031 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001033 global settings
1034 if not settings:
1035 # Happens when git_cl.py is used as a utility library.
1036 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001037
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 self.branchref = branchref
1039 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001040 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.branch = ShortBranchName(self.branchref)
1042 else:
1043 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001045 self.lookedup_issue = False
1046 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.has_description = False
1048 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001049 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001051 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001052 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001053 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001054 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001055
Edward Lemur125d60a2019-09-13 18:25:41 +00001056 # Lazily cached values.
1057 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1058 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1059 # Map from change number (issue) to its detail cache.
1060 self._detail_cache = {}
1061
1062 if codereview_host is not None:
1063 assert not codereview_host.startswith('https://'), codereview_host
1064 self._gerrit_host = codereview_host
1065 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001066
1067 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001068 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001070 The return value is a string suitable for passing to git cl with the --cc
1071 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001072 """
1073 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001074 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001075 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1077 return self.cc
1078
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001079 def GetCCListWithoutDefault(self):
1080 """Return the users cc'd on this CL excluding default ones."""
1081 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001082 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001083 return self.cc
1084
Daniel Cheng7227d212017-11-17 08:12:37 -08001085 def ExtendCC(self, more_cc):
1086 """Extends the list of users to cc on this CL based on the changed files."""
1087 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088
1089 def GetBranch(self):
1090 """Returns the short branch name, e.g. 'master'."""
1091 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001092 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001093 if not branchref:
1094 return None
1095 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096 self.branch = ShortBranchName(self.branchref)
1097 return self.branch
1098
1099 def GetBranchRef(self):
1100 """Returns the full branch name, e.g. 'refs/heads/master'."""
1101 self.GetBranch() # Poke the lazy loader.
1102 return self.branchref
1103
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001104 def ClearBranch(self):
1105 """Clears cached branch data of this object."""
1106 self.branch = self.branchref = None
1107
tandrii5d48c322016-08-18 16:19:37 -07001108 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1109 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1110 kwargs['branch'] = self.GetBranch()
1111 return _git_get_branch_config_value(key, default, **kwargs)
1112
1113 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1114 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1115 assert self.GetBranch(), (
1116 'this CL must have an associated branch to %sset %s%s' %
1117 ('un' if value is None else '',
1118 key,
1119 '' if value is None else ' to %r' % value))
1120 kwargs['branch'] = self.GetBranch()
1121 return _git_set_branch_config_value(key, value, **kwargs)
1122
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001123 @staticmethod
1124 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001125 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 e.g. 'origin', 'refs/heads/master'
1127 """
1128 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001129 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1130
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001132 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001134 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1135 error_ok=True).strip()
1136 if upstream_branch:
1137 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001139 # Else, try to guess the origin remote.
1140 remote_branches = RunGit(['branch', '-r']).split()
1141 if 'origin/master' in remote_branches:
1142 # Fall back on origin/master if it exits.
1143 remote = 'origin'
1144 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001146 DieWithError(
1147 'Unable to determine default branch to diff against.\n'
1148 'Either pass complete "git diff"-style arguments, like\n'
1149 ' git cl upload origin/master\n'
1150 'or verify this branch is set up to track another \n'
1151 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001152
1153 return remote, upstream_branch
1154
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001155 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001156 upstream_branch = self.GetUpstreamBranch()
1157 if not BranchExists(upstream_branch):
1158 DieWithError('The upstream for the current branch (%s) does not exist '
1159 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001160 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001161 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001162
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001163 def GetUpstreamBranch(self):
1164 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001166 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001167 upstream_branch = upstream_branch.replace('refs/heads/',
1168 'refs/remotes/%s/' % remote)
1169 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1170 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001171 self.upstream_branch = upstream_branch
1172 return self.upstream_branch
1173
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001176 remote, branch = None, self.GetBranch()
1177 seen_branches = set()
1178 while branch not in seen_branches:
1179 seen_branches.add(branch)
1180 remote, branch = self.FetchUpstreamTuple(branch)
1181 branch = ShortBranchName(branch)
1182 if remote != '.' or branch.startswith('refs/remotes'):
1183 break
1184 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 remotes = RunGit(['remote'], error_ok=True).split()
1186 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001188 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001190 logging.warn('Could not determine which remote this change is '
1191 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001192 else:
1193 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001194 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001195 branch = 'HEAD'
1196 if branch.startswith('refs/remotes'):
1197 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001198 elif branch.startswith('refs/branch-heads/'):
1199 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 else:
1201 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001202 return self._remote
1203
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001204 def GitSanityChecks(self, upstream_git_obj):
1205 """Checks git repo status and ensures diff is from local commits."""
1206
sbc@chromium.org79706062015-01-14 21:18:12 +00001207 if upstream_git_obj is None:
1208 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001209 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001210 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001211 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001212 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001213 return False
1214
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001215 # Verify the commit we're diffing against is in our current branch.
1216 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1217 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1218 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001219 print('ERROR: %s is not in the current branch. You may need to rebase '
1220 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001221 return False
1222
1223 # List the commits inside the diff, and verify they are all local.
1224 commits_in_diff = RunGit(
1225 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1226 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1227 remote_branch = remote_branch.strip()
1228 if code != 0:
1229 _, remote_branch = self.GetRemoteBranch()
1230
1231 commits_in_remote = RunGit(
1232 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1233
1234 common_commits = set(commits_in_diff) & set(commits_in_remote)
1235 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001236 print('ERROR: Your diff contains %d commits already in %s.\n'
1237 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1238 'the diff. If you are using a custom git flow, you can override'
1239 ' the reference used for this check with "git config '
1240 'gitcl.remotebranch <git-ref>".' % (
1241 len(common_commits), remote_branch, upstream_git_obj),
1242 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001243 return False
1244 return True
1245
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001246 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001247 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001248
1249 Returns None if it is not set.
1250 """
tandrii5d48c322016-08-18 16:19:37 -07001251 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001252
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 def GetRemoteUrl(self):
1254 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1255
1256 Returns None if there is no remote.
1257 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001258 is_cached, value = self._cached_remote_url
1259 if is_cached:
1260 return value
1261
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001262 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001263 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1264
Edward Lemur298f2cf2019-02-22 21:40:39 +00001265 # Check if the remote url can be parsed as an URL.
1266 host = urlparse.urlparse(url).netloc
1267 if host:
1268 self._cached_remote_url = (True, url)
1269 return url
1270
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001271 # If it cannot be parsed as an url, assume it is a local directory,
1272 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001273 logging.warning('"%s" doesn\'t appear to point to a git host. '
1274 'Interpreting it as a local directory.', url)
1275 if not os.path.isdir(url):
1276 logging.error(
1277 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001278 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001279 return None
1280
1281 cache_path = url
1282 url = RunGit(['config', 'remote.%s.url' % remote],
1283 error_ok=True,
1284 cwd=url).strip()
1285
1286 host = urlparse.urlparse(url).netloc
1287 if not host:
1288 logging.error(
1289 'Remote "%(remote)s" for branch "%(branch)s" points to '
1290 '"%(cache_path)s", but it is misconfigured.\n'
1291 '"%(cache_path)s" must be a git repo and must have a remote named '
1292 '"%(remote)s" pointing to the git host.', {
1293 'remote': remote,
1294 'cache_path': cache_path,
1295 'branch': self.GetBranch()})
1296 return None
1297
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001298 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001299 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001301 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001302 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001303 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001304 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001305 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 return self.issue
1308
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 def GetIssueURL(self):
1310 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001311 issue = self.GetIssue()
1312 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001313 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001314 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001316 def GetDescription(self, pretty=False, force=False):
1317 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001319 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001320 self.has_description = True
1321 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001322 # Set width to 72 columns + 2 space indent.
1323 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001324 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001325 lines = self.description.splitlines()
1326 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001327 return self.description
1328
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001329 def GetDescriptionFooters(self):
1330 """Returns (non_footer_lines, footers) for the commit message.
1331
1332 Returns:
1333 non_footer_lines (list(str)) - Simple list of description lines without
1334 any footer. The lines do not contain newlines, nor does the list contain
1335 the empty line between the message and the footers.
1336 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1337 [("Change-Id", "Ideadbeef...."), ...]
1338 """
1339 raw_description = self.GetDescription()
1340 msg_lines, _, footers = git_footers.split_footers(raw_description)
1341 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001342 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001343 return msg_lines, footers
1344
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001346 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001347 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001348 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001349 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001350 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001351 return self.patchset
1352
1353 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001354 """Set this branch's patchset. If patchset=0, clears the patchset."""
1355 assert self.GetBranch()
1356 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001357 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001358 else:
1359 self.patchset = int(patchset)
1360 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001361 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001363 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001364 """Set this branch's issue. If issue isn't given, clears the issue."""
1365 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001366 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001367 issue = int(issue)
1368 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001369 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001370 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001371 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001372 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001373 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001374 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001375 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001376 else:
tandrii5d48c322016-08-18 16:19:37 -07001377 # Reset all of these just to be clean.
1378 reset_suffixes = [
1379 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001380 self.IssueConfigKey(),
1381 self.PatchsetConfigKey(),
1382 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001383 ] + self._PostUnsetIssueProperties()
1384 for prop in reset_suffixes:
1385 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001386 msg = RunGit(['log', '-1', '--format=%B']).strip()
1387 if msg and git_footers.get_footer_change_id(msg):
1388 print('WARNING: The change patched into this branch has a Change-Id. '
1389 'Removing it.')
1390 RunGit(['commit', '--amend', '-m',
1391 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001392 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001393 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001394 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001395
dnjba1b0f32016-09-02 12:37:42 -07001396 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001397 if not self.GitSanityChecks(upstream_branch):
1398 DieWithError('\nGit sanity check failure')
1399
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001400 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001401 if not root:
1402 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001403 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001404
1405 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001406 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001407 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001408 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001409 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001410 except subprocess2.CalledProcessError:
1411 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001412 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001413 'This branch probably doesn\'t exist anymore. To reset the\n'
1414 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001415 ' git branch --set-upstream-to origin/master %s\n'
1416 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001417 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001418
maruel@chromium.org52424302012-08-29 15:14:30 +00001419 issue = self.GetIssue()
1420 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001421 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001422 description = self.GetDescription()
1423 else:
1424 # If the change was never uploaded, use the log messages of all commits
1425 # up to the branch point, as git cl upload will prefill the description
1426 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001427 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1428 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001429
1430 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001431 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001432 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001433 name,
1434 description,
1435 absroot,
1436 files,
1437 issue,
1438 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001439 author,
1440 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001441
dsansomee2d6fd92016-09-08 00:10:47 -07001442 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001443 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001444 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001445 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001446
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001447 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1448 """Sets the description for this CL remotely.
1449
1450 You can get description_lines and footers with GetDescriptionFooters.
1451
1452 Args:
1453 description_lines (list(str)) - List of CL description lines without
1454 newline characters.
1455 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1456 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1457 `List-Of-Tokens`). It will be case-normalized so that each token is
1458 title-cased.
1459 """
1460 new_description = '\n'.join(description_lines)
1461 if footers:
1462 new_description += '\n'
1463 for k, v in footers:
1464 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1465 if not git_footers.FOOTER_PATTERN.match(foot):
1466 raise ValueError('Invalid footer %r' % foot)
1467 new_description += foot + '\n'
1468 self.UpdateDescription(new_description, force)
1469
Edward Lesmes8e282792018-04-03 18:50:29 -04001470 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001471 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1472 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001473 start = time_time()
1474 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001475 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1476 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001477 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001478 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001479 metrics.collector.add_repeated('sub_commands', {
1480 'command': 'presubmit',
1481 'execution_time': time_time() - start,
1482 'exit_code': 0 if result.should_continue() else 1,
1483 })
1484 return result
vapierfd77ac72016-06-16 08:33:57 -07001485 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001486 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001487
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001488 def CMDUpload(self, options, git_diff_args, orig_args):
1489 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001490 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001491 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001492 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001493 else:
1494 if self.GetBranch() is None:
1495 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1496
1497 # Default to diffing against common ancestor of upstream branch
1498 base_branch = self.GetCommonAncestorWithUpstream()
1499 git_diff_args = [base_branch, 'HEAD']
1500
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001501 # Fast best-effort checks to abort before running potentially expensive
1502 # hooks if uploading is likely to fail anyway. Passing these checks does
1503 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001504 self.EnsureAuthenticated(force=options.force)
1505 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001506
1507 # Apply watchlists on upload.
1508 change = self.GetChange(base_branch, None)
1509 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1510 files = [f.LocalPath() for f in change.AffectedFiles()]
1511 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001512 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513
1514 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001515 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001516 # Set the reviewer list now so that presubmit checks can access it.
1517 change_description = ChangeDescription(change.FullDescriptionText())
1518 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001519 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001520 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001521 change)
1522 change.SetDescriptionText(change_description.description)
1523 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001524 may_prompt=not options.force,
1525 verbose=options.verbose,
1526 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001527 if not hook_results.should_continue():
1528 return 1
1529 if not options.reviewers and hook_results.reviewers:
1530 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001531 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532
Aaron Gable13101a62018-02-09 13:20:41 -08001533 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001534 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001535 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001536 _git_set_branch_config_value('last-upload-hash',
1537 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001538 # Run post upload hooks, if specified.
1539 if settings.GetRunPostUploadHook():
1540 presubmit_support.DoPostUploadExecuter(
1541 change,
1542 self,
1543 settings.GetRoot(),
1544 options.verbose,
1545 sys.stdout)
1546
1547 # Upload all dependencies if specified.
1548 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001549 print()
1550 print('--dependencies has been specified.')
1551 print('All dependent local branches will be re-uploaded.')
1552 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553 # Remove the dependencies flag from args so that we do not end up in a
1554 # loop.
1555 orig_args.remove('--dependencies')
1556 ret = upload_branch_deps(self, orig_args)
1557 return ret
1558
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001559 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001560 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001561
1562 Issue must have been already uploaded and known.
1563 """
1564 assert new_state in _CQState.ALL_STATES
1565 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001566 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001567 vote_map = {
1568 _CQState.NONE: 0,
1569 _CQState.DRY_RUN: 1,
1570 _CQState.COMMIT: 2,
1571 }
1572 labels = {'Commit-Queue': vote_map[new_state]}
1573 notify = False if new_state == _CQState.DRY_RUN else None
1574 gerrit_util.SetReview(
1575 self._GetGerritHost(), self._GerritChangeIdentifier(),
1576 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001577 return 0
1578 except KeyboardInterrupt:
1579 raise
1580 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001581 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001582 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001583 ' * Your project has no CQ,\n'
1584 ' * You don\'t have permission to change the CQ state,\n'
1585 ' * There\'s a bug in this code (see stack trace below).\n'
1586 'Consider specifying which bots to trigger manually or asking your '
1587 'project owners for permissions or contacting Chrome Infra at:\n'
1588 'https://www.chromium.org/infra\n\n' %
1589 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001590 # Still raise exception so that stack trace is printed.
1591 raise
1592
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001593 def _GetGerritHost(self):
1594 # Lazy load of configs.
1595 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001596 if self._gerrit_host and '.' not in self._gerrit_host:
1597 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1598 # This happens for internal stuff http://crbug.com/614312.
1599 parsed = urlparse.urlparse(self.GetRemoteUrl())
1600 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001601 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001602 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001603 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1604 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001605 return self._gerrit_host
1606
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001607 def _GetGitHost(self):
1608 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001609 remote_url = self.GetRemoteUrl()
1610 if not remote_url:
1611 return None
1612 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001613
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001614 def GetCodereviewServer(self):
1615 if not self._gerrit_server:
1616 # If we're on a branch then get the server potentially associated
1617 # with that branch.
1618 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001619 self._gerrit_server = self._GitGetBranchConfigValue(
1620 self.CodereviewServerConfigKey())
1621 if self._gerrit_server:
1622 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001623 if not self._gerrit_server:
1624 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1625 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001626 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001627 parts[0] = parts[0] + '-review'
1628 self._gerrit_host = '.'.join(parts)
1629 self._gerrit_server = 'https://%s' % self._gerrit_host
1630 return self._gerrit_server
1631
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001632 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001633 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001634 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001635 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001636 logging.warn('can\'t detect Gerrit project.')
1637 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001638 project = urlparse.urlparse(remote_url).path.strip('/')
1639 if project.endswith('.git'):
1640 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001641 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1642 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1643 # gitiles/git-over-https protocol. E.g.,
1644 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1645 # as
1646 # https://chromium.googlesource.com/v8/v8
1647 if project.startswith('a/'):
1648 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001649 return project
1650
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001651 def _GerritChangeIdentifier(self):
1652 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1653
1654 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001655 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001656 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001657 project = self._GetGerritProject()
1658 if project:
1659 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1660 # Fall back on still unique, but less efficient change number.
1661 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001662
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001663 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001664 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001665 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001666
tandrii5d48c322016-08-18 16:19:37 -07001667 @classmethod
1668 def PatchsetConfigKey(cls):
1669 return 'gerritpatchset'
1670
1671 @classmethod
1672 def CodereviewServerConfigKey(cls):
1673 return 'gerritserver'
1674
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001675 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001676 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001677 if settings.GetGerritSkipEnsureAuthenticated():
1678 # For projects with unusual authentication schemes.
1679 # See http://crbug.com/603378.
1680 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001681
1682 # Check presence of cookies only if using cookies-based auth method.
1683 cookie_auth = gerrit_util.Authenticator.get()
1684 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001685 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001686
Daniel Chengcf6269b2019-05-18 01:02:12 +00001687 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1688 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001689 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001690 return
1691
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001692 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001693 self.GetCodereviewServer()
1694 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001695 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001696
1697 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1698 git_auth = cookie_auth.get_auth_header(git_host)
1699 if gerrit_auth and git_auth:
1700 if gerrit_auth == git_auth:
1701 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001702 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001703 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001704 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001705 ' %s\n'
1706 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001707 ' Consider running the following command:\n'
1708 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001709 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001710 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001711 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001712 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 cookie_auth.get_new_password_message(git_host)))
1714 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001715 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001716 return
1717 else:
1718 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001719 ([] if gerrit_auth else [self._gerrit_host]) +
1720 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001721 DieWithError('Credentials for the following hosts are required:\n'
1722 ' %s\n'
1723 'These are read from %s (or legacy %s)\n'
1724 '%s' % (
1725 '\n '.join(missing),
1726 cookie_auth.get_gitcookies_path(),
1727 cookie_auth.get_netrc_path(),
1728 cookie_auth.get_new_password_message(git_host)))
1729
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001730 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001731 if not self.GetIssue():
1732 return
1733
1734 # Warm change details cache now to avoid RPCs later, reducing latency for
1735 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001736 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001737 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001738
1739 status = self._GetChangeDetail()['status']
1740 if status in ('MERGED', 'ABANDONED'):
1741 DieWithError('Change %s has been %s, new uploads are not allowed' %
1742 (self.GetIssueURL(),
1743 'submitted' if status == 'MERGED' else 'abandoned'))
1744
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001745 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1746 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1747 # Apparently this check is not very important? Otherwise get_auth_email
1748 # could have been added to other implementations of Authenticator.
1749 cookies_auth = gerrit_util.Authenticator.get()
1750 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001751 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001752
1753 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001754 if self.GetIssueOwner() == cookies_user:
1755 return
1756 logging.debug('change %s owner is %s, cookies user is %s',
1757 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001758 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001759 # so ask what Gerrit thinks of this user.
1760 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1761 if details['email'] == self.GetIssueOwner():
1762 return
1763 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001764 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001765 'as %s.\n'
1766 'Uploading may fail due to lack of permissions.' %
1767 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1768 confirm_or_exit(action='upload')
1769
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001770 def _PostUnsetIssueProperties(self):
1771 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001772 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001773
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001774 def GetGerritObjForPresubmit(self):
1775 return presubmit_support.GerritAccessor(self._GetGerritHost())
1776
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001777 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001778 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001779 or CQ status, assuming adherence to a common workflow.
1780
1781 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001782 * 'error' - error from review tool (including deleted issues)
1783 * 'unsent' - no reviewers added
1784 * 'waiting' - waiting for review
1785 * 'reply' - waiting for uploader to reply to review
1786 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001787 * 'dry-run' - dry-running in the CQ
1788 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001789 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001790 """
1791 if not self.GetIssue():
1792 return None
1793
1794 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001795 data = self._GetChangeDetail([
1796 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001797 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001798 return 'error'
1799
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001800 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001801 return 'closed'
1802
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001803 cq_label = data['labels'].get('Commit-Queue', {})
1804 max_cq_vote = 0
1805 for vote in cq_label.get('all', []):
1806 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1807 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001808 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001809 if max_cq_vote == 1:
1810 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001811
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 if data['labels'].get('Code-Review', {}).get('approved'):
1813 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001814
1815 if not data.get('reviewers', {}).get('REVIEWER', []):
1816 return 'unsent'
1817
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001818 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1820 last_message_author = messages.pop().get('author', {})
1821 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001822 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1823 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001824 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001825 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001826 if last_message_author.get('_account_id') == owner:
1827 # Most recent message was by owner.
1828 return 'waiting'
1829 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001830 # Some reply from non-owner.
1831 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832
1833 # Somehow there are no messages even though there are reviewers.
1834 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001835
1836 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001837 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001838 patchset = data['revisions'][data['current_revision']]['_number']
1839 self.SetPatchset(patchset)
1840 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001842 def FetchDescription(self, force=False):
1843 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1844 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001845 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001846 return data['revisions'][current_rev]['commit']['message'].encode(
1847 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001848
dsansomee2d6fd92016-09-08 00:10:47 -07001849 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001850 if gerrit_util.HasPendingChangeEdit(
1851 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001852 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001853 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001854 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001855 'unpublished edit. Either publish the edit in the Gerrit web UI '
1856 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001857
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001858 gerrit_util.DeletePendingChangeEdit(
1859 self._GetGerritHost(), self._GerritChangeIdentifier())
1860 gerrit_util.SetCommitMessage(
1861 self._GetGerritHost(), self._GerritChangeIdentifier(),
1862 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001863
Aaron Gable636b13f2017-07-14 10:42:48 -07001864 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001865 gerrit_util.SetReview(
1866 self._GetGerritHost(), self._GerritChangeIdentifier(),
1867 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001868
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001869 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001870 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001871 # CURRENT_REVISION is included to get the latest patchset so that
1872 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001873 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001874 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1875 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001876 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001877 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001878 robot_file_comments = gerrit_util.GetChangeRobotComments(
1879 self._GetGerritHost(), self._GerritChangeIdentifier())
1880
1881 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001882 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001883 latest_patch_set = self.GetMostRecentPatchset()
1884 for path, robot_comments in robot_file_comments.iteritems():
1885 line_comments = file_comments.setdefault(path, [])
1886 line_comments.extend(
1887 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001888
1889 # Build dictionary of file comments for easy access and sorting later.
1890 # {author+date: {path: {patchset: {line: url+message}}}}
1891 comments = collections.defaultdict(
1892 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1893 for path, line_comments in file_comments.iteritems():
1894 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001895 tag = comment.get('tag', '')
1896 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001897 continue
1898 key = (comment['author']['email'], comment['updated'])
1899 if comment.get('side', 'REVISION') == 'PARENT':
1900 patchset = 'Base'
1901 else:
1902 patchset = 'PS%d' % comment['patch_set']
1903 line = comment.get('line', 0)
1904 url = ('https://%s/c/%s/%s/%s#%s%s' %
1905 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1906 'b' if comment.get('side') == 'PARENT' else '',
1907 str(line) if line else ''))
1908 comments[key][path][patchset][line] = (url, comment['message'])
1909
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001910 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001911 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001912 summary = self._BuildCommentSummary(msg, comments, readable)
1913 if summary:
1914 summaries.append(summary)
1915 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001916
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001917 @staticmethod
1918 def _BuildCommentSummary(msg, comments, readable):
1919 key = (msg['author']['email'], msg['date'])
1920 # Don't bother showing autogenerated messages that don't have associated
1921 # file or line comments. this will filter out most autogenerated
1922 # messages, but will keep robot comments like those from Tricium.
1923 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1924 if is_autogenerated and not comments.get(key):
1925 return None
1926 message = msg['message']
1927 # Gerrit spits out nanoseconds.
1928 assert len(msg['date'].split('.')[-1]) == 9
1929 date = datetime.datetime.strptime(msg['date'][:-3],
1930 '%Y-%m-%d %H:%M:%S.%f')
1931 if key in comments:
1932 message += '\n'
1933 for path, patchsets in sorted(comments.get(key, {}).items()):
1934 if readable:
1935 message += '\n%s' % path
1936 for patchset, lines in sorted(patchsets.items()):
1937 for line, (url, content) in sorted(lines.items()):
1938 if line:
1939 line_str = 'Line %d' % line
1940 path_str = '%s:%d:' % (path, line)
1941 else:
1942 line_str = 'File comment'
1943 path_str = '%s:0:' % path
1944 if readable:
1945 message += '\n %s, %s: %s' % (patchset, line_str, url)
1946 message += '\n %s\n' % content
1947 else:
1948 message += '\n%s ' % path_str
1949 message += '\n%s\n' % content
1950
1951 return _CommentSummary(
1952 date=date,
1953 message=message,
1954 sender=msg['author']['email'],
1955 autogenerated=is_autogenerated,
1956 # These could be inferred from the text messages and correlated with
1957 # Code-Review label maximum, however this is not reliable.
1958 # Leaving as is until the need arises.
1959 approval=False,
1960 disapproval=False,
1961 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001962
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001964 gerrit_util.AbandonChange(
1965 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001967 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001968 gerrit_util.SubmitChange(
1969 self._GetGerritHost(), self._GerritChangeIdentifier(),
1970 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001971
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001972 def _GetChangeDetail(self, options=None, no_cache=False):
1973 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001974
1975 If fresh data is needed, set no_cache=True which will clear cache and
1976 thus new data will be fetched from Gerrit.
1977 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001978 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001979 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001980
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001981 # Optimization to avoid multiple RPCs:
1982 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1983 'CURRENT_COMMIT' not in options):
1984 options.append('CURRENT_COMMIT')
1985
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001986 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001987 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001988 options = [o.upper() for o in options]
1989
1990 # Check in cache first unless no_cache is True.
1991 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001992 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001993 else:
1994 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001995 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001996 # Assumption: data fetched before with extra options is suitable
1997 # for return for a smaller set of options.
1998 # For example, if we cached data for
1999 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2000 # and request is for options=[CURRENT_REVISION],
2001 # THEN we can return prior cached data.
2002 if options_set.issubset(cached_options_set):
2003 return data
2004
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002005 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002006 data = gerrit_util.GetChangeDetail(
2007 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002008 except gerrit_util.GerritError as e:
2009 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002010 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002011 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002012
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002013 self._detail_cache.setdefault(cache_key, []).append(
2014 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002015 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002016
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002017 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002018 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002019 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002020 data = gerrit_util.GetChangeCommit(
2021 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002022 except gerrit_util.GerritError as e:
2023 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002024 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002025 raise
agable32978d92016-11-01 12:55:02 -07002026 return data
2027
Karen Qian40c19422019-03-13 21:28:29 +00002028 def _IsCqConfigured(self):
2029 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002030 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002031 return False
2032 # TODO(crbug/753213): Remove temporary hack
2033 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002034 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002035 detail['branch'].startswith('refs/branch-heads/')):
2036 return False
2037 return True
2038
Olivier Robin75ee7252018-04-13 10:02:56 +02002039 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002040 if git_common.is_dirty_git_tree('land'):
2041 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002042
tandriid60367b2016-06-22 05:25:12 -07002043 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002044 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002045 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002046 'which can test and land changes for you. '
2047 'Are you sure you wish to bypass it?\n',
2048 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002049 differs = True
tandriic4344b52016-08-29 06:04:54 -07002050 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002051 # Note: git diff outputs nothing if there is no diff.
2052 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002053 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002054 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002055 if detail['current_revision'] == last_upload:
2056 differs = False
2057 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002058 print('WARNING: Local branch contents differ from latest uploaded '
2059 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002060 if differs:
2061 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002062 confirm_or_exit(
2063 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2064 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002065 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 elif not bypass_hooks:
2067 hook_results = self.RunHook(
2068 committing=True,
2069 may_prompt=not force,
2070 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002071 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2072 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002073 if not hook_results.should_continue():
2074 return 1
2075
2076 self.SubmitIssue(wait_for_merge=True)
2077 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002078 links = self._GetChangeCommit().get('web_links', [])
2079 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002080 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002081 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002082 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002083 return 0
2084
Edward Lemurf38bc172019-09-03 21:02:13 +00002085 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002086 assert parsed_issue_arg.valid
2087
Edward Lemur125d60a2019-09-13 18:25:41 +00002088 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002089
2090 if parsed_issue_arg.hostname:
2091 self._gerrit_host = parsed_issue_arg.hostname
2092 self._gerrit_server = 'https://%s' % self._gerrit_host
2093
tandriic2405f52016-10-10 08:13:15 -07002094 try:
2095 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002096 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002097 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002098
2099 if not parsed_issue_arg.patchset:
2100 # Use current revision by default.
2101 revision_info = detail['revisions'][detail['current_revision']]
2102 patchset = int(revision_info['_number'])
2103 else:
2104 patchset = parsed_issue_arg.patchset
2105 for revision_info in detail['revisions'].itervalues():
2106 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2107 break
2108 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002109 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002110 (parsed_issue_arg.patchset, self.GetIssue()))
2111
Edward Lemur125d60a2019-09-13 18:25:41 +00002112 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002113 if remote_url.endswith('.git'):
2114 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002115 remote_url = remote_url.rstrip('/')
2116
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002118 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002119
2120 if remote_url != fetch_info['url']:
2121 DieWithError('Trying to patch a change from %s but this repo appears '
2122 'to be %s.' % (fetch_info['url'], remote_url))
2123
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002124 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002125
Aaron Gable62619a32017-06-16 08:22:09 -07002126 if force:
2127 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2128 print('Checked out commit for change %i patchset %i locally' %
2129 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002130 elif nocommit:
2131 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2132 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002133 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002134 RunGit(['cherry-pick', 'FETCH_HEAD'])
2135 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002136 (parsed_issue_arg.issue, patchset))
2137 print('Note: this created a local commit which does not have '
2138 'the same hash as the one uploaded for review. This will make '
2139 'uploading changes based on top of this branch difficult.\n'
2140 'If you want to do that, use "git cl patch --force" instead.')
2141
Stefan Zagerd08043c2017-10-12 12:07:02 -07002142 if self.GetBranch():
2143 self.SetIssue(parsed_issue_arg.issue)
2144 self.SetPatchset(patchset)
2145 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2146 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2147 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2148 else:
2149 print('WARNING: You are in detached HEAD state.\n'
2150 'The patch has been applied to your checkout, but you will not be '
2151 'able to upload a new patch set to the gerrit issue.\n'
2152 'Try using the \'-b\' option if you would like to work on a '
2153 'branch and/or upload a new patch set.')
2154
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 return 0
2156
tandrii16e0b4e2016-06-07 10:34:28 -07002157 def _GerritCommitMsgHookCheck(self, offer_removal):
2158 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2159 if not os.path.exists(hook):
2160 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002161 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2162 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002163 data = gclient_utils.FileRead(hook)
2164 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2165 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002166 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002167 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002168 'and may interfere with it in subtle ways.\n'
2169 'We recommend you remove the commit-msg hook.')
2170 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002171 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002172 gclient_utils.rm_file_or_tree(hook)
2173 print('Gerrit commit-msg hook removed.')
2174 else:
2175 print('OK, will keep Gerrit commit-msg hook in place.')
2176
Edward Lemur1b52d872019-05-09 21:12:12 +00002177 def _CleanUpOldTraces(self):
2178 """Keep only the last |MAX_TRACES| traces."""
2179 try:
2180 traces = sorted([
2181 os.path.join(TRACES_DIR, f)
2182 for f in os.listdir(TRACES_DIR)
2183 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2184 and not f.startswith('tmp'))
2185 ])
2186 traces_to_delete = traces[:-MAX_TRACES]
2187 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002188 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002189 except OSError:
2190 print('WARNING: Failed to remove old git traces from\n'
2191 ' %s'
2192 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002193
Edward Lemur5737f022019-05-17 01:24:00 +00002194 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002195 """Zip and write the git push traces stored in traces_dir."""
2196 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002197 traces_zip = trace_name + '-traces'
2198 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002199 # Create a temporary dir to store git config and gitcookies in. It will be
2200 # compressed and stored next to the traces.
2201 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002202 git_info_zip = trace_name + '-git-info'
2203
Edward Lemur5737f022019-05-17 01:24:00 +00002204 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002205 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002206 git_push_metadata['now'] = git_push_metadata['now'].decode(
2207 sys.stdin.encoding)
2208
Edward Lemur1b52d872019-05-09 21:12:12 +00002209 git_push_metadata['trace_name'] = trace_name
2210 gclient_utils.FileWrite(
2211 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2212
2213 # Keep only the first 6 characters of the git hashes on the packet
2214 # trace. This greatly decreases size after compression.
2215 packet_traces = os.path.join(traces_dir, 'trace-packet')
2216 if os.path.isfile(packet_traces):
2217 contents = gclient_utils.FileRead(packet_traces)
2218 gclient_utils.FileWrite(
2219 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2220 shutil.make_archive(traces_zip, 'zip', traces_dir)
2221
2222 # Collect and compress the git config and gitcookies.
2223 git_config = RunGit(['config', '-l'])
2224 gclient_utils.FileWrite(
2225 os.path.join(git_info_dir, 'git-config'),
2226 git_config)
2227
2228 cookie_auth = gerrit_util.Authenticator.get()
2229 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2230 gitcookies_path = cookie_auth.get_gitcookies_path()
2231 if os.path.isfile(gitcookies_path):
2232 gitcookies = gclient_utils.FileRead(gitcookies_path)
2233 gclient_utils.FileWrite(
2234 os.path.join(git_info_dir, 'gitcookies'),
2235 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2236 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2237
Edward Lemur1b52d872019-05-09 21:12:12 +00002238 gclient_utils.rmtree(git_info_dir)
2239
2240 def _RunGitPushWithTraces(
2241 self, change_desc, refspec, refspec_opts, git_push_metadata):
2242 """Run git push and collect the traces resulting from the execution."""
2243 # Create a temporary directory to store traces in. Traces will be compressed
2244 # and stored in a 'traces' dir inside depot_tools.
2245 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002246 trace_name = os.path.join(
2247 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002248
2249 env = os.environ.copy()
2250 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2251 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002252 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002253 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2254 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2255 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2256
2257 try:
2258 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002259 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002260 before_push = time_time()
2261 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002262 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002263 env=env,
2264 print_stdout=True,
2265 # Flush after every line: useful for seeing progress when running as
2266 # recipe.
2267 filter_fn=lambda _: sys.stdout.flush())
2268 except subprocess2.CalledProcessError as e:
2269 push_returncode = e.returncode
2270 DieWithError('Failed to create a change. Please examine output above '
2271 'for the reason of the failure.\n'
2272 'Hint: run command below to diagnose common Git/Gerrit '
2273 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002274 ' git cl creds-check\n'
2275 '\n'
2276 'If git-cl is not working correctly, file a bug under the '
2277 'Infra>SDK component including the files below.\n'
2278 'Review the files before upload, since they might contain '
2279 'sensitive information.\n'
2280 'Set the Restrict-View-Google label so that they are not '
2281 'publicly accessible.\n'
2282 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002283 change_desc)
2284 finally:
2285 execution_time = time_time() - before_push
2286 metrics.collector.add_repeated('sub_commands', {
2287 'command': 'git push',
2288 'execution_time': execution_time,
2289 'exit_code': push_returncode,
2290 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2291 })
2292
Edward Lemur1b52d872019-05-09 21:12:12 +00002293 git_push_metadata['execution_time'] = execution_time
2294 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002295 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002296
Edward Lemur1b52d872019-05-09 21:12:12 +00002297 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002298 gclient_utils.rmtree(traces_dir)
2299
2300 return push_stdout
2301
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002302 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002304 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002305 # Load default for user, repo, squash=true, in this order.
2306 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002307
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002308 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002309 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002310 # This may be None; default fallback value is determined in logic below.
2311 title = options.title
2312
Dominic Battre7d1c4842017-10-27 09:17:28 +02002313 # Extract bug number from branch name.
2314 bug = options.bug
2315 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2316 if not bug and match:
2317 bug = match.group(1)
2318
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002319 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002320 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002321 if self.GetIssue():
2322 # Try to get the message from a previous upload.
2323 message = self.GetDescription()
2324 if not message:
2325 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002326 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002328 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002329 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002330 # When uploading a subsequent patchset, -m|--message is taken
2331 # as the patchset title if --title was not provided.
2332 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002333 else:
2334 default_title = RunGit(
2335 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002336 if options.force:
2337 title = default_title
2338 else:
2339 title = ask_for_data(
2340 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 change_id = self._GetChangeDetail()['change_id']
2342 while True:
2343 footer_change_ids = git_footers.get_footer_change_id(message)
2344 if footer_change_ids == [change_id]:
2345 break
2346 if not footer_change_ids:
2347 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002348 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002349 continue
2350 # There is already a valid footer but with different or several ids.
2351 # Doing this automatically is non-trivial as we don't want to lose
2352 # existing other footers, yet we want to append just 1 desired
2353 # Change-Id. Thus, just create a new footer, but let user verify the
2354 # new description.
2355 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002356 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002357 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002358 print(
2359 'WARNING: change %s has Change-Id footer(s):\n'
2360 ' %s\n'
2361 'but change has Change-Id %s, according to Gerrit.\n'
2362 'Please, check the proposed correction to the description, '
2363 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2364 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2365 change_id))
2366 confirm_or_exit(action='edit')
2367 change_desc.prompt()
2368
2369 message = change_desc.description
2370 if not message:
2371 DieWithError("Description is empty. Aborting...")
2372
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 # Continue the while loop.
2374 # Sanity check of this code - we should end up with proper message
2375 # footer.
2376 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002377 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002378 else: # if not self.GetIssue()
2379 if options.message:
2380 message = options.message
2381 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002382 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002383 if options.title:
2384 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002385 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002387 change_desc.prompt()
2388
Aaron Gableb56ad332017-01-06 15:24:31 -08002389 # On first upload, patchset title is always this string, while
2390 # --title flag gets converted to first line of message.
2391 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002392 if not change_desc.description:
2393 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002394 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002395 if len(change_ids) > 1:
2396 DieWithError('too many Change-Id footers, at most 1 allowed.')
2397 if not change_ids:
2398 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002399 change_desc.set_description(git_footers.add_footer_change_id(
2400 change_desc.description,
2401 GenerateGerritChangeId(change_desc.description)))
2402 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 assert len(change_ids) == 1
2404 change_id = change_ids[0]
2405
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002406 if options.reviewers or options.tbrs or options.add_owners_to:
2407 change_desc.update_reviewers(options.reviewers, options.tbrs,
2408 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002409 if options.preserve_tryjobs:
2410 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002411
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002412 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002413 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2414 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002416 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2417 desc_tempfile.write(change_desc.description)
2418 desc_tempfile.close()
2419 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2420 '-F', desc_tempfile.name]).strip()
2421 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002422 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002423 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002424 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 if not change_desc.description:
2426 DieWithError("Description is empty. Aborting...")
2427
2428 if not git_footers.get_footer_change_id(change_desc.description):
2429 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002430 change_desc.set_description(
2431 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002432 if options.reviewers or options.tbrs or options.add_owners_to:
2433 change_desc.update_reviewers(options.reviewers, options.tbrs,
2434 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002435 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002436 # For no-squash mode, we assume the remote called "origin" is the one we
2437 # want. It is not worthwhile to support different workflows for
2438 # no-squash mode.
2439 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002440 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2441
2442 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002443 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002444 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2445 ref_to_push)]).splitlines()
2446 if len(commits) > 1:
2447 print('WARNING: This will upload %d commits. Run the following command '
2448 'to see which commits will be uploaded: ' % len(commits))
2449 print('git log %s..%s' % (parent, ref_to_push))
2450 print('You can also use `git squash-branch` to squash these into a '
2451 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002452 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002453
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002454 if options.reviewers or options.tbrs or options.add_owners_to:
2455 change_desc.update_reviewers(options.reviewers, options.tbrs,
2456 options.add_owners_to, change)
2457
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002458 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002459 cc = []
2460 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2461 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2462 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002463 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002464 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002465 if options.cc:
2466 cc.extend(options.cc)
2467 cc = filter(None, [email.strip() for email in cc])
2468 if change_desc.get_cced():
2469 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002470 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2471 valid_accounts = set(reviewers + cc)
2472 # TODO(crbug/877717): relax this for all hosts.
2473 else:
2474 valid_accounts = gerrit_util.ValidAccounts(
2475 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002476 logging.info('accounts %s are recognized, %s invalid',
2477 sorted(valid_accounts),
2478 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002479
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002480 # Extra options that can be specified at push time. Doc:
2481 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002482 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002483
Aaron Gable844cf292017-06-28 11:32:59 -07002484 # By default, new changes are started in WIP mode, and subsequent patchsets
2485 # don't send email. At any time, passing --send-mail will mark the change
2486 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002487 if options.send_mail:
2488 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002489 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002490 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002491 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002492 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002493 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002494
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002495 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002496 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002497
Aaron Gable9b713dd2016-12-14 16:04:21 -08002498 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002499 # Punctuation and whitespace in |title| must be percent-encoded.
2500 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002501
agablec6787972016-09-09 16:13:34 -07002502 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002503 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002504
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002505 for r in sorted(reviewers):
2506 if r in valid_accounts:
2507 refspec_opts.append('r=%s' % r)
2508 reviewers.remove(r)
2509 else:
2510 # TODO(tandrii): this should probably be a hard failure.
2511 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2512 % r)
2513 for c in sorted(cc):
2514 # refspec option will be rejected if cc doesn't correspond to an
2515 # account, even though REST call to add such arbitrary cc may succeed.
2516 if c in valid_accounts:
2517 refspec_opts.append('cc=%s' % c)
2518 cc.remove(c)
2519
rmistry9eadede2016-09-19 11:22:43 -07002520 if options.topic:
2521 # Documentation on Gerrit topics is here:
2522 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002523 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002524
Edward Lemur687ca902018-12-05 02:30:30 +00002525 if options.enable_auto_submit:
2526 refspec_opts.append('l=Auto-Submit+1')
2527 if options.use_commit_queue:
2528 refspec_opts.append('l=Commit-Queue+2')
2529 elif options.cq_dry_run:
2530 refspec_opts.append('l=Commit-Queue+1')
2531
2532 if change_desc.get_reviewers(tbr_only=True):
2533 score = gerrit_util.GetCodeReviewTbrScore(
2534 self._GetGerritHost(),
2535 self._GetGerritProject())
2536 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002537
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002538 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002539 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002540 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002541 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002542 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2543
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002544 refspec_suffix = ''
2545 if refspec_opts:
2546 refspec_suffix = '%' + ','.join(refspec_opts)
2547 assert ' ' not in refspec_suffix, (
2548 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2549 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2550
Edward Lemur1b52d872019-05-09 21:12:12 +00002551 git_push_metadata = {
2552 'gerrit_host': self._GetGerritHost(),
2553 'title': title or '<untitled>',
2554 'change_id': change_id,
2555 'description': change_desc.description,
2556 }
2557 push_stdout = self._RunGitPushWithTraces(
2558 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002559
2560 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002561 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002562 change_numbers = [m.group(1)
2563 for m in map(regex.match, push_stdout.splitlines())
2564 if m]
2565 if len(change_numbers) != 1:
2566 DieWithError(
2567 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002568 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002569 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002570 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002571
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002572 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002573 # GetIssue() is not set in case of non-squash uploads according to tests.
2574 # TODO(agable): non-squash uploads in git cl should be removed.
2575 gerrit_util.AddReviewers(
2576 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002577 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002578 reviewers, cc,
2579 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002580
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002581 return 0
2582
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002583 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2584 change_desc):
2585 """Computes parent of the generated commit to be uploaded to Gerrit.
2586
2587 Returns revision or a ref name.
2588 """
2589 if custom_cl_base:
2590 # Try to avoid creating additional unintended CLs when uploading, unless
2591 # user wants to take this risk.
2592 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2593 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2594 local_ref_of_target_remote])
2595 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002596 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002597 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2598 'If you proceed with upload, more than 1 CL may be created by '
2599 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2600 'If you are certain that specified base `%s` has already been '
2601 'uploaded to Gerrit as another CL, you may proceed.\n' %
2602 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2603 if not force:
2604 confirm_or_exit(
2605 'Do you take responsibility for cleaning up potential mess '
2606 'resulting from proceeding with upload?',
2607 action='upload')
2608 return custom_cl_base
2609
Aaron Gablef97e33d2017-03-30 15:44:27 -07002610 if remote != '.':
2611 return self.GetCommonAncestorWithUpstream()
2612
2613 # If our upstream branch is local, we base our squashed commit on its
2614 # squashed version.
2615 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2616
Aaron Gablef97e33d2017-03-30 15:44:27 -07002617 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002618 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002619
2620 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002621 # TODO(tandrii): consider checking parent change in Gerrit and using its
2622 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2623 # the tree hash of the parent branch. The upside is less likely bogus
2624 # requests to reupload parent change just because it's uploadhash is
2625 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002626 parent = RunGit(['config',
2627 'branch.%s.gerritsquashhash' % upstream_branch_name],
2628 error_ok=True).strip()
2629 # Verify that the upstream branch has been uploaded too, otherwise
2630 # Gerrit will create additional CLs when uploading.
2631 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2632 RunGitSilent(['rev-parse', parent + ':'])):
2633 DieWithError(
2634 '\nUpload upstream branch %s first.\n'
2635 'It is likely that this branch has been rebased since its last '
2636 'upload, so you just need to upload it again.\n'
2637 '(If you uploaded it with --no-squash, then branch dependencies '
2638 'are not supported, and you should reupload with --squash.)'
2639 % upstream_branch_name,
2640 change_desc)
2641 return parent
2642
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002643 def _AddChangeIdToCommitMessage(self, options, args):
2644 """Re-commits using the current message, assumes the commit hook is in
2645 place.
2646 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002647 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002648 git_command = ['commit', '--amend', '-m', log_desc]
2649 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002650 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002651 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002652 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002653 return new_log_desc
2654 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002655 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002656
tandriie113dfd2016-10-11 10:20:12 -07002657 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002658 try:
2659 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002660 except GerritChangeNotExists:
2661 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002662
2663 if data['status'] in ('ABANDONED', 'MERGED'):
2664 return 'CL %s is closed' % self.GetIssue()
2665
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002666 def GetGerritChange(self, patchset=None):
2667 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2668 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2669 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002670 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002671 data = self._GetChangeDetail(['ALL_REVISIONS'])
2672
2673 assert host and issue and patchset, 'CL must be uploaded first'
2674
2675 has_patchset = any(
2676 int(revision_data['_number']) == patchset
2677 for revision_data in data['revisions'].itervalues())
2678 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002679 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002680 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002681
tandrii8c5a3532016-11-04 07:52:02 -07002682 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002683 'host': host,
2684 'change': issue,
2685 'project': data['project'],
2686 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002687 }
tandriie113dfd2016-10-11 10:20:12 -07002688
tandriide281ae2016-10-12 06:02:30 -07002689 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002690 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002691
Edward Lemur707d70b2018-02-07 00:50:14 +01002692 def GetReviewers(self):
2693 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002694 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002695
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002696
2697_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002698 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002699}
2700
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002701
iannuccie53c9352016-08-17 14:40:40 -07002702def _add_codereview_issue_select_options(parser, extra=""):
2703 _add_codereview_select_options(parser)
2704
2705 text = ('Operate on this issue number instead of the current branch\'s '
2706 'implicit issue.')
2707 if extra:
2708 text += ' '+extra
2709 parser.add_option('-i', '--issue', type=int, help=text)
2710
2711
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002712def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002713 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002714 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002715 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002716 parser.add_option_group(parser.codereview_group)
2717 parser.codereview_group.add_option(
2718 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002719 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002720
2721
tandriif9aefb72016-07-01 09:06:51 -07002722def _get_bug_line_values(default_project, bugs):
2723 """Given default_project and comma separated list of bugs, yields bug line
2724 values.
2725
2726 Each bug can be either:
2727 * a number, which is combined with default_project
2728 * string, which is left as is.
2729
2730 This function may produce more than one line, because bugdroid expects one
2731 project per line.
2732
2733 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2734 ['v8:123', 'chromium:789']
2735 """
2736 default_bugs = []
2737 others = []
2738 for bug in bugs.split(','):
2739 bug = bug.strip()
2740 if bug:
2741 try:
2742 default_bugs.append(int(bug))
2743 except ValueError:
2744 others.append(bug)
2745
2746 if default_bugs:
2747 default_bugs = ','.join(map(str, default_bugs))
2748 if default_project:
2749 yield '%s:%s' % (default_project, default_bugs)
2750 else:
2751 yield default_bugs
2752 for other in sorted(others):
2753 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2754 yield other
2755
2756
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002757class ChangeDescription(object):
2758 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002759 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002760 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002761 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002762 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002763 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2764 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2765 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2766 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002767
Anthony Polito8b955342019-09-24 19:01:36 +00002768 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002769 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002770 if bug:
2771 regexp = re.compile(self.BUG_LINE)
2772 prefix = settings.GetBugPrefix()
2773 if not any((regexp.match(line) for line in self._description_lines)):
2774 values = list(_get_bug_line_values(prefix, bug))
2775 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002776
agable@chromium.org42c20792013-09-12 17:34:49 +00002777 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002778 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002779 return '\n'.join(self._description_lines)
2780
2781 def set_description(self, desc):
2782 if isinstance(desc, basestring):
2783 lines = desc.splitlines()
2784 else:
2785 lines = [line.rstrip() for line in desc]
2786 while lines and not lines[0]:
2787 lines.pop(0)
2788 while lines and not lines[-1]:
2789 lines.pop(-1)
2790 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002791
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002792 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2793 """Rewrites the R=/TBR= line(s) as a single line each.
2794
2795 Args:
2796 reviewers (list(str)) - list of additional emails to use for reviewers.
2797 tbrs (list(str)) - list of additional emails to use for TBRs.
2798 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2799 the change that are missing OWNER coverage. If this is not None, you
2800 must also pass a value for `change`.
2801 change (Change) - The Change that should be used for OWNERS lookups.
2802 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002803 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002804 assert isinstance(tbrs, list), tbrs
2805
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002806 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002807 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002808
2809 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002810 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002811
2812 reviewers = set(reviewers)
2813 tbrs = set(tbrs)
2814 LOOKUP = {
2815 'TBR': tbrs,
2816 'R': reviewers,
2817 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002818
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002819 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002820 regexp = re.compile(self.R_LINE)
2821 matches = [regexp.match(line) for line in self._description_lines]
2822 new_desc = [l for i, l in enumerate(self._description_lines)
2823 if not matches[i]]
2824 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002825
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002827
2828 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002829 for match in matches:
2830 if not match:
2831 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002832 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2833
2834 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002835 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002836 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002837 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002838 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002839 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002840 LOOKUP[add_owners_to].update(
2841 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002842
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002843 # If any folks ended up in both groups, remove them from tbrs.
2844 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002845
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002846 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2847 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002848
2849 # Put the new lines in the description where the old first R= line was.
2850 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2851 if 0 <= line_loc < len(self._description_lines):
2852 if new_tbr_line:
2853 self._description_lines.insert(line_loc, new_tbr_line)
2854 if new_r_line:
2855 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002856 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002857 if new_r_line:
2858 self.append_footer(new_r_line)
2859 if new_tbr_line:
2860 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002861
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002862 def set_preserve_tryjobs(self):
2863 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2864 footers = git_footers.parse_footers(self.description)
2865 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2866 if v.lower() == 'true':
2867 return
2868 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2869
Anthony Polito8b955342019-09-24 19:01:36 +00002870 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002871 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002872 self.set_description([
2873 '# Enter a description of the change.',
2874 '# This will be displayed on the codereview site.',
2875 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002876 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002877 '--------------------',
2878 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002879 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002880 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002881 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002882 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002883
agable@chromium.org42c20792013-09-12 17:34:49 +00002884 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002885 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002886 if not content:
2887 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002888 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002889
Bruce Dawson2377b012018-01-11 16:46:49 -08002890 # Strip off comments and default inserted "Bug:" line.
2891 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002892 (line.startswith('#') or
2893 line.rstrip() == "Bug:" or
2894 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002895 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002896 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002897 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002898
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002899 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002900 """Adds a footer line to the description.
2901
2902 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2903 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2904 that Gerrit footers are always at the end.
2905 """
2906 parsed_footer_line = git_footers.parse_footer(line)
2907 if parsed_footer_line:
2908 # Line is a gerrit footer in the form: Footer-Key: any value.
2909 # Thus, must be appended observing Gerrit footer rules.
2910 self.set_description(
2911 git_footers.add_footer(self.description,
2912 key=parsed_footer_line[0],
2913 value=parsed_footer_line[1]))
2914 return
2915
2916 if not self._description_lines:
2917 self._description_lines.append(line)
2918 return
2919
2920 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2921 if gerrit_footers:
2922 # git_footers.split_footers ensures that there is an empty line before
2923 # actual (gerrit) footers, if any. We have to keep it that way.
2924 assert top_lines and top_lines[-1] == ''
2925 top_lines, separator = top_lines[:-1], top_lines[-1:]
2926 else:
2927 separator = [] # No need for separator if there are no gerrit_footers.
2928
2929 prev_line = top_lines[-1] if top_lines else ''
2930 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2931 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2932 top_lines.append('')
2933 top_lines.append(line)
2934 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002935
tandrii99a72f22016-08-17 14:33:24 -07002936 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002937 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002938 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002939 reviewers = [match.group(2).strip()
2940 for match in matches
2941 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002942 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002943
bradnelsond975b302016-10-23 12:20:23 -07002944 def get_cced(self):
2945 """Retrieves the list of reviewers."""
2946 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2947 cced = [match.group(2).strip() for match in matches if match]
2948 return cleanup_list(cced)
2949
Nodir Turakulov23b82142017-11-16 11:04:25 -08002950 def get_hash_tags(self):
2951 """Extracts and sanitizes a list of Gerrit hashtags."""
2952 subject = (self._description_lines or ('',))[0]
2953 subject = re.sub(
2954 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2955
2956 tags = []
2957 start = 0
2958 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2959 while True:
2960 m = bracket_exp.match(subject, start)
2961 if not m:
2962 break
2963 tags.append(self.sanitize_hash_tag(m.group(1)))
2964 start = m.end()
2965
2966 if not tags:
2967 # Try "Tag: " prefix.
2968 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2969 if m:
2970 tags.append(self.sanitize_hash_tag(m.group(1)))
2971 return tags
2972
2973 @classmethod
2974 def sanitize_hash_tag(cls, tag):
2975 """Returns a sanitized Gerrit hash tag.
2976
2977 A sanitized hashtag can be used as a git push refspec parameter value.
2978 """
2979 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2980
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002981 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2982 """Updates this commit description given the parent.
2983
2984 This is essentially what Gnumbd used to do.
2985 Consult https://goo.gl/WMmpDe for more details.
2986 """
2987 assert parent_msg # No, orphan branch creation isn't supported.
2988 assert parent_hash
2989 assert dest_ref
2990 parent_footer_map = git_footers.parse_footers(parent_msg)
2991 # This will also happily parse svn-position, which GnumbD is no longer
2992 # supporting. While we'd generate correct footers, the verifier plugin
2993 # installed in Gerrit will block such commit (ie git push below will fail).
2994 parent_position = git_footers.get_position(parent_footer_map)
2995
2996 # Cherry-picks may have last line obscuring their prior footers,
2997 # from git_footers perspective. This is also what Gnumbd did.
2998 cp_line = None
2999 if (self._description_lines and
3000 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3001 cp_line = self._description_lines.pop()
3002
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003003 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003004
3005 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3006 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003007 for i, line in enumerate(footer_lines):
3008 k, v = git_footers.parse_footer(line) or (None, None)
3009 if k and k.startswith('Cr-'):
3010 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003011
3012 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003013 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003014 if parent_position[0] == dest_ref:
3015 # Same branch as parent.
3016 number = int(parent_position[1]) + 1
3017 else:
3018 number = 1 # New branch, and extra lineage.
3019 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3020 int(parent_position[1])))
3021
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003022 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3023 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003024
3025 self._description_lines = top_lines
3026 if cp_line:
3027 self._description_lines.append(cp_line)
3028 if self._description_lines[-1] != '':
3029 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003030 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003031
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003032
Aaron Gablea1bab272017-04-11 16:38:18 -07003033def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003034 """Retrieves the reviewers that approved a CL from the issue properties with
3035 messages.
3036
3037 Note that the list may contain reviewers that are not committer, thus are not
3038 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003039
3040 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003041 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003042 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003043 return sorted(
3044 set(
3045 message['sender']
3046 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003047 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003048 )
3049 )
3050
3051
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003052def FindCodereviewSettingsFile(filename='codereview.settings'):
3053 """Finds the given file starting in the cwd and going up.
3054
3055 Only looks up to the top of the repository unless an
3056 'inherit-review-settings-ok' file exists in the root of the repository.
3057 """
3058 inherit_ok_file = 'inherit-review-settings-ok'
3059 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003060 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003061 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3062 root = '/'
3063 while True:
3064 if filename in os.listdir(cwd):
3065 if os.path.isfile(os.path.join(cwd, filename)):
3066 return open(os.path.join(cwd, filename))
3067 if cwd == root:
3068 break
3069 cwd = os.path.dirname(cwd)
3070
3071
3072def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003073 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003074 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003075
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003076 def SetProperty(name, setting, unset_error_ok=False):
3077 fullname = 'rietveld.' + name
3078 if setting in keyvals:
3079 RunGit(['config', fullname, keyvals[setting]])
3080 else:
3081 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3082
tandrii48df5812016-10-17 03:55:37 -07003083 if not keyvals.get('GERRIT_HOST', False):
3084 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003085 # Only server setting is required. Other settings can be absent.
3086 # In that case, we ignore errors raised during option deletion attempt.
3087 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3088 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3089 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003090 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003091 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3092 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003093 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3094 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003095
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003096 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003097 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003098
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003099 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003100 RunGit(['config', 'gerrit.squash-uploads',
3101 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003102
tandrii@chromium.org28253532016-04-14 13:46:56 +00003103 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003104 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003105 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003107 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003108 # should be of the form
3109 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3110 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003111 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3112 keyvals['ORIGIN_URL_CONFIG']])
3113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003114
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003115def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003116 """Downloads a network object to a local file, like urllib.urlretrieve.
3117
3118 This is necessary because urllib is broken for SSL connections via a proxy.
3119 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003120 with open(destination, 'w') as f:
3121 f.write(urllib2.urlopen(source).read())
3122
3123
ukai@chromium.org712d6102013-11-27 00:52:58 +00003124def hasSheBang(fname):
3125 """Checks fname is a #! script."""
3126 with open(fname) as f:
3127 return f.read(2).startswith('#!')
3128
3129
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003130# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3131def DownloadHooks(*args, **kwargs):
3132 pass
3133
3134
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003135def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003136 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003137
3138 Args:
3139 force: True to update hooks. False to install hooks if not present.
3140 """
3141 if not settings.GetIsGerrit():
3142 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003143 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003144 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3145 if not os.access(dst, os.X_OK):
3146 if os.path.exists(dst):
3147 if not force:
3148 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003149 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003150 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003151 if not hasSheBang(dst):
3152 DieWithError('Not a script: %s\n'
3153 'You need to download from\n%s\n'
3154 'into .git/hooks/commit-msg and '
3155 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003156 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3157 except Exception:
3158 if os.path.exists(dst):
3159 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003160 DieWithError('\nFailed to download hooks.\n'
3161 'You need to download from\n%s\n'
3162 'into .git/hooks/commit-msg and '
3163 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003164
3165
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003166class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003167 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003168
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003169 _GOOGLESOURCE = 'googlesource.com'
3170
3171 def __init__(self):
3172 # Cached list of [host, identity, source], where source is either
3173 # .gitcookies or .netrc.
3174 self._all_hosts = None
3175
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003176 def ensure_configured_gitcookies(self):
3177 """Runs checks and suggests fixes to make git use .gitcookies from default
3178 path."""
3179 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3180 configured_path = RunGitSilent(
3181 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003182 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003183 if configured_path:
3184 self._ensure_default_gitcookies_path(configured_path, default)
3185 else:
3186 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003187
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003188 @staticmethod
3189 def _ensure_default_gitcookies_path(configured_path, default_path):
3190 assert configured_path
3191 if configured_path == default_path:
3192 print('git is already configured to use your .gitcookies from %s' %
3193 configured_path)
3194 return
3195
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003196 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003197 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3198 (configured_path, default_path))
3199
3200 if not os.path.exists(configured_path):
3201 print('However, your configured .gitcookies file is missing.')
3202 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3203 action='reconfigure')
3204 RunGit(['config', '--global', 'http.cookiefile', default_path])
3205 return
3206
3207 if os.path.exists(default_path):
3208 print('WARNING: default .gitcookies file already exists %s' %
3209 default_path)
3210 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3211 default_path)
3212
3213 confirm_or_exit('Move existing .gitcookies to default location?',
3214 action='move')
3215 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003216 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003217 print('Moved and reconfigured git to use .gitcookies from %s' %
3218 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003219
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003220 @staticmethod
3221 def _configure_gitcookies_path(default_path):
3222 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3223 if os.path.exists(netrc_path):
3224 print('You seem to be using outdated .netrc for git credentials: %s' %
3225 netrc_path)
3226 print('This tool will guide you through setting up recommended '
3227 '.gitcookies store for git credentials.\n'
3228 '\n'
3229 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3230 ' git config --global --unset http.cookiefile\n'
3231 ' mv %s %s.backup\n\n' % (default_path, default_path))
3232 confirm_or_exit(action='setup .gitcookies')
3233 RunGit(['config', '--global', 'http.cookiefile', default_path])
3234 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003235
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003236 def get_hosts_with_creds(self, include_netrc=False):
3237 if self._all_hosts is None:
3238 a = gerrit_util.CookiesAuthenticator()
3239 self._all_hosts = [
3240 (h, u, s)
3241 for h, u, s in itertools.chain(
3242 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3243 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3244 )
3245 if h.endswith(self._GOOGLESOURCE)
3246 ]
3247
3248 if include_netrc:
3249 return self._all_hosts
3250 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3251
3252 def print_current_creds(self, include_netrc=False):
3253 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3254 if not hosts:
3255 print('No Git/Gerrit credentials found')
3256 return
3257 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3258 header = [('Host', 'User', 'Which file'),
3259 ['=' * l for l in lengths]]
3260 for row in (header + hosts):
3261 print('\t'.join((('%%+%ds' % l) % s)
3262 for l, s in zip(lengths, row)))
3263
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003264 @staticmethod
3265 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003266 """Parses identity "git-<username>.domain" into <username> and domain."""
3267 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003268 # distinguishable from sub-domains. But we do know typical domains:
3269 if identity.endswith('.chromium.org'):
3270 domain = 'chromium.org'
3271 username = identity[:-len('.chromium.org')]
3272 else:
3273 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003274 if username.startswith('git-'):
3275 username = username[len('git-'):]
3276 return username, domain
3277
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003278 def _canonical_git_googlesource_host(self, host):
3279 """Normalizes Gerrit hosts (with '-review') to Git host."""
3280 assert host.endswith(self._GOOGLESOURCE)
3281 # Prefix doesn't include '.' at the end.
3282 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3283 if prefix.endswith('-review'):
3284 prefix = prefix[:-len('-review')]
3285 return prefix + '.' + self._GOOGLESOURCE
3286
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003287 def _canonical_gerrit_googlesource_host(self, host):
3288 git_host = self._canonical_git_googlesource_host(host)
3289 prefix = git_host.split('.', 1)[0]
3290 return prefix + '-review.' + self._GOOGLESOURCE
3291
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003292 def _get_counterpart_host(self, host):
3293 assert host.endswith(self._GOOGLESOURCE)
3294 git = self._canonical_git_googlesource_host(host)
3295 gerrit = self._canonical_gerrit_googlesource_host(git)
3296 return git if gerrit == host else gerrit
3297
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003298 def has_generic_host(self):
3299 """Returns whether generic .googlesource.com has been configured.
3300
3301 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3302 """
3303 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3304 if host == '.' + self._GOOGLESOURCE:
3305 return True
3306 return False
3307
3308 def _get_git_gerrit_identity_pairs(self):
3309 """Returns map from canonic host to pair of identities (Git, Gerrit).
3310
3311 One of identities might be None, meaning not configured.
3312 """
3313 host_to_identity_pairs = {}
3314 for host, identity, _ in self.get_hosts_with_creds():
3315 canonical = self._canonical_git_googlesource_host(host)
3316 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3317 idx = 0 if canonical == host else 1
3318 pair[idx] = identity
3319 return host_to_identity_pairs
3320
3321 def get_partially_configured_hosts(self):
3322 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003323 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3324 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3325 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003326
3327 def get_conflicting_hosts(self):
3328 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 host
3330 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003331 if None not in (i1, i2) and i1 != i2)
3332
3333 def get_duplicated_hosts(self):
3334 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3335 return set(host for host, count in counters.iteritems() if count > 1)
3336
3337 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3338 'chromium.googlesource.com': 'chromium.org',
3339 'chrome-internal.googlesource.com': 'google.com',
3340 }
3341
3342 def get_hosts_with_wrong_identities(self):
3343 """Finds hosts which **likely** reference wrong identities.
3344
3345 Note: skips hosts which have conflicting identities for Git and Gerrit.
3346 """
3347 hosts = set()
3348 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3349 pair = self._get_git_gerrit_identity_pairs().get(host)
3350 if pair and pair[0] == pair[1]:
3351 _, domain = self._parse_identity(pair[0])
3352 if domain != expected:
3353 hosts.add(host)
3354 return hosts
3355
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003356 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003357 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003358 hosts = sorted(hosts)
3359 assert hosts
3360 if extra_column_func is None:
3361 extras = [''] * len(hosts)
3362 else:
3363 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003364 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3365 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003366 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003367 lines.append(tmpl % he)
3368 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003369
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003370 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003371 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003372 yield ('.googlesource.com wildcard record detected',
3373 ['Chrome Infrastructure team recommends to list full host names '
3374 'explicitly.'],
3375 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003376
3377 dups = self.get_duplicated_hosts()
3378 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003379 yield ('The following hosts were defined twice',
3380 self._format_hosts(dups),
3381 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003382
3383 partial = self.get_partially_configured_hosts()
3384 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003385 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3386 'These hosts are missing',
3387 self._format_hosts(partial, lambda host: 'but %s defined' %
3388 self._get_counterpart_host(host)),
3389 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003390
3391 conflicting = self.get_conflicting_hosts()
3392 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003393 yield ('The following Git hosts have differing credentials from their '
3394 'Gerrit counterparts',
3395 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3396 tuple(self._get_git_gerrit_identity_pairs()[host])),
3397 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398
3399 wrong = self.get_hosts_with_wrong_identities()
3400 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003401 yield ('These hosts likely use wrong identity',
3402 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3403 (self._get_git_gerrit_identity_pairs()[host][0],
3404 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3405 wrong)
3406
3407 def find_and_report_problems(self):
3408 """Returns True if there was at least one problem, else False."""
3409 found = False
3410 bad_hosts = set()
3411 for title, sublines, hosts in self._find_problems():
3412 if not found:
3413 found = True
3414 print('\n\n.gitcookies problem report:\n')
3415 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003416 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003417 if sublines:
3418 print()
3419 print(' %s' % '\n '.join(sublines))
3420 print()
3421
3422 if bad_hosts:
3423 assert found
3424 print(' You can manually remove corresponding lines in your %s file and '
3425 'visit the following URLs with correct account to generate '
3426 'correct credential lines:\n' %
3427 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3428 print(' %s' % '\n '.join(sorted(set(
3429 gerrit_util.CookiesAuthenticator().get_new_password_url(
3430 self._canonical_git_googlesource_host(host))
3431 for host in bad_hosts
3432 ))))
3433 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003434
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003435
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003436@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003437def CMDcreds_check(parser, args):
3438 """Checks credentials and suggests changes."""
3439 _, _ = parser.parse_args(args)
3440
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003441 # Code below checks .gitcookies. Abort if using something else.
3442 authn = gerrit_util.Authenticator.get()
3443 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3444 if isinstance(authn, gerrit_util.GceAuthenticator):
3445 DieWithError(
3446 'This command is not designed for GCE, are you on a bot?\n'
3447 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3448 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003449 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003450 'This command is not designed for bot environment. It checks '
3451 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003452
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003453 checker = _GitCookiesChecker()
3454 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003455
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003456 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003457 checker.print_current_creds(include_netrc=True)
3458
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003459 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003460 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003461 return 0
3462 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003463
3464
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003465@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003466def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003467 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003468 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3469 branch = ShortBranchName(branchref)
3470 _, args = parser.parse_args(args)
3471 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003472 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003473 return RunGit(['config', 'branch.%s.base-url' % branch],
3474 error_ok=False).strip()
3475 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003476 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003477 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3478 error_ok=False).strip()
3479
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003480
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003481def color_for_status(status):
3482 """Maps a Changelist status to color, for CMDstatus and other tools."""
3483 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003484 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003485 'waiting': Fore.BLUE,
3486 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003487 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003488 'lgtm': Fore.GREEN,
3489 'commit': Fore.MAGENTA,
3490 'closed': Fore.CYAN,
3491 'error': Fore.WHITE,
3492 }.get(status, Fore.WHITE)
3493
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003494
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003495def get_cl_statuses(changes, fine_grained, max_processes=None):
3496 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003497
3498 If fine_grained is true, this will fetch CL statuses from the server.
3499 Otherwise, simply indicate if there's a matching url for the given branches.
3500
3501 If max_processes is specified, it is used as the maximum number of processes
3502 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3503 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003504
3505 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003506 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003507 if not changes:
3508 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003509
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003510 if not fine_grained:
3511 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003512 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003513 for cl in changes:
3514 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003515 return
3516
3517 # First, sort out authentication issues.
3518 logging.debug('ensuring credentials exist')
3519 for cl in changes:
3520 cl.EnsureAuthenticated(force=False, refresh=True)
3521
3522 def fetch(cl):
3523 try:
3524 return (cl, cl.GetStatus())
3525 except:
3526 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003527 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003528 raise
3529
3530 threads_count = len(changes)
3531 if max_processes:
3532 threads_count = max(1, min(threads_count, max_processes))
3533 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3534
3535 pool = ThreadPool(threads_count)
3536 fetched_cls = set()
3537 try:
3538 it = pool.imap_unordered(fetch, changes).__iter__()
3539 while True:
3540 try:
3541 cl, status = it.next(timeout=5)
3542 except multiprocessing.TimeoutError:
3543 break
3544 fetched_cls.add(cl)
3545 yield cl, status
3546 finally:
3547 pool.close()
3548
3549 # Add any branches that failed to fetch.
3550 for cl in set(changes) - fetched_cls:
3551 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003552
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553
3554def upload_branch_deps(cl, args):
3555 """Uploads CLs of local branches that are dependents of the current branch.
3556
3557 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003558
3559 test1 -> test2.1 -> test3.1
3560 -> test3.2
3561 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562
3563 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3564 run on the dependent branches in this order:
3565 test2.1, test3.1, test3.2, test2.2, test3.3
3566
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003567 Note: This function does not rebase your local dependent branches. Use it
3568 when you make a change to the parent branch that will not conflict
3569 with its dependent branches, and you would like their dependencies
3570 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003571 """
3572 if git_common.is_dirty_git_tree('upload-branch-deps'):
3573 return 1
3574
3575 root_branch = cl.GetBranch()
3576 if root_branch is None:
3577 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3578 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003579 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003580 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3581 'patchset dependencies without an uploaded CL.')
3582
3583 branches = RunGit(['for-each-ref',
3584 '--format=%(refname:short) %(upstream:short)',
3585 'refs/heads'])
3586 if not branches:
3587 print('No local branches found.')
3588 return 0
3589
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003590 # Create a dictionary of all local branches to the branches that are
3591 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003592 tracked_to_dependents = collections.defaultdict(list)
3593 for b in branches.splitlines():
3594 tokens = b.split()
3595 if len(tokens) == 2:
3596 branch_name, tracked = tokens
3597 tracked_to_dependents[tracked].append(branch_name)
3598
vapiera7fbd5a2016-06-16 09:17:49 -07003599 print()
3600 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003602
rmistry@google.com2dd99862015-06-22 12:22:18 +00003603 def traverse_dependents_preorder(branch, padding=''):
3604 dependents_to_process = tracked_to_dependents.get(branch, [])
3605 padding += ' '
3606 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003607 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003608 dependents.append(dependent)
3609 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003610
rmistry@google.com2dd99862015-06-22 12:22:18 +00003611 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003612 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003613
3614 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003615 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003616 return 0
3617
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003618 confirm_or_exit('This command will checkout all dependent branches and run '
3619 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003620
rmistry@google.com2dd99862015-06-22 12:22:18 +00003621 # Record all dependents that failed to upload.
3622 failures = {}
3623 # Go through all dependents, checkout the branch and upload.
3624 try:
3625 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003626 print()
3627 print('--------------------------------------')
3628 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631 try:
3632 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003633 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003634 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003635 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003636 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003637 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003638 finally:
3639 # Swap back to the original root branch.
3640 RunGit(['checkout', '-q', root_branch])
3641
vapiera7fbd5a2016-06-16 09:17:49 -07003642 print()
3643 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003644 for dependent_branch in dependents:
3645 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003646 print(' %s : %s' % (dependent_branch, upload_status))
3647 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648
3649 return 0
3650
3651
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003652@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003653def CMDarchive(parser, args):
3654 """Archives and deletes branches associated with closed changelists."""
3655 parser.add_option(
3656 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003657 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003658 parser.add_option(
3659 '-f', '--force', action='store_true',
3660 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003661 parser.add_option(
3662 '-d', '--dry-run', action='store_true',
3663 help='Skip the branch tagging and removal steps.')
3664 parser.add_option(
3665 '-t', '--notags', action='store_true',
3666 help='Do not tag archived branches. '
3667 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003668
kmarshall3bff56b2016-06-06 18:31:47 -07003669 options, args = parser.parse_args(args)
3670 if args:
3671 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003672
3673 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3674 if not branches:
3675 return 0
3676
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003678 changes = [Changelist(branchref=b)
3679 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003680 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3681 statuses = get_cl_statuses(changes,
3682 fine_grained=True,
3683 max_processes=options.maxjobs)
3684 proposal = [(cl.GetBranch(),
3685 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3686 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003687 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003688 proposal.sort()
3689
3690 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003691 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003692 return 0
3693
3694 current_branch = GetCurrentBranch()
3695
vapiera7fbd5a2016-06-16 09:17:49 -07003696 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003697 if options.notags:
3698 for next_item in proposal:
3699 print(' ' + next_item[0])
3700 else:
3701 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3702 for next_item in proposal:
3703 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003704
kmarshall9249e012016-08-23 12:02:16 -07003705 # Quit now on precondition failure or if instructed by the user, either
3706 # via an interactive prompt or by command line flags.
3707 if options.dry_run:
3708 print('\nNo changes were made (dry run).\n')
3709 return 0
3710 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003711 print('You are currently on a branch \'%s\' which is associated with a '
3712 'closed codereview issue, so archive cannot proceed. Please '
3713 'checkout another branch and run this command again.' %
3714 current_branch)
3715 return 1
kmarshall9249e012016-08-23 12:02:16 -07003716 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003717 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3718 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003719 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003720 return 1
3721
3722 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003723 if not options.notags:
3724 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003725 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003726
vapiera7fbd5a2016-06-16 09:17:49 -07003727 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003728
3729 return 0
3730
3731
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003732@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003733def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003734 """Show status of changelists.
3735
3736 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003737 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003738 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003739 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003740 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003741 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003742 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003743 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003744
3745 Also see 'git cl comments'.
3746 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003747 parser.add_option(
3748 '--no-branch-color',
3749 action='store_true',
3750 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003751 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003752 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003753 parser.add_option('-f', '--fast', action='store_true',
3754 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003755 parser.add_option(
3756 '-j', '--maxjobs', action='store', type=int,
3757 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003758
iannuccie53c9352016-08-17 14:40:40 -07003759 _add_codereview_issue_select_options(
3760 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003761 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003762 if args:
3763 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003764
iannuccie53c9352016-08-17 14:40:40 -07003765 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003766 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003767
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003768 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003769 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003770 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003771 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003772 elif options.field == 'id':
3773 issueid = cl.GetIssue()
3774 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003775 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003776 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003777 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003778 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003779 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003780 elif options.field == 'status':
3781 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003782 elif options.field == 'url':
3783 url = cl.GetIssueURL()
3784 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003785 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003786 return 0
3787
3788 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3789 if not branches:
3790 print('No local branch found.')
3791 return 0
3792
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003793 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003794 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003795 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003796 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003797 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003798 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003799 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003800
Daniel McArdlea23bf592019-02-12 00:25:12 +00003801 current_branch = GetCurrentBranch()
3802
3803 def FormatBranchName(branch, colorize=False):
3804 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3805 an asterisk when it is the current branch."""
3806
3807 asterisk = ""
3808 color = Fore.RESET
3809 if branch == current_branch:
3810 asterisk = "* "
3811 color = Fore.GREEN
3812 branch_name = ShortBranchName(branch)
3813
3814 if colorize:
3815 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003816 return asterisk + branch_name
3817
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003818 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003819
3820 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003821 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3822 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003823 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003824 c, status = output.next()
3825 branch_statuses[c.GetBranch()] = status
3826 status = branch_statuses.pop(branch)
3827 url = cl.GetIssueURL()
3828 if url and (not status or status == 'error'):
3829 # The issue probably doesn't exist anymore.
3830 url += ' (broken)'
3831
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003832 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003833 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003834 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003835 color = ''
3836 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003837 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003838
Alan Cuttera3be9a52019-03-04 18:50:33 +00003839 branch_display = FormatBranchName(branch)
3840 padding = ' ' * (alignment - len(branch_display))
3841 if not options.no_branch_color:
3842 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003843
Alan Cuttera3be9a52019-03-04 18:50:33 +00003844 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3845 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003846
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003848 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003849 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003850 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003851 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003852 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003854 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003855 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003856 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003857 print('Issue description:')
3858 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003859 return 0
3860
3861
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003862def colorize_CMDstatus_doc():
3863 """To be called once in main() to add colors to git cl status help."""
3864 colors = [i for i in dir(Fore) if i[0].isupper()]
3865
3866 def colorize_line(line):
3867 for color in colors:
3868 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003869 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003870 indent = len(line) - len(line.lstrip(' ')) + 1
3871 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3872 return line
3873
3874 lines = CMDstatus.__doc__.splitlines()
3875 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3876
3877
phajdan.jre328cf92016-08-22 04:12:17 -07003878def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003879 if path == '-':
3880 json.dump(contents, sys.stdout)
3881 else:
3882 with open(path, 'w') as f:
3883 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003884
3885
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003886@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003887@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003888def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003889 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003890
3891 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003892 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003893 parser.add_option('-r', '--reverse', action='store_true',
3894 help='Lookup the branch(es) for the specified issues. If '
3895 'no issues are specified, all branches with mapped '
3896 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003897 parser.add_option('--json',
3898 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003899 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003900 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003901
dnj@chromium.org406c4402015-03-03 17:22:28 +00003902 if options.reverse:
3903 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003904 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 # Reverse issue lookup.
3906 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003907
3908 git_config = {}
3909 for config in RunGit(['config', '--get-regexp',
3910 r'branch\..*issue']).splitlines():
3911 name, _space, val = config.partition(' ')
3912 git_config[name] = val
3913
dnj@chromium.org406c4402015-03-03 17:22:28 +00003914 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003915 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3916 config_key = _git_branch_config_key(ShortBranchName(branch),
3917 cls.IssueConfigKey())
3918 issue = git_config.get(config_key)
3919 if issue:
3920 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003921 if not args:
3922 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003923 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003924 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003925 try:
3926 issue_num = int(issue)
3927 except ValueError:
3928 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003929 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003930 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003931 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003932 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003933 if options.json:
3934 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003935 return 0
3936
3937 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003938 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003939 if not issue.valid:
3940 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3941 'or no argument to list it.\n'
3942 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003943 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003944 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003945 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003946 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003947 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3948 if options.json:
3949 write_json(options.json, {
3950 'issue': cl.GetIssue(),
3951 'issue_url': cl.GetIssueURL(),
3952 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003953 return 0
3954
3955
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003956@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003957def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003958 """Shows or posts review comments for any changelist."""
3959 parser.add_option('-a', '--add-comment', dest='comment',
3960 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003961 parser.add_option('-p', '--publish', action='store_true',
3962 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003963 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003964 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003965 parser.add_option('-m', '--machine-readable', dest='readable',
3966 action='store_false', default=True,
3967 help='output comments in a format compatible with '
3968 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003969 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003970 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003971 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003972 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003973
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003974 issue = None
3975 if options.issue:
3976 try:
3977 issue = int(options.issue)
3978 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003979 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003980
Edward Lemur934836a2019-09-09 20:16:54 +00003981 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003982
3983 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003984 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003985 return 0
3986
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003987 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3988 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003989 for comment in summary:
3990 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003991 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003992 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003993 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003994 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003995 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003996 elif comment.autogenerated:
3997 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003998 else:
3999 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004000 print('\n%s%s %s%s\n%s' % (
4001 color,
4002 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4003 comment.sender,
4004 Fore.RESET,
4005 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4006
smut@google.comc85ac942015-09-15 16:34:43 +00004007 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004008 def pre_serialize(c):
4009 dct = c.__dict__.copy()
4010 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4011 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004012 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004013 return 0
4014
4015
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004016@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004017@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004018def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004019 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004020 parser.add_option('-d', '--display', action='store_true',
4021 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004022 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004023 help='New description to set for this issue (- for stdin, '
4024 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004025 parser.add_option('-f', '--force', action='store_true',
4026 help='Delete any unpublished Gerrit edits for this issue '
4027 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004028
4029 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004030 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004031
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004032 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004033 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004034 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004035 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004036 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004037
Edward Lemur934836a2019-09-09 20:16:54 +00004038 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004039 if target_issue_arg:
4040 kwargs['issue'] = target_issue_arg.issue
4041 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004042
4043 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004044 if not cl.GetIssue():
4045 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004046
Edward Lemur678a6842019-10-03 22:25:05 +00004047 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004048 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004049
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004050 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004051
smut@google.com34fb6b12015-07-13 20:03:26 +00004052 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004054 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004055
4056 if options.new_description:
4057 text = options.new_description
4058 if text == '-':
4059 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004060 elif text == '+':
4061 base_branch = cl.GetCommonAncestorWithUpstream()
4062 change = cl.GetChange(base_branch, None, local_description=True)
4063 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004064
4065 description.set_description(text)
4066 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004067 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004068 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004069 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004070 return 0
4071
4072
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004073@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004074def CMDlint(parser, args):
4075 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004076 parser.add_option('--filter', action='append', metavar='-x,+y',
4077 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004078 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004079
4080 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004081 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004082 try:
4083 import cpplint
4084 import cpplint_chromium
4085 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004086 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004087 return 1
4088
4089 # Change the current working directory before calling lint so that it
4090 # shows the correct base.
4091 previous_cwd = os.getcwd()
4092 os.chdir(settings.GetRoot())
4093 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004094 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004095 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4096 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004097 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004099 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004100
4101 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004102 command = args + files
4103 if options.filter:
4104 command = ['--filter=' + ','.join(options.filter)] + command
4105 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004106
4107 white_regex = re.compile(settings.GetLintRegex())
4108 black_regex = re.compile(settings.GetLintIgnoreRegex())
4109 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4110 for filename in filenames:
4111 if white_regex.match(filename):
4112 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004113 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004114 else:
4115 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4116 extra_check_functions)
4117 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004118 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004119 finally:
4120 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004121 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004122 if cpplint._cpplint_state.error_count != 0:
4123 return 1
4124 return 0
4125
4126
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004127@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004128def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004129 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004130 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004131 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004132 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004133 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004134 parser.add_option('--all', action='store_true',
4135 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004136 parser.add_option('--parallel', action='store_true',
4137 help='Run all tests specified by input_api.RunTests in all '
4138 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004139 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004140
sbc@chromium.org71437c02015-04-09 19:29:40 +00004141 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004142 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004143 return 1
4144
Edward Lemur934836a2019-09-09 20:16:54 +00004145 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004146 if args:
4147 base_branch = args[0]
4148 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004149 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004150 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004151
Aaron Gable8076c282017-11-29 14:39:41 -08004152 if options.all:
4153 base_change = cl.GetChange(base_branch, None)
4154 files = [('M', f) for f in base_change.AllFiles()]
4155 change = presubmit_support.GitChange(
4156 base_change.Name(),
4157 base_change.FullDescriptionText(),
4158 base_change.RepositoryRoot(),
4159 files,
4160 base_change.issue,
4161 base_change.patchset,
4162 base_change.author_email,
4163 base_change._upstream)
4164 else:
4165 change = cl.GetChange(base_branch, None)
4166
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004167 cl.RunHook(
4168 committing=not options.upload,
4169 may_prompt=False,
4170 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004171 change=change,
4172 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004173 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004174
4175
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004176def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004177 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004178
4179 Works the same way as
4180 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4181 but can be called on demand on all platforms.
4182
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004183 The basic idea is to generate git hash of a state of the tree, original
4184 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004185 """
4186 lines = []
4187 tree_hash = RunGitSilent(['write-tree'])
4188 lines.append('tree %s' % tree_hash.strip())
4189 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4190 if code == 0:
4191 lines.append('parent %s' % parent.strip())
4192 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4193 lines.append('author %s' % author.strip())
4194 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4195 lines.append('committer %s' % committer.strip())
4196 lines.append('')
4197 # Note: Gerrit's commit-hook actually cleans message of some lines and
4198 # whitespace. This code is not doing this, but it clearly won't decrease
4199 # entropy.
4200 lines.append(message)
4201 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004202 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004203 return 'I%s' % change_hash.strip()
4204
4205
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004206def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004207 """Computes the remote branch ref to use for the CL.
4208
4209 Args:
4210 remote (str): The git remote for the CL.
4211 remote_branch (str): The git remote branch for the CL.
4212 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004213 """
4214 if not (remote and remote_branch):
4215 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004216
wittman@chromium.org455dc922015-01-26 20:15:50 +00004217 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004218 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004219 # refs, which are then translated into the remote full symbolic refs
4220 # below.
4221 if '/' not in target_branch:
4222 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4223 else:
4224 prefix_replacements = (
4225 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4226 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4227 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4228 )
4229 match = None
4230 for regex, replacement in prefix_replacements:
4231 match = re.search(regex, target_branch)
4232 if match:
4233 remote_branch = target_branch.replace(match.group(0), replacement)
4234 break
4235 if not match:
4236 # This is a branch path but not one we recognize; use as-is.
4237 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004238 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4239 # Handle the refs that need to land in different refs.
4240 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004241
wittman@chromium.org455dc922015-01-26 20:15:50 +00004242 # Create the true path to the remote branch.
4243 # Does the following translation:
4244 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4245 # * refs/remotes/origin/master -> refs/heads/master
4246 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4247 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4248 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4249 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4250 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4251 'refs/heads/')
4252 elif remote_branch.startswith('refs/remotes/branch-heads'):
4253 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004254
wittman@chromium.org455dc922015-01-26 20:15:50 +00004255 return remote_branch
4256
4257
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004258def cleanup_list(l):
4259 """Fixes a list so that comma separated items are put as individual items.
4260
4261 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4262 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4263 """
4264 items = sum((i.split(',') for i in l), [])
4265 stripped_items = (i.strip() for i in items)
4266 return sorted(filter(None, stripped_items))
4267
4268
Aaron Gable4db38df2017-11-03 14:59:07 -07004269@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004270@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004271def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004272 """Uploads the current changelist to codereview.
4273
4274 Can skip dependency patchset uploads for a branch by running:
4275 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004276 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004277 git config --unset branch.branch_name.skip-deps-uploads
4278 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004279
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004280 If the name of the checked out branch starts with "bug-" or "fix-" followed
4281 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004282 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004283
4284 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004285 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004286 [git-cl] add support for hashtags
4287 Foo bar: implement foo
4288 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004289 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004290 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4291 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004292 parser.add_option('--bypass-watchlists', action='store_true',
4293 dest='bypass_watchlists',
4294 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004295 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004296 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004297 parser.add_option('--message', '-m', dest='message',
4298 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004299 parser.add_option('-b', '--bug',
4300 help='pre-populate the bug number(s) for this issue. '
4301 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004302 parser.add_option('--message-file', dest='message_file',
4303 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004304 parser.add_option('--title', '-t', dest='title',
4305 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004306 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004307 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004308 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004309 parser.add_option('--tbrs',
4310 action='append', default=[],
4311 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004312 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004313 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004314 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004315 parser.add_option('--hashtag', dest='hashtags',
4316 action='append', default=[],
4317 help=('Gerrit hashtag for new CL; '
4318 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004319 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004320 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004321 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004322 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004323 metavar='TARGET',
4324 help='Apply CL to remote ref TARGET. ' +
4325 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004326 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004327 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004328 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004329 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004330 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004331 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004332 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4333 const='TBR', help='add a set of OWNERS to TBR')
4334 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4335 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004336 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004337 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004338 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004339 'implies --send-mail')
4340 parser.add_option('-d', '--cq-dry-run',
4341 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004342 help='Send the patchset to do a CQ dry run right after '
4343 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004344 parser.add_option('--preserve-tryjobs', action='store_true',
4345 help='instruct the CQ to let tryjobs running even after '
4346 'new patchsets are uploaded instead of canceling '
4347 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004348 parser.add_option('--dependencies', action='store_true',
4349 help='Uploads CLs of all the local branches that depend on '
4350 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004351 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4352 help='Sends your change to the CQ after an approval. Only '
4353 'works on repos that have the Auto-Submit label '
4354 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004355 parser.add_option('--parallel', action='store_true',
4356 help='Run all tests specified by input_api.RunTests in all '
4357 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004358 parser.add_option('--no-autocc', action='store_true',
4359 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004360 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004361 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 parser.add_option('-R', '--retry-failed', action='store_true',
4363 help='Retry failed tryjobs from old patchset immediately '
4364 'after uploading new patchset. Cannot be used with '
4365 '--use-commit-queue or --cq-dry-run.')
4366 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4367 help='Host of buildbucket. The default host is %default.')
4368 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004369
rmistry@google.com2dd99862015-06-22 12:22:18 +00004370 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004371 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004372 (options, args) = parser.parse_args(args)
4373
sbc@chromium.org71437c02015-04-09 19:29:40 +00004374 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004375 return 1
4376
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004377 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004378 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004379 options.cc = cleanup_list(options.cc)
4380
tandriib80458a2016-06-23 12:20:07 -07004381 if options.message_file:
4382 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004383 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004384 options.message = gclient_utils.FileRead(options.message_file)
4385 options.message_file = None
4386
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004387 if ([options.cq_dry_run,
4388 options.use_commit_queue,
4389 options.retry_failed].count(True) > 1):
4390 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4391 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004392
Aaron Gableedbc4132017-09-11 13:22:28 -07004393 if options.use_commit_queue:
4394 options.send_mail = True
4395
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004396 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4397 settings.GetIsGerrit()
4398
Edward Lemur934836a2019-09-09 20:16:54 +00004399 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004400 if options.retry_failed and not cl.GetIssue():
4401 print('No previous patchsets, so --retry-failed has no effect.')
4402 options.retry_failed = False
4403 # cl.GetMostRecentPatchset uses cached information, and can return the last
4404 # patchset before upload. Calling it here makes it clear that it's the
4405 # last patchset before upload. Note that GetMostRecentPatchset will fail
4406 # if no CL has been uploaded yet.
4407 if options.retry_failed:
4408 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004409
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004410 ret = cl.CMDUpload(options, args, orig_args)
4411
4412 if options.retry_failed:
4413 if ret != 0:
4414 print('Upload failed, so --retry-failed has no effect.')
4415 return ret
4416 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004417 builds, _ = _fetch_latest_builds(
4418 auth_config, cl, options.buildbucket_host,
4419 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004420 buckets = _filter_failed(builds)
4421 if len(buckets) == 0:
4422 print('No failed tryjobs, so --retry-failed has no effect.')
4423 return ret
4424 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4425
4426 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004427
4428
Francois Dorayd42c6812017-05-30 15:10:20 -04004429@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004430@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004431def CMDsplit(parser, args):
4432 """Splits a branch into smaller branches and uploads CLs.
4433
4434 Creates a branch and uploads a CL for each group of files modified in the
4435 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004436 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004437 the shared OWNERS file.
4438 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004439 parser.add_option('-d', '--description', dest='description_file',
4440 help='A text file containing a CL description in which '
4441 '$directory will be replaced by each CL\'s directory.')
4442 parser.add_option('-c', '--comment', dest='comment_file',
4443 help='A text file containing a CL comment.')
4444 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004445 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004446 help='List the files and reviewers for each CL that would '
4447 'be created, but don\'t create branches or CLs.')
4448 parser.add_option('--cq-dry-run', action='store_true',
4449 help='If set, will do a cq dry run for each uploaded CL. '
4450 'Please be careful when doing this; more than ~10 CLs '
4451 'has the potential to overload our build '
4452 'infrastructure. Try to upload these not during high '
4453 'load times (usually 11-3 Mountain View time). Email '
4454 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004455 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4456 default=True,
4457 help='Sends your change to the CQ after an approval. Only '
4458 'works on repos that have the Auto-Submit label '
4459 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004460 options, _ = parser.parse_args(args)
4461
4462 if not options.description_file:
4463 parser.error('No --description flag specified.')
4464
4465 def WrappedCMDupload(args):
4466 return CMDupload(OptionParser(), args)
4467
4468 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004469 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004470 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004471
4472
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004473@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004474@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004476 """DEPRECATED: Used to commit the current changelist via git-svn."""
4477 message = ('git-cl no longer supports committing to SVN repositories via '
4478 'git-svn. You probably want to use `git cl land` instead.')
4479 print(message)
4480 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004481
4482
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004483@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004484@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004485def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004486 """Commits the current changelist via git.
4487
4488 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4489 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004490 """
4491 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4492 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004493 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004494 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004495 parser.add_option('--parallel', action='store_true',
4496 help='Run all tests specified by input_api.RunTests in all '
4497 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004498 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004499
Edward Lemur934836a2019-09-09 20:16:54 +00004500 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004501
Robert Iannucci2e73d432018-03-14 01:10:47 -07004502 if not cl.GetIssue():
4503 DieWithError('You must upload the change first to Gerrit.\n'
4504 ' If you would rather have `git cl land` upload '
4505 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004506 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004507 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004508
4509
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004510@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004511@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004512def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004513 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004514 parser.add_option('-b', dest='newbranch',
4515 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004516 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004517 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004518 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004519 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004520
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004521 group = optparse.OptionGroup(
4522 parser,
4523 'Options for continuing work on the current issue uploaded from a '
4524 'different clone (e.g. different machine). Must be used independently '
4525 'from the other options. No issue number should be specified, and the '
4526 'branch must have an issue number associated with it')
4527 group.add_option('--reapply', action='store_true', dest='reapply',
4528 help='Reset the branch and reapply the issue.\n'
4529 'CAUTION: This will undo any local changes in this '
4530 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004531
4532 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004533 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004534 parser.add_option_group(group)
4535
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004536 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004538
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004539 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004540 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004541 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004542 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004543 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004544
Edward Lemur934836a2019-09-09 20:16:54 +00004545 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004546 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004547 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004548
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004549 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004550 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004551 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004552
4553 RunGit(['reset', '--hard', upstream])
4554 if options.pull:
4555 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004556
Edward Lemur678a6842019-10-03 22:25:05 +00004557 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4558 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004559
4560 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004561 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004562
Edward Lemurf38bc172019-09-03 21:02:13 +00004563 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004564 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004565 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004566
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004567 # We don't want uncommitted changes mixed up with the patch.
4568 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004569 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004570
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004571 if options.newbranch:
4572 if options.force:
4573 RunGit(['branch', '-D', options.newbranch],
4574 stderr=subprocess2.PIPE, error_ok=True)
4575 RunGit(['new-branch', options.newbranch])
4576
Edward Lemur678a6842019-10-03 22:25:05 +00004577 cl = Changelist(
4578 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004579
Edward Lemur678a6842019-10-03 22:25:05 +00004580 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004581 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004582
Edward Lemurf38bc172019-09-03 21:02:13 +00004583 return cl.CMDPatchWithParsedIssue(
4584 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585
4586
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004587def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 """Fetches the tree status and returns either 'open', 'closed',
4589 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004590 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591 if url:
4592 status = urllib2.urlopen(url).read().lower()
4593 if status.find('closed') != -1 or status == '0':
4594 return 'closed'
4595 elif status.find('open') != -1 or status == '1':
4596 return 'open'
4597 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598 return 'unset'
4599
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004600
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004601def GetTreeStatusReason():
4602 """Fetches the tree status from a json url and returns the message
4603 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004604 url = settings.GetTreeStatusUrl()
4605 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606 connection = urllib2.urlopen(json_url)
4607 status = json.loads(connection.read())
4608 connection.close()
4609 return status['message']
4610
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004611
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004612@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004614 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004615 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616 status = GetTreeStatus()
4617 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004618 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004619 return 2
4620
vapiera7fbd5a2016-06-16 09:17:49 -07004621 print('The tree is %s' % status)
4622 print()
4623 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004624 if status != 'open':
4625 return 1
4626 return 0
4627
4628
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004629@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004630def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004631 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4632 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004633 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004634 '-b', '--bot', action='append',
4635 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4636 'times to specify multiple builders. ex: '
4637 '"-b win_rel -b win_layout". See '
4638 'the try server waterfall for the builders name and the tests '
4639 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004640 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004641 '-B', '--bucket', default='',
4642 help=('Buildbucket bucket to send the try requests.'))
4643 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004644 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004645 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004646 'be determined by the try recipe that builder runs, which usually '
4647 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004648 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004649 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004650 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004651 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004652 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004653 '--category', default='git_cl_try', help='Specify custom build category.')
4654 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004655 '--project',
4656 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004657 'in recipe to determine to which repository or directory to '
4658 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004659 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004660 '-p', '--property', dest='properties', action='append', default=[],
4661 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004662 'key2=value2 etc. The value will be treated as '
4663 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004664 'NOTE: using this may make your tryjob not usable for CQ, '
4665 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004666 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004667 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4668 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004669 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004670 parser.add_option(
4671 '-R', '--retry-failed', action='store_true', default=False,
4672 help='Retry failed jobs from the latest set of tryjobs. '
4673 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004674 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004675 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004676 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004677 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004678
machenbach@chromium.org45453142015-09-15 08:45:22 +00004679 # Make sure that all properties are prop=value pairs.
4680 bad_params = [x for x in options.properties if '=' not in x]
4681 if bad_params:
4682 parser.error('Got properties with missing "=": %s' % bad_params)
4683
maruel@chromium.org15192402012-09-06 12:38:29 +00004684 if args:
4685 parser.error('Unknown arguments: %s' % args)
4686
Edward Lemur934836a2019-09-09 20:16:54 +00004687 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004688 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004689 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004690
Edward Lemurf38bc172019-09-03 21:02:13 +00004691 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004692 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004693
tandriie113dfd2016-10-11 10:20:12 -07004694 error_message = cl.CannotTriggerTryJobReason()
4695 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004696 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004697
Quinten Yearsley983111f2019-09-26 17:18:48 +00004698 if options.retry_failed:
4699 if options.bot or options.bucket:
4700 print('ERROR: The option --retry-failed is not compatible with '
4701 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4702 return 1
4703 print('Searching for failed tryjobs...')
4704 builds, patchset = _fetch_latest_builds(
4705 auth_config, cl, options.buildbucket_host)
4706 if options.verbose:
4707 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4708 buckets = _filter_failed(builds)
4709 if not buckets:
4710 print('There are no failed jobs in the latest set of jobs '
4711 '(patchset #%d), doing nothing.' % patchset)
4712 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004713 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004714 if num_builders > 10:
4715 confirm_or_exit('There are %d builders with failed builds.'
4716 % num_builders, action='continue')
4717 else:
4718 buckets = _get_bucket_map(cl, options, parser)
4719 if buckets and any(b.startswith('master.') for b in buckets):
4720 print('ERROR: Buildbot masters are not supported.')
4721 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004722
qyearsleydd49f942016-10-28 11:57:22 -07004723 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4724 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004725 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004726 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004727 print('git cl try with no bots now defaults to CQ dry run.')
4728 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4729 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004730
borenet6c0efe62016-10-19 08:13:29 -07004731 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004732 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004733 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004734 'of bot requires an initial job from a parent (usually a builder). '
4735 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004736 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004737 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004738
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004739 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004740 try:
4741 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4742 except BuildbucketResponseException as ex:
4743 print('ERROR: %s' % ex)
4744 return 1
4745 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004746
4747
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004748@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004749def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004750 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004751 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004753 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004754 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004755 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004756 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004757 '--color', action='store_true', default=setup_color.IS_TTY,
4758 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004759 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004760 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4761 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004762 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004763 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004764 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 parser.add_option_group(group)
4766 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004767 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004768 options, args = parser.parse_args(args)
4769 if args:
4770 parser.error('Unrecognized args: %s' % ' '.join(args))
4771
4772 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004773 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004774 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004775 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004776
tandrii221ab252016-10-06 08:12:04 -07004777 patchset = options.patchset
4778 if not patchset:
4779 patchset = cl.GetMostRecentPatchset()
4780 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004781 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004782 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004783 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004784 cl.GetIssue())
4785
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 try:
tandrii221ab252016-10-06 08:12:04 -07004787 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004788 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004789 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004790 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004791 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004792 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004793 else:
4794 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004795 return 0
4796
4797
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004798@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004799@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004800def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004801 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004802 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004803 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004804 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004805
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004806 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004807 if args:
4808 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004809 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004810 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004811 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004812 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004813
4814 # Clear configured merge-base, if there is one.
4815 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004816 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004817 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004818 return 0
4819
4820
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004821@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004822def CMDweb(parser, args):
4823 """Opens the current CL in the web browser."""
4824 _, args = parser.parse_args(args)
4825 if args:
4826 parser.error('Unrecognized args: %s' % ' '.join(args))
4827
4828 issue_url = Changelist().GetIssueURL()
4829 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004830 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004831 return 1
4832
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004833 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004834 # allows us to hide the "Created new window in existing browser session."
4835 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004836 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004837 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004838 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004839 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004840 os.open(os.devnull, os.O_RDWR)
4841 try:
4842 webbrowser.open(issue_url)
4843 finally:
4844 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004845 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004846 return 0
4847
4848
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004849@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004850def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004851 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004852 parser.add_option('-d', '--dry-run', action='store_true',
4853 help='trigger in dry run mode')
4854 parser.add_option('-c', '--clear', action='store_true',
4855 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004856 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004857 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004858 if args:
4859 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004860 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004861 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004862
Edward Lemur934836a2019-09-09 20:16:54 +00004863 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004864 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004865 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004866 elif options.dry_run:
4867 state = _CQState.DRY_RUN
4868 else:
4869 state = _CQState.COMMIT
4870 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004871 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004872 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004873 return 0
4874
4875
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004876@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004877def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004878 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004879 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004880 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004881 if args:
4882 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004883 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004884 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004885 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004886 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004887 cl.CloseIssue()
4888 return 0
4889
4890
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004891@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004892def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004893 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004894 parser.add_option(
4895 '--stat',
4896 action='store_true',
4897 dest='stat',
4898 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004899 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004900 if args:
4901 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004902
Edward Lemur934836a2019-09-09 20:16:54 +00004903 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004904 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004905 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004906 if not issue:
4907 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004908
Aaron Gablea718c3e2017-08-28 17:47:28 -07004909 base = cl._GitGetBranchConfigValue('last-upload-hash')
4910 if not base:
4911 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4912 if not base:
4913 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4914 revision_info = detail['revisions'][detail['current_revision']]
4915 fetch_info = revision_info['fetch']['http']
4916 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4917 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004918
Aaron Gablea718c3e2017-08-28 17:47:28 -07004919 cmd = ['git', 'diff']
4920 if options.stat:
4921 cmd.append('--stat')
4922 cmd.append(base)
4923 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004924
4925 return 0
4926
4927
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004928@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004929def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004930 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004931 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004932 '--ignore-current',
4933 action='store_true',
4934 help='Ignore the CL\'s current reviewers and start from scratch.')
4935 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004936 '--ignore-self',
4937 action='store_true',
4938 help='Do not consider CL\'s author as an owners.')
4939 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004940 '--no-color',
4941 action='store_true',
4942 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004943 parser.add_option(
4944 '--batch',
4945 action='store_true',
4946 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004947 # TODO: Consider moving this to another command, since other
4948 # git-cl owners commands deal with owners for a given CL.
4949 parser.add_option(
4950 '--show-all',
4951 action='store_true',
4952 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004953 options, args = parser.parse_args(args)
4954
4955 author = RunGit(['config', 'user.email']).strip() or None
4956
Edward Lemur934836a2019-09-09 20:16:54 +00004957 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004958
Yang Guo6e269a02019-06-26 11:17:02 +00004959 if options.show_all:
4960 for arg in args:
4961 base_branch = cl.GetCommonAncestorWithUpstream()
4962 change = cl.GetChange(base_branch, None)
4963 database = owners.Database(change.RepositoryRoot(), file, os.path)
4964 database.load_data_needed_for([arg])
4965 print('Owners for %s:' % arg)
4966 for owner in sorted(database.all_possible_owners([arg], None)):
4967 print(' - %s' % owner)
4968 return 0
4969
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970 if args:
4971 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004972 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004973 base_branch = args[0]
4974 else:
4975 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004976 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004977
4978 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004979 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4980
4981 if options.batch:
4982 db = owners.Database(change.RepositoryRoot(), file, os.path)
4983 print('\n'.join(db.reviewers_for(affected_files, author)))
4984 return 0
4985
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004986 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004987 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004988 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004989 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004990 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004991 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004992 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004993 override_files=change.OriginalOwnersFiles(),
4994 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995
4996
Aiden Bennerc08566e2018-10-03 17:52:42 +00004997def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004998 """Generates a diff command."""
4999 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005000 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5001
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005002 if allow_prefix:
5003 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5004 # case that diff.noprefix is set in the user's git config.
5005 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5006 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005007 diff_cmd += ['--no-prefix']
5008
5009 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010
5011 if args:
5012 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005013 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005014 diff_cmd.append(arg)
5015 else:
5016 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005017
5018 return diff_cmd
5019
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005020
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005021def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005022 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005023 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005024
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005025
enne@chromium.org555cfe42014-01-29 18:21:39 +00005026@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005027@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005028def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005029 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005030 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005031 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005032 parser.add_option('--full', action='store_true',
5033 help='Reformat the full content of all touched files')
5034 parser.add_option('--dry-run', action='store_true',
5035 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005036 parser.add_option(
5037 '--python',
5038 action='store_true',
5039 default=None,
5040 help='Enables python formatting on all python files.')
5041 parser.add_option(
5042 '--no-python',
5043 action='store_true',
5044 dest='python',
5045 help='Disables python formatting on all python files. '
5046 'Takes precedence over --python. '
5047 'If neither --python or --no-python are set, python '
5048 'files that have a .style.yapf file in an ancestor '
5049 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005050 parser.add_option('--js', action='store_true',
5051 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005052 parser.add_option('--diff', action='store_true',
5053 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005054 parser.add_option('--presubmit', action='store_true',
5055 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005056 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005057
Daniel Chengc55eecf2016-12-30 03:11:02 -08005058 # Normalize any remaining args against the current path, so paths relative to
5059 # the current directory are still resolved as expected.
5060 args = [os.path.join(os.getcwd(), arg) for arg in args]
5061
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005062 # git diff generates paths against the root of the repository. Change
5063 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005064 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005065 if rel_base_path:
5066 os.chdir(rel_base_path)
5067
digit@chromium.org29e47272013-05-17 17:01:46 +00005068 # Grab the merge-base commit, i.e. the upstream commit of the current
5069 # branch when it was created or the last time it was rebased. This is
5070 # to cover the case where the user may have called "git fetch origin",
5071 # moving the origin branch to a newer commit, but hasn't rebased yet.
5072 upstream_commit = None
5073 cl = Changelist()
5074 upstream_branch = cl.GetUpstreamBranch()
5075 if upstream_branch:
5076 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5077 upstream_commit = upstream_commit.strip()
5078
5079 if not upstream_commit:
5080 DieWithError('Could not find base commit for this branch. '
5081 'Are you in detached state?')
5082
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005083 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5084 diff_output = RunGit(changed_files_cmd)
5085 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005086 # Filter out files deleted by this CL
5087 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005088
Christopher Lamc5ba6922017-01-24 11:19:14 +11005089 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005090 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005091
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005092 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5093 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5094 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005095 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005096
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005097 top_dir = os.path.normpath(
5098 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5099
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005100 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5101 # formatted. This is used to block during the presubmit.
5102 return_value = 0
5103
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005104 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005105 # Locate the clang-format binary in the checkout
5106 try:
5107 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005108 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005109 DieWithError(e)
5110
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005111 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005112 cmd = [clang_format_tool]
5113 if not opts.dry_run and not opts.diff:
5114 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005115 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005116 if opts.diff:
5117 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005118 else:
5119 env = os.environ.copy()
5120 env['PATH'] = str(os.path.dirname(clang_format_tool))
5121 try:
5122 script = clang_format.FindClangFormatScriptInChromiumTree(
5123 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005124 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005125 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005126
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005127 cmd = [sys.executable, script, '-p0']
5128 if not opts.dry_run and not opts.diff:
5129 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005130
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005131 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5132 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005133
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005134 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5135 if opts.diff:
5136 sys.stdout.write(stdout)
5137 if opts.dry_run and len(stdout) > 0:
5138 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005139
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005140 # Similar code to above, but using yapf on .py files rather than clang-format
5141 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005142 py_explicitly_disabled = opts.python is not None and not opts.python
5143 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005144 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5145 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5146 if sys.platform.startswith('win'):
5147 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005148
Aiden Bennerc08566e2018-10-03 17:52:42 +00005149 # If we couldn't find a yapf file we'll default to the chromium style
5150 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005151 chromium_default_yapf_style = os.path.join(depot_tools_path,
5152 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005153 # Used for caching.
5154 yapf_configs = {}
5155 for f in python_diff_files:
5156 # Find the yapf style config for the current file, defaults to depot
5157 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005158 _FindYapfConfigFile(f, yapf_configs, top_dir)
5159
5160 # Turn on python formatting by default if a yapf config is specified.
5161 # This breaks in the case of this repo though since the specified
5162 # style file is also the global default.
5163 if opts.python is None:
5164 filtered_py_files = []
5165 for f in python_diff_files:
5166 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5167 filtered_py_files.append(f)
5168 else:
5169 filtered_py_files = python_diff_files
5170
5171 # Note: yapf still seems to fix indentation of the entire file
5172 # even if line ranges are specified.
5173 # See https://github.com/google/yapf/issues/499
5174 if not opts.full and filtered_py_files:
5175 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5176
5177 for f in filtered_py_files:
5178 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5179 if yapf_config is None:
5180 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005181
5182 cmd = [yapf_tool, '--style', yapf_config, f]
5183
5184 has_formattable_lines = False
5185 if not opts.full:
5186 # Only run yapf over changed line ranges.
5187 for diff_start, diff_len in py_line_diffs[f]:
5188 diff_end = diff_start + diff_len - 1
5189 # Yapf errors out if diff_end < diff_start but this
5190 # is a valid line range diff for a removal.
5191 if diff_end >= diff_start:
5192 has_formattable_lines = True
5193 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5194 # If all line diffs were removals we have nothing to format.
5195 if not has_formattable_lines:
5196 continue
5197
5198 if opts.diff or opts.dry_run:
5199 cmd += ['--diff']
5200 # Will return non-zero exit code if non-empty diff.
5201 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5202 if opts.diff:
5203 sys.stdout.write(stdout)
5204 elif len(stdout) > 0:
5205 return_value = 2
5206 else:
5207 cmd += ['-i']
5208 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005209
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005210 # Dart's formatter does not have the nice property of only operating on
5211 # modified chunks, so hard code full.
5212 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213 try:
5214 command = [dart_format.FindDartFmtToolInChromiumTree()]
5215 if not opts.dry_run and not opts.diff:
5216 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005217 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005218
ppi@chromium.org6593d932016-03-03 15:41:15 +00005219 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005220 if opts.dry_run and stdout:
5221 return_value = 2
5222 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005223 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5224 'found in this checkout. Files in other languages are still '
5225 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005226
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005227 # Format GN build files. Always run on full build files for canonical form.
5228 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005229 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005230 if opts.dry_run or opts.diff:
5231 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005232 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005233 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5234 shell=sys.platform == 'win32',
5235 cwd=top_dir)
5236 if opts.dry_run and gn_ret == 2:
5237 return_value = 2 # Not formatted.
5238 elif opts.diff and gn_ret == 2:
5239 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005240 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005241 elif gn_ret != 0:
5242 # For non-dry run cases (and non-2 return values for dry-run), a
5243 # nonzero error code indicates a failure, probably because the file
5244 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005245 DieWithError('gn format failed on ' + gn_diff_file +
5246 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005247
Ilya Shermane081cbe2017-08-15 17:51:04 -07005248 # Skip the metrics formatting from the global presubmit hook. These files have
5249 # a separate presubmit hook that issues an error if the files need formatting,
5250 # whereas the top-level presubmit script merely issues a warning. Formatting
5251 # these files is somewhat slow, so it's important not to duplicate the work.
5252 if not opts.presubmit:
5253 for xml_dir in GetDirtyMetricsDirs(diff_files):
5254 tool_dir = os.path.join(top_dir, xml_dir)
5255 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5256 if opts.dry_run or opts.diff:
5257 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005258 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005259 if opts.diff:
5260 sys.stdout.write(stdout)
5261 if opts.dry_run and stdout:
5262 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005263
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005264 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005265
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005266
Steven Holte2e664bf2017-04-21 13:10:47 -07005267def GetDirtyMetricsDirs(diff_files):
5268 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5269 metrics_xml_dirs = [
5270 os.path.join('tools', 'metrics', 'actions'),
5271 os.path.join('tools', 'metrics', 'histograms'),
5272 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005273 os.path.join('tools', 'metrics', 'ukm'),
5274 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005275 for xml_dir in metrics_xml_dirs:
5276 if any(file.startswith(xml_dir) for file in xml_diff_files):
5277 yield xml_dir
5278
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005279
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005280@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005281@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005282def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005283 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005284 _, args = parser.parse_args(args)
5285
5286 if len(args) != 1:
5287 parser.print_help()
5288 return 1
5289
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005290 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005291 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005292 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005293
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005294 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005295
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005296 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005297 output = RunGit(['config', '--local', '--get-regexp',
5298 r'branch\..*\.%s' % issueprefix],
5299 error_ok=True)
5300 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005301 if issue == target_issue:
5302 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005303
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005304 branches = []
5305 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005306 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005308 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309 return 1
5310 if len(branches) == 1:
5311 RunGit(['checkout', branches[0]])
5312 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005316 which = raw_input('Choose by index: ')
5317 try:
5318 RunGit(['checkout', branches[int(which)]])
5319 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005320 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 return 1
5322
5323 return 0
5324
5325
maruel@chromium.org29404b52014-09-08 22:58:00 +00005326def CMDlol(parser, args):
5327 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005328 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005329 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5330 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5331 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005332 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005333 return 0
5334
5335
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005336class OptionParser(optparse.OptionParser):
5337 """Creates the option parse and add --verbose support."""
5338 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005339 optparse.OptionParser.__init__(
5340 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005341 self.add_option(
5342 '-v', '--verbose', action='count', default=0,
5343 help='Use 2 times for more debugging info')
5344
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005345 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005346 try:
5347 return self._parse_args(args)
5348 finally:
5349 # Regardless of success or failure of args parsing, we want to report
5350 # metrics, but only after logging has been initialized (if parsing
5351 # succeeded).
5352 global settings
5353 settings = Settings()
5354
5355 if not metrics.DISABLE_METRICS_COLLECTION:
5356 # GetViewVCUrl ultimately calls logging method.
5357 project_url = settings.GetViewVCUrl().strip('/+')
5358 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5359 metrics.collector.add('project_urls', [project_url])
5360
5361 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005362 # Create an optparse.Values object that will store only the actual passed
5363 # options, without the defaults.
5364 actual_options = optparse.Values()
5365 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5366 # Create an optparse.Values object with the default options.
5367 options = optparse.Values(self.get_default_values().__dict__)
5368 # Update it with the options passed by the user.
5369 options._update_careful(actual_options.__dict__)
5370 # Store the options passed by the user in an _actual_options attribute.
5371 # We store only the keys, and not the values, since the values can contain
5372 # arbitrary information, which might be PII.
5373 metrics.collector.add('arguments', actual_options.__dict__.keys())
5374
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005375 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005376 logging.basicConfig(
5377 level=levels[min(options.verbose, len(levels) - 1)],
5378 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5379 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005380
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005381 return options, args
5382
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005383
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005384def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005385 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005386 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005387 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005388 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005389
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005390 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005391 dispatcher = subcommand.CommandDispatcher(__name__)
5392 try:
5393 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005394 except auth.AuthenticationError as e:
5395 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005396 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005397 if e.code != 500:
5398 raise
5399 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005401 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005402 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005403
5404
5405if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005406 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5407 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005408 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005409 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005410 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005411 sys.exit(main(sys.argv[1:]))