blob: 56104a18b3a07d4dc48360f42e668fc0a2fd0de6 [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
Edward Lemurf0faf482019-09-25 20:40:17 +0000463 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000464 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000465 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000466 shared_properties['clobber'] = True
467 shared_properties.update(_get_properties_from_options(options) or {})
468
469 requests = []
470 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
471 project, bucket = _parse_bucket(raw_bucket)
472 if not project or not bucket:
473 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
474 continue
475
476 for builder, tests in sorted(builders_and_tests.iteritems()):
477 properties = shared_properties.copy()
478 if 'presubmit' in builder.lower():
479 properties['dry_run'] = 'true'
480 if tests:
481 properties['testfilter'] = tests
482
483 requests.append({
484 'scheduleBuild': {
485 'requestId': str(uuid.uuid4()),
486 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000487 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000488 'bucket': bucket,
489 'builder': builder,
490 },
491 'gerritChanges': gerrit_changes,
492 'properties': properties,
493 'tags': [
494 {'key': 'builder', 'value': builder},
495 {'key': 'user_agent', 'value': 'git_cl_try'},
496 ],
497 }
498 })
499
500 if not requests:
501 return
502
503 codereview_url = changelist.GetCodereviewServer()
Edward Lemur2c210a42019-09-16 23:58:35 +0000504 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000505
Edward Lemur2c210a42019-09-16 23:58:35 +0000506 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
507 http = authenticator.authorize(httplib2.Http())
508 http.force_exception_to_status_code = True
509
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 batch_request = {'requests': requests}
511 batch_response = _call_buildbucket(
Edward Lemur4c707a22019-09-24 21:13:43 +0000512 http, options.buildbucket_host, 'Batch', batch_request)
Edward Lemur2c210a42019-09-16 23:58:35 +0000513
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000514 errors = [
515 ' ' + response['error']['message']
516 for response in batch_response.get('responses', [])
517 if 'error' in response
518 ]
519 if errors:
520 raise BuildbucketResponseException(
521 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000522
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000523
tandrii221ab252016-10-06 08:12:04 -0700524def fetch_try_jobs(auth_config, changelist, buildbucket_host,
525 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000526 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
Quinten Yearsley983111f2019-09-26 17:18:48 +0000528 Returns a map from build ID to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529 """
tandrii221ab252016-10-06 08:12:04 -0700530 assert buildbucket_host
531 assert changelist.GetIssue(), 'CL must be uploaded first'
532 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
533 patchset = patchset or changelist.GetMostRecentPatchset()
534 assert patchset, 'CL must be uploaded first'
535
536 codereview_url = changelist.GetCodereviewServer()
537 codereview_host = urlparse.urlparse(codereview_url).hostname
538 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000539 if authenticator.has_cached_credentials():
540 http = authenticator.authorize(httplib2.Http())
541 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700542 print('Warning: Some results might be missing because %s' %
543 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000544 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 http = httplib2.Http()
546
547 http.force_exception_to_status_code = True
548
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000549 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700550 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700552 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 params = {'tag': 'buildset:%s' % buildset}
554
555 builds = {}
556 while True:
557 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700558 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 params=urllib.urlencode(params))
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000560 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000561 for build in content.get('builds', []):
562 builds[build['id']] = build
563 if 'next_cursor' in content:
564 params['start_cursor'] = content['next_cursor']
565 else:
566 break
567 return builds
568
569
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000570def _fetch_latest_builds(
571 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000572 """Fetches builds from the latest patchset that has builds (within
573 the last few patchsets).
574
575 Args:
576 auth_config (auth.AuthConfig): Auth info for Buildbucket
577 changelist (Changelist): The CL to fetch builds for
578 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000579 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
580 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000581 Returns:
582 A tuple (builds, patchset) where builds is a dict mapping from build ID to
583 build info from Buildbucket, and patchset is the patchset number where
584 those builds came from.
585 """
586 assert buildbucket_host
587 assert changelist.GetIssue(), 'CL must be uploaded first'
588 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000589 if latest_patchset is None:
590 assert changelist.GetMostRecentPatchset()
591 ps = changelist.GetMostRecentPatchset()
592 else:
593 assert latest_patchset > 0, latest_patchset
594 ps = latest_patchset
595
Quinten Yearsley983111f2019-09-26 17:18:48 +0000596 min_ps = max(1, ps - 5)
597 while ps >= min_ps:
598 builds = fetch_try_jobs(
599 auth_config, changelist, buildbucket_host, patchset=ps)
600 if len(builds):
601 return builds, ps
602 ps -= 1
603 return [], 0
604
605
606def _filter_failed(builds):
607 """Returns a list of buckets/builders that had failed builds.
608
609 Args:
610 builds (dict): Builds, in the format returned by fetch_try_jobs,
611 i.e. a dict mapping build ID to build info dict, which includes
612 the keys status, result, bucket, and builder_name.
613
614 Returns:
615 A dict of bucket to builder to tests (empty list). This is the same format
616 accepted by _trigger_try_jobs and returned by _get_bucket_map.
617 """
618 buckets = collections.defaultdict(dict)
619 for build in builds.values():
620 if build['status'] == 'COMPLETED' and build['result'] == 'FAILURE':
621 project = build['project']
622 bucket = build['bucket']
623 if bucket.startswith('luci.'):
624 # Assume legacy bucket name luci.<project>.<bucket>.
625 bucket = bucket.split('.')[2]
626 builder = _get_builder_from_build(build)
627 buckets[project + '/' + bucket][builder] = []
628 return buckets
629
630
qyearsleyeab3c042016-08-24 09:18:28 -0700631def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632 """Prints nicely result of fetch_try_jobs."""
633 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000634 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000635 return
636
637 # Make a copy, because we'll be modifying builds dictionary.
638 builds = builds.copy()
639 builder_names_cache = {}
640
641 def get_builder(b):
642 try:
643 return builder_names_cache[b['id']]
644 except KeyError:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000645 name = _get_builder_from_build(b)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000646 builder_names_cache[b['id']] = name
647 return name
648
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649 if options.print_master:
650 name_fmt = '%%-%ds %%-%ds' % (
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000651 max(len(str(b['bucket'])) for b in builds.itervalues()),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000652 max(len(str(get_builder(b))) for b in builds.itervalues()))
653 def get_name(b):
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000654 return name_fmt % (b['bucket'], get_builder(b))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000655 else:
656 name_fmt = '%%-%ds' % (
657 max(len(str(get_builder(b))) for b in builds.itervalues()))
658 def get_name(b):
659 return name_fmt % get_builder(b)
660
661 def sort_key(b):
662 return b['status'], b.get('result'), get_name(b), b.get('url')
663
664 def pop(title, f, color=None, **kwargs):
665 """Pop matching builds from `builds` dict and print them."""
666
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000667 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668 colorize = str
669 else:
670 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
671
672 result = []
673 for b in builds.values():
674 if all(b.get(k) == v for k, v in kwargs.iteritems()):
675 builds.pop(b['id'])
676 result.append(b)
677 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700678 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000679 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700680 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000681
682 total = len(builds)
683 pop(status='COMPLETED', result='SUCCESS',
684 title='Successes:', color=Fore.GREEN,
685 f=lambda b: (get_name(b), b.get('url')))
686 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
687 title='Infra Failures:', color=Fore.MAGENTA,
688 f=lambda b: (get_name(b), b.get('url')))
689 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
690 title='Failures:', color=Fore.RED,
691 f=lambda b: (get_name(b), b.get('url')))
692 pop(status='COMPLETED', result='CANCELED',
693 title='Canceled:', color=Fore.MAGENTA,
694 f=lambda b: (get_name(b),))
695 pop(status='COMPLETED', result='FAILURE',
696 failure_reason='INVALID_BUILD_DEFINITION',
697 title='Wrong master/builder name:', color=Fore.MAGENTA,
698 f=lambda b: (get_name(b),))
699 pop(status='COMPLETED', result='FAILURE',
700 title='Other failures:',
701 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
702 pop(status='COMPLETED',
703 title='Other finished:',
704 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
705 pop(status='STARTED',
706 title='Started:', color=Fore.YELLOW,
707 f=lambda b: (get_name(b), b.get('url')))
708 pop(status='SCHEDULED',
709 title='Scheduled:',
710 f=lambda b: (get_name(b), 'id=%s' % b['id']))
711 # The last section is just in case buildbucket API changes OR there is a bug.
712 pop(title='Other:',
713 f=lambda b: (get_name(b), 'id=%s' % b['id']))
714 assert len(builds) == 0
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000715 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000716
717
Quinten Yearsley983111f2019-09-26 17:18:48 +0000718def _get_builder_from_build(build):
719 """Returns a builder name from a BB v1 build info dict."""
720 try:
721 parameters = json.loads(build['parameters_json'])
722 name = parameters['builder_name']
723 except (ValueError, KeyError) as error:
724 print('WARNING: Failed to get builder name for build %s: %s' % (
725 build['id'], error))
726 name = None
727 return name
728
729
Aiden Bennerc08566e2018-10-03 17:52:42 +0000730def _ComputeDiffLineRanges(files, upstream_commit):
731 """Gets the changed line ranges for each file since upstream_commit.
732
733 Parses a git diff on provided files and returns a dict that maps a file name
734 to an ordered list of range tuples in the form (start_line, count).
735 Ranges are in the same format as a git diff.
736 """
737 # If files is empty then diff_output will be a full diff.
738 if len(files) == 0:
739 return {}
740
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000741 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000742 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
743 diff_output = RunGit(diff_cmd)
744
745 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
746 # 2 capture groups
747 # 0 == fname of diff file
748 # 1 == 'diff_start,diff_count' or 'diff_start'
749 # will match each of
750 # diff --git a/foo.foo b/foo.py
751 # @@ -12,2 +14,3 @@
752 # @@ -12,2 +17 @@
753 # running re.findall on the above string with pattern will give
754 # [('foo.py', ''), ('', '14,3'), ('', '17')]
755
756 curr_file = None
757 line_diffs = {}
758 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
759 if match[0] != '':
760 # Will match the second filename in diff --git a/a.py b/b.py.
761 curr_file = match[0]
762 line_diffs[curr_file] = []
763 else:
764 # Matches +14,3
765 if ',' in match[1]:
766 diff_start, diff_count = match[1].split(',')
767 else:
768 # Single line changes are of the form +12 instead of +12,1.
769 diff_start = match[1]
770 diff_count = 1
771
772 diff_start = int(diff_start)
773 diff_count = int(diff_count)
774
775 # If diff_count == 0 this is a removal we can ignore.
776 line_diffs[curr_file].append((diff_start, diff_count))
777
778 return line_diffs
779
780
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000781def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000782 """Checks if a yapf file is in any parent directory of fpath until top_dir.
783
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000784 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000785 is found returns None. Uses yapf_config_cache as a cache for previously found
786 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000787 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000788 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000789 # Return result if we've already computed it.
790 if fpath in yapf_config_cache:
791 return yapf_config_cache[fpath]
792
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000793 parent_dir = os.path.dirname(fpath)
794 if os.path.isfile(fpath):
795 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000796 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000797 # Otherwise fpath is a directory
798 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
799 if os.path.isfile(yapf_file):
800 ret = yapf_file
801 elif fpath == top_dir or parent_dir == fpath:
802 # If we're at the top level directory, or if we're at root
803 # there is no provided style.
804 ret = None
805 else:
806 # Otherwise recurse on the current directory.
807 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000808 yapf_config_cache[fpath] = ret
809 return ret
810
811
qyearsley53f48a12016-09-01 10:45:13 -0700812def write_try_results_json(output_file, builds):
813 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
814
815 The input |builds| dict is assumed to be generated by Buildbucket.
816 Buildbucket documentation: http://goo.gl/G0s101
817 """
818
819 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800820 """Extracts some of the information from one build dict."""
821 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700822 return {
823 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700824 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800825 'builder_name': parameters.get('builder_name'),
826 'created_ts': build.get('created_ts'),
827 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700828 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800829 'result': build.get('result'),
830 'status': build.get('status'),
831 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700832 'url': build.get('url'),
833 }
834
835 converted = []
836 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000837 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700838 write_json(output_file, converted)
839
840
Aaron Gable13101a62018-02-09 13:20:41 -0800841def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000842 """Prints statistics about the change to the user."""
843 # --no-ext-diff is broken in some versions of Git, so try to work around
844 # this by overriding the environment (but there is still a problem if the
845 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000846 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000847 if 'GIT_EXTERNAL_DIFF' in env:
848 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000849
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000850 try:
851 stdout = sys.stdout.fileno()
852 except AttributeError:
853 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000854 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800855 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000856 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000857
858
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000859class BuildbucketResponseException(Exception):
860 pass
861
862
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000863class Settings(object):
864 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000865 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000866 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000867 self.tree_status_url = None
868 self.viewvc_url = None
869 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000870 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000871 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000872 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000874
875 def LazyUpdateIfNeeded(self):
876 """Updates the settings from a codereview.settings file, if available."""
877 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000878 # The only value that actually changes the behavior is
879 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000880 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000881 error_ok=True
882 ).strip().lower()
883
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000884 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000885 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000886 LoadCodereviewSettingsFromFile(cr_settings_file)
887 self.updated = True
888
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000889 @staticmethod
890 def GetRelativeRoot():
891 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000892
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000893 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000894 if self.root is None:
895 self.root = os.path.abspath(self.GetRelativeRoot())
896 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000897
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000898 def GetTreeStatusUrl(self, error_ok=False):
899 if not self.tree_status_url:
900 error_message = ('You must configure your tree status URL by running '
901 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000902 self.tree_status_url = self._GetConfig(
903 'rietveld.tree-status-url', error_ok=error_ok,
904 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000905 return self.tree_status_url
906
907 def GetViewVCUrl(self):
908 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000909 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000910 return self.viewvc_url
911
rmistry@google.com90752582014-01-14 21:04:50 +0000912 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000913 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000914
rmistry@google.com5626a922015-02-26 14:03:30 +0000915 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000916 run_post_upload_hook = self._GetConfig(
917 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000918 return run_post_upload_hook == "True"
919
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000920 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000921 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000922
ukai@chromium.orge8077812012-02-03 03:41:46 +0000923 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000924 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000925 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700926 self.is_gerrit = (
927 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000928 return self.is_gerrit
929
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000930 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000931 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000932 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700933 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
934 if self.squash_gerrit_uploads is None:
935 # Default is squash now (http://crbug.com/611892#c23).
936 self.squash_gerrit_uploads = not (
937 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
938 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000939 return self.squash_gerrit_uploads
940
tandriia60502f2016-06-20 02:01:53 -0700941 def GetSquashGerritUploadsOverride(self):
942 """Return True or False if codereview.settings should be overridden.
943
944 Returns None if no override has been defined.
945 """
946 # See also http://crbug.com/611892#c23
947 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
948 error_ok=True).strip()
949 if result == 'true':
950 return True
951 if result == 'false':
952 return False
953 return None
954
tandrii@chromium.org28253532016-04-14 13:46:56 +0000955 def GetGerritSkipEnsureAuthenticated(self):
956 """Return True if EnsureAuthenticated should not be done for Gerrit
957 uploads."""
958 if self.gerrit_skip_ensure_authenticated is None:
959 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000960 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000961 error_ok=True).strip() == 'true')
962 return self.gerrit_skip_ensure_authenticated
963
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000964 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000965 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000966 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000967 # Git requires single quotes for paths with spaces. We need to replace
968 # them with double quotes for Windows to treat such paths as a single
969 # path.
970 self.git_editor = self._GetConfig(
971 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000972 return self.git_editor or None
973
thestig@chromium.org44202a22014-03-11 19:22:18 +0000974 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000975 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000976 DEFAULT_LINT_REGEX)
977
978 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000979 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000980 DEFAULT_LINT_IGNORE_REGEX)
981
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000982 def _GetConfig(self, param, **kwargs):
983 self.LazyUpdateIfNeeded()
984 return RunGit(['config', param], **kwargs).strip()
985
986
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000987def ShortBranchName(branch):
988 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000989 return branch.replace('refs/heads/', '', 1)
990
991
992def GetCurrentBranchRef():
993 """Returns branch ref (e.g., refs/heads/master) or None."""
994 return RunGit(['symbolic-ref', 'HEAD'],
995 stderr=subprocess2.VOID, error_ok=True).strip() or None
996
997
998def GetCurrentBranch():
999 """Returns current branch or None.
1000
1001 For refs/heads/* branches, returns just last part. For others, full ref.
1002 """
1003 branchref = GetCurrentBranchRef()
1004 if branchref:
1005 return ShortBranchName(branchref)
1006 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001007
1008
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001009class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001010 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001011 NONE = 'none'
1012 DRY_RUN = 'dry_run'
1013 COMMIT = 'commit'
1014
1015 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1016
1017
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001018class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001019 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001020 self.issue = issue
1021 self.patchset = patchset
1022 self.hostname = hostname
1023
1024 @property
1025 def valid(self):
1026 return self.issue is not None
1027
1028
Edward Lemurf38bc172019-09-03 21:02:13 +00001029def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001030 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1031 fail_result = _ParsedIssueNumberArgument()
1032
Edward Lemur678a6842019-10-03 22:25:05 +00001033 if isinstance(arg, int):
1034 return _ParsedIssueNumberArgument(issue=arg)
1035 if not isinstance(arg, basestring):
1036 return fail_result
1037
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001038 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001039 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040 if not arg.startswith('http'):
1041 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001042
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043 url = gclient_utils.UpgradeToHttps(arg)
1044 try:
1045 parsed_url = urlparse.urlparse(url)
1046 except ValueError:
1047 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001048
Edward Lemur678a6842019-10-03 22:25:05 +00001049 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1050 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1051 # Short urls like https://domain/<issue_number> can be used, but don't allow
1052 # specifying the patchset (you'd 404), but we allow that here.
1053 if parsed_url.path == '/':
1054 part = parsed_url.fragment
1055 else:
1056 part = parsed_url.path
1057
1058 match = re.match(
1059 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1060 if not match:
1061 return fail_result
1062
1063 issue = int(match.group('issue'))
1064 patchset = match.group('patchset')
1065 return _ParsedIssueNumberArgument(
1066 issue=issue,
1067 patchset=int(patchset) if patchset else None,
1068 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001069
1070
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001071def _create_description_from_log(args):
1072 """Pulls out the commit log to use as a base for the CL description."""
1073 log_args = []
1074 if len(args) == 1 and not args[0].endswith('.'):
1075 log_args = [args[0] + '..']
1076 elif len(args) == 1 and args[0].endswith('...'):
1077 log_args = [args[0][:-1]]
1078 elif len(args) == 2:
1079 log_args = [args[0] + '..' + args[1]]
1080 else:
1081 log_args = args[:] # Hope for the best!
1082 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1083
1084
Aaron Gablea45ee112016-11-22 15:14:38 -08001085class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001086 def __init__(self, issue, url):
1087 self.issue = issue
1088 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001089 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001090
1091 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001092 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001093 self.issue, self.url)
1094
1095
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001096_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001097 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001098 # TODO(tandrii): these two aren't known in Gerrit.
1099 'approval', 'disapproval'])
1100
1101
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001103 """Changelist works with one changelist in local branch.
1104
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001105 Notes:
1106 * Not safe for concurrent multi-{thread,process} use.
1107 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001108 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001109 """
1110
Edward Lemur125d60a2019-09-13 18:25:41 +00001111 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001112 """Create a new ChangeList instance.
1113
Edward Lemurf38bc172019-09-03 21:02:13 +00001114 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001115 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001117 global settings
1118 if not settings:
1119 # Happens when git_cl.py is used as a utility library.
1120 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001121
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122 self.branchref = branchref
1123 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001124 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001125 self.branch = ShortBranchName(self.branchref)
1126 else:
1127 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001129 self.lookedup_issue = False
1130 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 self.has_description = False
1132 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001133 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001135 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001136 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001137 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001138 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001139
Edward Lemur125d60a2019-09-13 18:25:41 +00001140 # Lazily cached values.
1141 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1142 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1143 # Map from change number (issue) to its detail cache.
1144 self._detail_cache = {}
1145
1146 if codereview_host is not None:
1147 assert not codereview_host.startswith('https://'), codereview_host
1148 self._gerrit_host = codereview_host
1149 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001150
1151 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001152 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001153
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001154 The return value is a string suitable for passing to git cl with the --cc
1155 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001156 """
1157 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001158 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001159 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001160 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1161 return self.cc
1162
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001163 def GetCCListWithoutDefault(self):
1164 """Return the users cc'd on this CL excluding default ones."""
1165 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001166 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001167 return self.cc
1168
Daniel Cheng7227d212017-11-17 08:12:37 -08001169 def ExtendCC(self, more_cc):
1170 """Extends the list of users to cc on this CL based on the changed files."""
1171 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172
1173 def GetBranch(self):
1174 """Returns the short branch name, e.g. 'master'."""
1175 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001177 if not branchref:
1178 return None
1179 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 self.branch = ShortBranchName(self.branchref)
1181 return self.branch
1182
1183 def GetBranchRef(self):
1184 """Returns the full branch name, e.g. 'refs/heads/master'."""
1185 self.GetBranch() # Poke the lazy loader.
1186 return self.branchref
1187
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001188 def ClearBranch(self):
1189 """Clears cached branch data of this object."""
1190 self.branch = self.branchref = None
1191
tandrii5d48c322016-08-18 16:19:37 -07001192 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1193 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1194 kwargs['branch'] = self.GetBranch()
1195 return _git_get_branch_config_value(key, default, **kwargs)
1196
1197 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1198 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1199 assert self.GetBranch(), (
1200 'this CL must have an associated branch to %sset %s%s' %
1201 ('un' if value is None else '',
1202 key,
1203 '' if value is None else ' to %r' % value))
1204 kwargs['branch'] = self.GetBranch()
1205 return _git_set_branch_config_value(key, value, **kwargs)
1206
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001207 @staticmethod
1208 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001209 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 e.g. 'origin', 'refs/heads/master'
1211 """
1212 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001213 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1214
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001216 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001218 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1219 error_ok=True).strip()
1220 if upstream_branch:
1221 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001223 # Else, try to guess the origin remote.
1224 remote_branches = RunGit(['branch', '-r']).split()
1225 if 'origin/master' in remote_branches:
1226 # Fall back on origin/master if it exits.
1227 remote = 'origin'
1228 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001229 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001230 DieWithError(
1231 'Unable to determine default branch to diff against.\n'
1232 'Either pass complete "git diff"-style arguments, like\n'
1233 ' git cl upload origin/master\n'
1234 'or verify this branch is set up to track another \n'
1235 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236
1237 return remote, upstream_branch
1238
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001239 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001240 upstream_branch = self.GetUpstreamBranch()
1241 if not BranchExists(upstream_branch):
1242 DieWithError('The upstream for the current branch (%s) does not exist '
1243 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001244 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001245 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 def GetUpstreamBranch(self):
1248 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001250 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001251 upstream_branch = upstream_branch.replace('refs/heads/',
1252 'refs/remotes/%s/' % remote)
1253 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1254 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 self.upstream_branch = upstream_branch
1256 return self.upstream_branch
1257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001259 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001260 remote, branch = None, self.GetBranch()
1261 seen_branches = set()
1262 while branch not in seen_branches:
1263 seen_branches.add(branch)
1264 remote, branch = self.FetchUpstreamTuple(branch)
1265 branch = ShortBranchName(branch)
1266 if remote != '.' or branch.startswith('refs/remotes'):
1267 break
1268 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001269 remotes = RunGit(['remote'], error_ok=True).split()
1270 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001271 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001272 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001273 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001274 logging.warn('Could not determine which remote this change is '
1275 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001276 else:
1277 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001278 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001279 branch = 'HEAD'
1280 if branch.startswith('refs/remotes'):
1281 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001282 elif branch.startswith('refs/branch-heads/'):
1283 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001284 else:
1285 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001286 return self._remote
1287
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001288 def GitSanityChecks(self, upstream_git_obj):
1289 """Checks git repo status and ensures diff is from local commits."""
1290
sbc@chromium.org79706062015-01-14 21:18:12 +00001291 if upstream_git_obj is None:
1292 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001293 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001294 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001295 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001296 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001297 return False
1298
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001299 # Verify the commit we're diffing against is in our current branch.
1300 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1301 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1302 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001303 print('ERROR: %s is not in the current branch. You may need to rebase '
1304 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001305 return False
1306
1307 # List the commits inside the diff, and verify they are all local.
1308 commits_in_diff = RunGit(
1309 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1310 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1311 remote_branch = remote_branch.strip()
1312 if code != 0:
1313 _, remote_branch = self.GetRemoteBranch()
1314
1315 commits_in_remote = RunGit(
1316 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1317
1318 common_commits = set(commits_in_diff) & set(commits_in_remote)
1319 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001320 print('ERROR: Your diff contains %d commits already in %s.\n'
1321 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1322 'the diff. If you are using a custom git flow, you can override'
1323 ' the reference used for this check with "git config '
1324 'gitcl.remotebranch <git-ref>".' % (
1325 len(common_commits), remote_branch, upstream_git_obj),
1326 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001327 return False
1328 return True
1329
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001330 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001331 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001332
1333 Returns None if it is not set.
1334 """
tandrii5d48c322016-08-18 16:19:37 -07001335 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001336
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001337 def GetRemoteUrl(self):
1338 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1339
1340 Returns None if there is no remote.
1341 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001342 is_cached, value = self._cached_remote_url
1343 if is_cached:
1344 return value
1345
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001346 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001347 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1348
Edward Lemur298f2cf2019-02-22 21:40:39 +00001349 # Check if the remote url can be parsed as an URL.
1350 host = urlparse.urlparse(url).netloc
1351 if host:
1352 self._cached_remote_url = (True, url)
1353 return url
1354
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001355 # If it cannot be parsed as an url, assume it is a local directory,
1356 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001357 logging.warning('"%s" doesn\'t appear to point to a git host. '
1358 'Interpreting it as a local directory.', url)
1359 if not os.path.isdir(url):
1360 logging.error(
1361 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001362 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001363 return None
1364
1365 cache_path = url
1366 url = RunGit(['config', 'remote.%s.url' % remote],
1367 error_ok=True,
1368 cwd=url).strip()
1369
1370 host = urlparse.urlparse(url).netloc
1371 if not host:
1372 logging.error(
1373 'Remote "%(remote)s" for branch "%(branch)s" points to '
1374 '"%(cache_path)s", but it is misconfigured.\n'
1375 '"%(cache_path)s" must be a git repo and must have a remote named '
1376 '"%(remote)s" pointing to the git host.', {
1377 'remote': remote,
1378 'cache_path': cache_path,
1379 'branch': self.GetBranch()})
1380 return None
1381
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001382 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001383 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001384
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001385 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001386 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001387 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001388 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001389 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001390 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001391 return self.issue
1392
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 def GetIssueURL(self):
1394 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001395 issue = self.GetIssue()
1396 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001397 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001398 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001400 def GetDescription(self, pretty=False, force=False):
1401 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001402 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001403 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 self.has_description = True
1405 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001406 # Set width to 72 columns + 2 space indent.
1407 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001409 lines = self.description.splitlines()
1410 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411 return self.description
1412
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001413 def GetDescriptionFooters(self):
1414 """Returns (non_footer_lines, footers) for the commit message.
1415
1416 Returns:
1417 non_footer_lines (list(str)) - Simple list of description lines without
1418 any footer. The lines do not contain newlines, nor does the list contain
1419 the empty line between the message and the footers.
1420 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1421 [("Change-Id", "Ideadbeef...."), ...]
1422 """
1423 raw_description = self.GetDescription()
1424 msg_lines, _, footers = git_footers.split_footers(raw_description)
1425 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001426 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001427 return msg_lines, footers
1428
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001430 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001431 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001432 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001433 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001434 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001435 return self.patchset
1436
1437 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001438 """Set this branch's patchset. If patchset=0, clears the patchset."""
1439 assert self.GetBranch()
1440 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001442 else:
1443 self.patchset = int(patchset)
1444 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001445 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001447 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001448 """Set this branch's issue. If issue isn't given, clears the issue."""
1449 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001450 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001451 issue = int(issue)
1452 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001453 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001454 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001455 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001456 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001457 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001458 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001459 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460 else:
tandrii5d48c322016-08-18 16:19:37 -07001461 # Reset all of these just to be clean.
1462 reset_suffixes = [
1463 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001464 self.IssueConfigKey(),
1465 self.PatchsetConfigKey(),
1466 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001467 ] + self._PostUnsetIssueProperties()
1468 for prop in reset_suffixes:
1469 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001470 msg = RunGit(['log', '-1', '--format=%B']).strip()
1471 if msg and git_footers.get_footer_change_id(msg):
1472 print('WARNING: The change patched into this branch has a Change-Id. '
1473 'Removing it.')
1474 RunGit(['commit', '--amend', '-m',
1475 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001476 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001477 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001478 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001479
dnjba1b0f32016-09-02 12:37:42 -07001480 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001481 if not self.GitSanityChecks(upstream_branch):
1482 DieWithError('\nGit sanity check failure')
1483
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001484 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001485 if not root:
1486 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001487 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001488
1489 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001490 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001491 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001492 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001493 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001494 except subprocess2.CalledProcessError:
1495 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001496 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001497 'This branch probably doesn\'t exist anymore. To reset the\n'
1498 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001499 ' git branch --set-upstream-to origin/master %s\n'
1500 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001501 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001502
maruel@chromium.org52424302012-08-29 15:14:30 +00001503 issue = self.GetIssue()
1504 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001505 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001506 description = self.GetDescription()
1507 else:
1508 # If the change was never uploaded, use the log messages of all commits
1509 # up to the branch point, as git cl upload will prefill the description
1510 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001511 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1512 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001513
1514 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001515 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001516 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001517 name,
1518 description,
1519 absroot,
1520 files,
1521 issue,
1522 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001523 author,
1524 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001525
dsansomee2d6fd92016-09-08 00:10:47 -07001526 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001527 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001528 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001529 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001530
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001531 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1532 """Sets the description for this CL remotely.
1533
1534 You can get description_lines and footers with GetDescriptionFooters.
1535
1536 Args:
1537 description_lines (list(str)) - List of CL description lines without
1538 newline characters.
1539 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1540 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1541 `List-Of-Tokens`). It will be case-normalized so that each token is
1542 title-cased.
1543 """
1544 new_description = '\n'.join(description_lines)
1545 if footers:
1546 new_description += '\n'
1547 for k, v in footers:
1548 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1549 if not git_footers.FOOTER_PATTERN.match(foot):
1550 raise ValueError('Invalid footer %r' % foot)
1551 new_description += foot + '\n'
1552 self.UpdateDescription(new_description, force)
1553
Edward Lesmes8e282792018-04-03 18:50:29 -04001554 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001555 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1556 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001557 start = time_time()
1558 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1560 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001561 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001562 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001563 metrics.collector.add_repeated('sub_commands', {
1564 'command': 'presubmit',
1565 'execution_time': time_time() - start,
1566 'exit_code': 0 if result.should_continue() else 1,
1567 })
1568 return result
vapierfd77ac72016-06-16 08:33:57 -07001569 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001570 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001571
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572 def CMDUpload(self, options, git_diff_args, orig_args):
1573 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001574 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001575 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001576 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001577 else:
1578 if self.GetBranch() is None:
1579 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1580
1581 # Default to diffing against common ancestor of upstream branch
1582 base_branch = self.GetCommonAncestorWithUpstream()
1583 git_diff_args = [base_branch, 'HEAD']
1584
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001585 # Fast best-effort checks to abort before running potentially expensive
1586 # hooks if uploading is likely to fail anyway. Passing these checks does
1587 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001588 self.EnsureAuthenticated(force=options.force)
1589 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590
1591 # Apply watchlists on upload.
1592 change = self.GetChange(base_branch, None)
1593 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1594 files = [f.LocalPath() for f in change.AffectedFiles()]
1595 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001596 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597
1598 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001599 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001600 # Set the reviewer list now so that presubmit checks can access it.
1601 change_description = ChangeDescription(change.FullDescriptionText())
1602 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001603 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001604 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 change)
1606 change.SetDescriptionText(change_description.description)
1607 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001608 may_prompt=not options.force,
1609 verbose=options.verbose,
1610 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001611 if not hook_results.should_continue():
1612 return 1
1613 if not options.reviewers and hook_results.reviewers:
1614 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001615 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616
Aaron Gable13101a62018-02-09 13:20:41 -08001617 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001618 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001619 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001620 _git_set_branch_config_value('last-upload-hash',
1621 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 # Run post upload hooks, if specified.
1623 if settings.GetRunPostUploadHook():
1624 presubmit_support.DoPostUploadExecuter(
1625 change,
1626 self,
1627 settings.GetRoot(),
1628 options.verbose,
1629 sys.stdout)
1630
1631 # Upload all dependencies if specified.
1632 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001633 print()
1634 print('--dependencies has been specified.')
1635 print('All dependent local branches will be re-uploaded.')
1636 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001637 # Remove the dependencies flag from args so that we do not end up in a
1638 # loop.
1639 orig_args.remove('--dependencies')
1640 ret = upload_branch_deps(self, orig_args)
1641 return ret
1642
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001643 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001644 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001645
1646 Issue must have been already uploaded and known.
1647 """
1648 assert new_state in _CQState.ALL_STATES
1649 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001650 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001651 vote_map = {
1652 _CQState.NONE: 0,
1653 _CQState.DRY_RUN: 1,
1654 _CQState.COMMIT: 2,
1655 }
1656 labels = {'Commit-Queue': vote_map[new_state]}
1657 notify = False if new_state == _CQState.DRY_RUN else None
1658 gerrit_util.SetReview(
1659 self._GetGerritHost(), self._GerritChangeIdentifier(),
1660 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001661 return 0
1662 except KeyboardInterrupt:
1663 raise
1664 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001665 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001666 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001667 ' * Your project has no CQ,\n'
1668 ' * You don\'t have permission to change the CQ state,\n'
1669 ' * There\'s a bug in this code (see stack trace below).\n'
1670 'Consider specifying which bots to trigger manually or asking your '
1671 'project owners for permissions or contacting Chrome Infra at:\n'
1672 'https://www.chromium.org/infra\n\n' %
1673 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001674 # Still raise exception so that stack trace is printed.
1675 raise
1676
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001677 def _GetGerritHost(self):
1678 # Lazy load of configs.
1679 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001680 if self._gerrit_host and '.' not in self._gerrit_host:
1681 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1682 # This happens for internal stuff http://crbug.com/614312.
1683 parsed = urlparse.urlparse(self.GetRemoteUrl())
1684 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001685 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001686 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001687 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1688 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001689 return self._gerrit_host
1690
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001691 def _GetGitHost(self):
1692 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001693 remote_url = self.GetRemoteUrl()
1694 if not remote_url:
1695 return None
1696 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001698 def GetCodereviewServer(self):
1699 if not self._gerrit_server:
1700 # If we're on a branch then get the server potentially associated
1701 # with that branch.
1702 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001703 self._gerrit_server = self._GitGetBranchConfigValue(
1704 self.CodereviewServerConfigKey())
1705 if self._gerrit_server:
1706 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001707 if not self._gerrit_server:
1708 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1709 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001710 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001711 parts[0] = parts[0] + '-review'
1712 self._gerrit_host = '.'.join(parts)
1713 self._gerrit_server = 'https://%s' % self._gerrit_host
1714 return self._gerrit_server
1715
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001716 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001717 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001718 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001719 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001720 logging.warn('can\'t detect Gerrit project.')
1721 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001722 project = urlparse.urlparse(remote_url).path.strip('/')
1723 if project.endswith('.git'):
1724 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001725 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1726 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1727 # gitiles/git-over-https protocol. E.g.,
1728 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1729 # as
1730 # https://chromium.googlesource.com/v8/v8
1731 if project.startswith('a/'):
1732 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001733 return project
1734
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001735 def _GerritChangeIdentifier(self):
1736 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1737
1738 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001739 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001740 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001741 project = self._GetGerritProject()
1742 if project:
1743 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1744 # Fall back on still unique, but less efficient change number.
1745 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001746
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001747 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001748 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001749 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001750
tandrii5d48c322016-08-18 16:19:37 -07001751 @classmethod
1752 def PatchsetConfigKey(cls):
1753 return 'gerritpatchset'
1754
1755 @classmethod
1756 def CodereviewServerConfigKey(cls):
1757 return 'gerritserver'
1758
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001759 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001760 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001761 if settings.GetGerritSkipEnsureAuthenticated():
1762 # For projects with unusual authentication schemes.
1763 # See http://crbug.com/603378.
1764 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001765
1766 # Check presence of cookies only if using cookies-based auth method.
1767 cookie_auth = gerrit_util.Authenticator.get()
1768 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001770
Daniel Chengcf6269b2019-05-18 01:02:12 +00001771 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1772 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001773 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001774 return
1775
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001776 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001777 self.GetCodereviewServer()
1778 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001779 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001780
1781 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1782 git_auth = cookie_auth.get_auth_header(git_host)
1783 if gerrit_auth and git_auth:
1784 if gerrit_auth == git_auth:
1785 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001786 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001787 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001788 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001789 ' %s\n'
1790 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001791 ' Consider running the following command:\n'
1792 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001793 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001794 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001795 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001796 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001797 cookie_auth.get_new_password_message(git_host)))
1798 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001799 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001800 return
1801 else:
1802 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001803 ([] if gerrit_auth else [self._gerrit_host]) +
1804 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001805 DieWithError('Credentials for the following hosts are required:\n'
1806 ' %s\n'
1807 'These are read from %s (or legacy %s)\n'
1808 '%s' % (
1809 '\n '.join(missing),
1810 cookie_auth.get_gitcookies_path(),
1811 cookie_auth.get_netrc_path(),
1812 cookie_auth.get_new_password_message(git_host)))
1813
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001814 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001815 if not self.GetIssue():
1816 return
1817
1818 # Warm change details cache now to avoid RPCs later, reducing latency for
1819 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001820 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001821 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001822
1823 status = self._GetChangeDetail()['status']
1824 if status in ('MERGED', 'ABANDONED'):
1825 DieWithError('Change %s has been %s, new uploads are not allowed' %
1826 (self.GetIssueURL(),
1827 'submitted' if status == 'MERGED' else 'abandoned'))
1828
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001829 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1830 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1831 # Apparently this check is not very important? Otherwise get_auth_email
1832 # could have been added to other implementations of Authenticator.
1833 cookies_auth = gerrit_util.Authenticator.get()
1834 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001835 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001836
1837 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001838 if self.GetIssueOwner() == cookies_user:
1839 return
1840 logging.debug('change %s owner is %s, cookies user is %s',
1841 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001842 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001843 # so ask what Gerrit thinks of this user.
1844 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1845 if details['email'] == self.GetIssueOwner():
1846 return
1847 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001848 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001849 'as %s.\n'
1850 'Uploading may fail due to lack of permissions.' %
1851 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1852 confirm_or_exit(action='upload')
1853
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001854 def _PostUnsetIssueProperties(self):
1855 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001856 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001857
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001858 def GetGerritObjForPresubmit(self):
1859 return presubmit_support.GerritAccessor(self._GetGerritHost())
1860
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001861 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001862 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001863 or CQ status, assuming adherence to a common workflow.
1864
1865 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001866 * 'error' - error from review tool (including deleted issues)
1867 * 'unsent' - no reviewers added
1868 * 'waiting' - waiting for review
1869 * 'reply' - waiting for uploader to reply to review
1870 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001871 * 'dry-run' - dry-running in the CQ
1872 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001873 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001874 """
1875 if not self.GetIssue():
1876 return None
1877
1878 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001879 data = self._GetChangeDetail([
1880 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001881 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001882 return 'error'
1883
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001884 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001885 return 'closed'
1886
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001887 cq_label = data['labels'].get('Commit-Queue', {})
1888 max_cq_vote = 0
1889 for vote in cq_label.get('all', []):
1890 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1891 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001892 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001893 if max_cq_vote == 1:
1894 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001895
Aaron Gable9ab38c62017-04-06 14:36:33 -07001896 if data['labels'].get('Code-Review', {}).get('approved'):
1897 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001898
1899 if not data.get('reviewers', {}).get('REVIEWER', []):
1900 return 'unsent'
1901
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001902 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001903 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1904 last_message_author = messages.pop().get('author', {})
1905 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001906 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1907 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001908 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001909 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001910 if last_message_author.get('_account_id') == owner:
1911 # Most recent message was by owner.
1912 return 'waiting'
1913 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001914 # Some reply from non-owner.
1915 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001916
1917 # Somehow there are no messages even though there are reviewers.
1918 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919
1920 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001921 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001922 patchset = data['revisions'][data['current_revision']]['_number']
1923 self.SetPatchset(patchset)
1924 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001926 def FetchDescription(self, force=False):
1927 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1928 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001929 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001930 return data['revisions'][current_rev]['commit']['message'].encode(
1931 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932
dsansomee2d6fd92016-09-08 00:10:47 -07001933 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001934 if gerrit_util.HasPendingChangeEdit(
1935 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001936 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001937 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001938 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001939 'unpublished edit. Either publish the edit in the Gerrit web UI '
1940 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001941
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001942 gerrit_util.DeletePendingChangeEdit(
1943 self._GetGerritHost(), self._GerritChangeIdentifier())
1944 gerrit_util.SetCommitMessage(
1945 self._GetGerritHost(), self._GerritChangeIdentifier(),
1946 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947
Aaron Gable636b13f2017-07-14 10:42:48 -07001948 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001949 gerrit_util.SetReview(
1950 self._GetGerritHost(), self._GerritChangeIdentifier(),
1951 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001952
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001953 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001954 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001955 # CURRENT_REVISION is included to get the latest patchset so that
1956 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001957 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1959 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001960 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001961 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001962 robot_file_comments = gerrit_util.GetChangeRobotComments(
1963 self._GetGerritHost(), self._GerritChangeIdentifier())
1964
1965 # Add the robot comments onto the list of comments, but only
1966 # keep those that are from the latest pachset.
1967 latest_patch_set = self.GetMostRecentPatchset()
1968 for path, robot_comments in robot_file_comments.iteritems():
1969 line_comments = file_comments.setdefault(path, [])
1970 line_comments.extend(
1971 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001972
1973 # Build dictionary of file comments for easy access and sorting later.
1974 # {author+date: {path: {patchset: {line: url+message}}}}
1975 comments = collections.defaultdict(
1976 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1977 for path, line_comments in file_comments.iteritems():
1978 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001979 tag = comment.get('tag', '')
1980 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001981 continue
1982 key = (comment['author']['email'], comment['updated'])
1983 if comment.get('side', 'REVISION') == 'PARENT':
1984 patchset = 'Base'
1985 else:
1986 patchset = 'PS%d' % comment['patch_set']
1987 line = comment.get('line', 0)
1988 url = ('https://%s/c/%s/%s/%s#%s%s' %
1989 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1990 'b' if comment.get('side') == 'PARENT' else '',
1991 str(line) if line else ''))
1992 comments[key][path][patchset][line] = (url, comment['message'])
1993
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001994 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001995 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001996 summary = self._BuildCommentSummary(msg, comments, readable)
1997 if summary:
1998 summaries.append(summary)
1999 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002000
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002001 @staticmethod
2002 def _BuildCommentSummary(msg, comments, readable):
2003 key = (msg['author']['email'], msg['date'])
2004 # Don't bother showing autogenerated messages that don't have associated
2005 # file or line comments. this will filter out most autogenerated
2006 # messages, but will keep robot comments like those from Tricium.
2007 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2008 if is_autogenerated and not comments.get(key):
2009 return None
2010 message = msg['message']
2011 # Gerrit spits out nanoseconds.
2012 assert len(msg['date'].split('.')[-1]) == 9
2013 date = datetime.datetime.strptime(msg['date'][:-3],
2014 '%Y-%m-%d %H:%M:%S.%f')
2015 if key in comments:
2016 message += '\n'
2017 for path, patchsets in sorted(comments.get(key, {}).items()):
2018 if readable:
2019 message += '\n%s' % path
2020 for patchset, lines in sorted(patchsets.items()):
2021 for line, (url, content) in sorted(lines.items()):
2022 if line:
2023 line_str = 'Line %d' % line
2024 path_str = '%s:%d:' % (path, line)
2025 else:
2026 line_str = 'File comment'
2027 path_str = '%s:0:' % path
2028 if readable:
2029 message += '\n %s, %s: %s' % (patchset, line_str, url)
2030 message += '\n %s\n' % content
2031 else:
2032 message += '\n%s ' % path_str
2033 message += '\n%s\n' % content
2034
2035 return _CommentSummary(
2036 date=date,
2037 message=message,
2038 sender=msg['author']['email'],
2039 autogenerated=is_autogenerated,
2040 # These could be inferred from the text messages and correlated with
2041 # Code-Review label maximum, however this is not reliable.
2042 # Leaving as is until the need arises.
2043 approval=False,
2044 disapproval=False,
2045 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002046
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002047 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002048 gerrit_util.AbandonChange(
2049 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002050
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002051 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002052 gerrit_util.SubmitChange(
2053 self._GetGerritHost(), self._GerritChangeIdentifier(),
2054 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002055
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002056 def _GetChangeDetail(self, options=None, no_cache=False):
2057 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002058
2059 If fresh data is needed, set no_cache=True which will clear cache and
2060 thus new data will be fetched from Gerrit.
2061 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002062 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002063 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002064
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002065 # Optimization to avoid multiple RPCs:
2066 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2067 'CURRENT_COMMIT' not in options):
2068 options.append('CURRENT_COMMIT')
2069
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002070 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002071 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002072 options = [o.upper() for o in options]
2073
2074 # Check in cache first unless no_cache is True.
2075 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002076 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002077 else:
2078 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002079 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002080 # Assumption: data fetched before with extra options is suitable
2081 # for return for a smaller set of options.
2082 # For example, if we cached data for
2083 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2084 # and request is for options=[CURRENT_REVISION],
2085 # THEN we can return prior cached data.
2086 if options_set.issubset(cached_options_set):
2087 return data
2088
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002089 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002090 data = gerrit_util.GetChangeDetail(
2091 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002092 except gerrit_util.GerritError as e:
2093 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002094 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002095 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002096
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002097 self._detail_cache.setdefault(cache_key, []).append(
2098 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002099 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002100
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002101 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002102 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002103 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002104 data = gerrit_util.GetChangeCommit(
2105 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002106 except gerrit_util.GerritError as e:
2107 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002108 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002109 raise
agable32978d92016-11-01 12:55:02 -07002110 return data
2111
Karen Qian40c19422019-03-13 21:28:29 +00002112 def _IsCqConfigured(self):
2113 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002114 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002115 return False
2116 # TODO(crbug/753213): Remove temporary hack
2117 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002118 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002119 detail['branch'].startswith('refs/branch-heads/')):
2120 return False
2121 return True
2122
Olivier Robin75ee7252018-04-13 10:02:56 +02002123 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002124 if git_common.is_dirty_git_tree('land'):
2125 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002126
tandriid60367b2016-06-22 05:25:12 -07002127 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002128 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002129 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002130 'which can test and land changes for you. '
2131 'Are you sure you wish to bypass it?\n',
2132 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002133 differs = True
tandriic4344b52016-08-29 06:04:54 -07002134 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002135 # Note: git diff outputs nothing if there is no diff.
2136 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002137 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002138 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002139 if detail['current_revision'] == last_upload:
2140 differs = False
2141 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002142 print('WARNING: Local branch contents differ from latest uploaded '
2143 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002144 if differs:
2145 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002146 confirm_or_exit(
2147 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2148 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002149 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002150 elif not bypass_hooks:
2151 hook_results = self.RunHook(
2152 committing=True,
2153 may_prompt=not force,
2154 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002155 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2156 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002157 if not hook_results.should_continue():
2158 return 1
2159
2160 self.SubmitIssue(wait_for_merge=True)
2161 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002162 links = self._GetChangeCommit().get('web_links', [])
2163 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002164 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002165 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002166 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002167 return 0
2168
Edward Lemurf38bc172019-09-03 21:02:13 +00002169 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 assert parsed_issue_arg.valid
2171
Edward Lemur125d60a2019-09-13 18:25:41 +00002172 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002173
2174 if parsed_issue_arg.hostname:
2175 self._gerrit_host = parsed_issue_arg.hostname
2176 self._gerrit_server = 'https://%s' % self._gerrit_host
2177
tandriic2405f52016-10-10 08:13:15 -07002178 try:
2179 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002180 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002181 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002182
2183 if not parsed_issue_arg.patchset:
2184 # Use current revision by default.
2185 revision_info = detail['revisions'][detail['current_revision']]
2186 patchset = int(revision_info['_number'])
2187 else:
2188 patchset = parsed_issue_arg.patchset
2189 for revision_info in detail['revisions'].itervalues():
2190 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2191 break
2192 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002193 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 (parsed_issue_arg.patchset, self.GetIssue()))
2195
Edward Lemur125d60a2019-09-13 18:25:41 +00002196 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002197 if remote_url.endswith('.git'):
2198 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002199 remote_url = remote_url.rstrip('/')
2200
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002202 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002203
2204 if remote_url != fetch_info['url']:
2205 DieWithError('Trying to patch a change from %s but this repo appears '
2206 'to be %s.' % (fetch_info['url'], remote_url))
2207
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002208 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002209
Aaron Gable62619a32017-06-16 08:22:09 -07002210 if force:
2211 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2212 print('Checked out commit for change %i patchset %i locally' %
2213 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002214 elif nocommit:
2215 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2216 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002217 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002218 RunGit(['cherry-pick', 'FETCH_HEAD'])
2219 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002220 (parsed_issue_arg.issue, patchset))
2221 print('Note: this created a local commit which does not have '
2222 'the same hash as the one uploaded for review. This will make '
2223 'uploading changes based on top of this branch difficult.\n'
2224 'If you want to do that, use "git cl patch --force" instead.')
2225
Stefan Zagerd08043c2017-10-12 12:07:02 -07002226 if self.GetBranch():
2227 self.SetIssue(parsed_issue_arg.issue)
2228 self.SetPatchset(patchset)
2229 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2230 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2231 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2232 else:
2233 print('WARNING: You are in detached HEAD state.\n'
2234 'The patch has been applied to your checkout, but you will not be '
2235 'able to upload a new patch set to the gerrit issue.\n'
2236 'Try using the \'-b\' option if you would like to work on a '
2237 'branch and/or upload a new patch set.')
2238
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002239 return 0
2240
tandrii16e0b4e2016-06-07 10:34:28 -07002241 def _GerritCommitMsgHookCheck(self, offer_removal):
2242 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2243 if not os.path.exists(hook):
2244 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002245 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2246 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002247 data = gclient_utils.FileRead(hook)
2248 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2249 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002250 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002251 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002252 'and may interfere with it in subtle ways.\n'
2253 'We recommend you remove the commit-msg hook.')
2254 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002255 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002256 gclient_utils.rm_file_or_tree(hook)
2257 print('Gerrit commit-msg hook removed.')
2258 else:
2259 print('OK, will keep Gerrit commit-msg hook in place.')
2260
Edward Lemur1b52d872019-05-09 21:12:12 +00002261 def _CleanUpOldTraces(self):
2262 """Keep only the last |MAX_TRACES| traces."""
2263 try:
2264 traces = sorted([
2265 os.path.join(TRACES_DIR, f)
2266 for f in os.listdir(TRACES_DIR)
2267 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2268 and not f.startswith('tmp'))
2269 ])
2270 traces_to_delete = traces[:-MAX_TRACES]
2271 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002272 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002273 except OSError:
2274 print('WARNING: Failed to remove old git traces from\n'
2275 ' %s'
2276 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002277
Edward Lemur5737f022019-05-17 01:24:00 +00002278 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002279 """Zip and write the git push traces stored in traces_dir."""
2280 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002281 traces_zip = trace_name + '-traces'
2282 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002283 # Create a temporary dir to store git config and gitcookies in. It will be
2284 # compressed and stored next to the traces.
2285 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 git_info_zip = trace_name + '-git-info'
2287
Edward Lemur5737f022019-05-17 01:24:00 +00002288 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002289 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002290 git_push_metadata['now'] = git_push_metadata['now'].decode(
2291 sys.stdin.encoding)
2292
Edward Lemur1b52d872019-05-09 21:12:12 +00002293 git_push_metadata['trace_name'] = trace_name
2294 gclient_utils.FileWrite(
2295 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2296
2297 # Keep only the first 6 characters of the git hashes on the packet
2298 # trace. This greatly decreases size after compression.
2299 packet_traces = os.path.join(traces_dir, 'trace-packet')
2300 if os.path.isfile(packet_traces):
2301 contents = gclient_utils.FileRead(packet_traces)
2302 gclient_utils.FileWrite(
2303 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2304 shutil.make_archive(traces_zip, 'zip', traces_dir)
2305
2306 # Collect and compress the git config and gitcookies.
2307 git_config = RunGit(['config', '-l'])
2308 gclient_utils.FileWrite(
2309 os.path.join(git_info_dir, 'git-config'),
2310 git_config)
2311
2312 cookie_auth = gerrit_util.Authenticator.get()
2313 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2314 gitcookies_path = cookie_auth.get_gitcookies_path()
2315 if os.path.isfile(gitcookies_path):
2316 gitcookies = gclient_utils.FileRead(gitcookies_path)
2317 gclient_utils.FileWrite(
2318 os.path.join(git_info_dir, 'gitcookies'),
2319 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2320 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2321
Edward Lemur1b52d872019-05-09 21:12:12 +00002322 gclient_utils.rmtree(git_info_dir)
2323
2324 def _RunGitPushWithTraces(
2325 self, change_desc, refspec, refspec_opts, git_push_metadata):
2326 """Run git push and collect the traces resulting from the execution."""
2327 # Create a temporary directory to store traces in. Traces will be compressed
2328 # and stored in a 'traces' dir inside depot_tools.
2329 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002330 trace_name = os.path.join(
2331 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002332
2333 env = os.environ.copy()
2334 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2335 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002336 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002337 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2338 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2339 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2340
2341 try:
2342 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002343 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002344 before_push = time_time()
2345 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002346 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002347 env=env,
2348 print_stdout=True,
2349 # Flush after every line: useful for seeing progress when running as
2350 # recipe.
2351 filter_fn=lambda _: sys.stdout.flush())
2352 except subprocess2.CalledProcessError as e:
2353 push_returncode = e.returncode
2354 DieWithError('Failed to create a change. Please examine output above '
2355 'for the reason of the failure.\n'
2356 'Hint: run command below to diagnose common Git/Gerrit '
2357 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002358 ' git cl creds-check\n'
2359 '\n'
2360 'If git-cl is not working correctly, file a bug under the '
2361 'Infra>SDK component including the files below.\n'
2362 'Review the files before upload, since they might contain '
2363 'sensitive information.\n'
2364 'Set the Restrict-View-Google label so that they are not '
2365 'publicly accessible.\n'
2366 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002367 change_desc)
2368 finally:
2369 execution_time = time_time() - before_push
2370 metrics.collector.add_repeated('sub_commands', {
2371 'command': 'git push',
2372 'execution_time': execution_time,
2373 'exit_code': push_returncode,
2374 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2375 })
2376
Edward Lemur1b52d872019-05-09 21:12:12 +00002377 git_push_metadata['execution_time'] = execution_time
2378 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002379 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002380
Edward Lemur1b52d872019-05-09 21:12:12 +00002381 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002382 gclient_utils.rmtree(traces_dir)
2383
2384 return push_stdout
2385
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002386 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002388 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002389 # Load default for user, repo, squash=true, in this order.
2390 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002391
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002392 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002393 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002394 # This may be None; default fallback value is determined in logic below.
2395 title = options.title
2396
Dominic Battre7d1c4842017-10-27 09:17:28 +02002397 # Extract bug number from branch name.
2398 bug = options.bug
2399 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2400 if not bug and match:
2401 bug = match.group(1)
2402
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002404 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002405 if self.GetIssue():
2406 # Try to get the message from a previous upload.
2407 message = self.GetDescription()
2408 if not message:
2409 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002410 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002412 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002413 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002414 # When uploading a subsequent patchset, -m|--message is taken
2415 # as the patchset title if --title was not provided.
2416 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002417 else:
2418 default_title = RunGit(
2419 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002420 if options.force:
2421 title = default_title
2422 else:
2423 title = ask_for_data(
2424 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 change_id = self._GetChangeDetail()['change_id']
2426 while True:
2427 footer_change_ids = git_footers.get_footer_change_id(message)
2428 if footer_change_ids == [change_id]:
2429 break
2430 if not footer_change_ids:
2431 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002432 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 continue
2434 # There is already a valid footer but with different or several ids.
2435 # Doing this automatically is non-trivial as we don't want to lose
2436 # existing other footers, yet we want to append just 1 desired
2437 # Change-Id. Thus, just create a new footer, but let user verify the
2438 # new description.
2439 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002440 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002442 print(
2443 'WARNING: change %s has Change-Id footer(s):\n'
2444 ' %s\n'
2445 'but change has Change-Id %s, according to Gerrit.\n'
2446 'Please, check the proposed correction to the description, '
2447 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2448 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2449 change_id))
2450 confirm_or_exit(action='edit')
2451 change_desc.prompt()
2452
2453 message = change_desc.description
2454 if not message:
2455 DieWithError("Description is empty. Aborting...")
2456
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002457 # Continue the while loop.
2458 # Sanity check of this code - we should end up with proper message
2459 # footer.
2460 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002461 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002462 else: # if not self.GetIssue()
2463 if options.message:
2464 message = options.message
2465 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002466 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002467 if options.title:
2468 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002469 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002471 change_desc.prompt()
2472
Aaron Gableb56ad332017-01-06 15:24:31 -08002473 # On first upload, patchset title is always this string, while
2474 # --title flag gets converted to first line of message.
2475 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002476 if not change_desc.description:
2477 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002478 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002479 if len(change_ids) > 1:
2480 DieWithError('too many Change-Id footers, at most 1 allowed.')
2481 if not change_ids:
2482 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002483 change_desc.set_description(git_footers.add_footer_change_id(
2484 change_desc.description,
2485 GenerateGerritChangeId(change_desc.description)))
2486 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002487 assert len(change_ids) == 1
2488 change_id = change_ids[0]
2489
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002490 if options.reviewers or options.tbrs or options.add_owners_to:
2491 change_desc.update_reviewers(options.reviewers, options.tbrs,
2492 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002493 if options.preserve_tryjobs:
2494 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002495
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002496 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002497 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2498 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002499 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002500 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2501 desc_tempfile.write(change_desc.description)
2502 desc_tempfile.close()
2503 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2504 '-F', desc_tempfile.name]).strip()
2505 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002506 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002507 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002508 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002509 if not change_desc.description:
2510 DieWithError("Description is empty. Aborting...")
2511
2512 if not git_footers.get_footer_change_id(change_desc.description):
2513 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002514 change_desc.set_description(
2515 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002516 if options.reviewers or options.tbrs or options.add_owners_to:
2517 change_desc.update_reviewers(options.reviewers, options.tbrs,
2518 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002519 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002520 # For no-squash mode, we assume the remote called "origin" is the one we
2521 # want. It is not worthwhile to support different workflows for
2522 # no-squash mode.
2523 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002524 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2525
2526 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002527 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2529 ref_to_push)]).splitlines()
2530 if len(commits) > 1:
2531 print('WARNING: This will upload %d commits. Run the following command '
2532 'to see which commits will be uploaded: ' % len(commits))
2533 print('git log %s..%s' % (parent, ref_to_push))
2534 print('You can also use `git squash-branch` to squash these into a '
2535 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002536 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002537
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002538 if options.reviewers or options.tbrs or options.add_owners_to:
2539 change_desc.update_reviewers(options.reviewers, options.tbrs,
2540 options.add_owners_to, change)
2541
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002542 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002543 cc = []
2544 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2545 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2546 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002547 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002548 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002549 if options.cc:
2550 cc.extend(options.cc)
2551 cc = filter(None, [email.strip() for email in cc])
2552 if change_desc.get_cced():
2553 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002554 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2555 valid_accounts = set(reviewers + cc)
2556 # TODO(crbug/877717): relax this for all hosts.
2557 else:
2558 valid_accounts = gerrit_util.ValidAccounts(
2559 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002560 logging.info('accounts %s are recognized, %s invalid',
2561 sorted(valid_accounts),
2562 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002563
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002564 # Extra options that can be specified at push time. Doc:
2565 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002566 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002567
Aaron Gable844cf292017-06-28 11:32:59 -07002568 # By default, new changes are started in WIP mode, and subsequent patchsets
2569 # don't send email. At any time, passing --send-mail will mark the change
2570 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002571 if options.send_mail:
2572 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002573 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002574 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002575 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002576 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002577 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002578
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002579 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002580 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002581
Aaron Gable9b713dd2016-12-14 16:04:21 -08002582 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002583 # Punctuation and whitespace in |title| must be percent-encoded.
2584 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002585
agablec6787972016-09-09 16:13:34 -07002586 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002587 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002588
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002589 for r in sorted(reviewers):
2590 if r in valid_accounts:
2591 refspec_opts.append('r=%s' % r)
2592 reviewers.remove(r)
2593 else:
2594 # TODO(tandrii): this should probably be a hard failure.
2595 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2596 % r)
2597 for c in sorted(cc):
2598 # refspec option will be rejected if cc doesn't correspond to an
2599 # account, even though REST call to add such arbitrary cc may succeed.
2600 if c in valid_accounts:
2601 refspec_opts.append('cc=%s' % c)
2602 cc.remove(c)
2603
rmistry9eadede2016-09-19 11:22:43 -07002604 if options.topic:
2605 # Documentation on Gerrit topics is here:
2606 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002607 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002608
Edward Lemur687ca902018-12-05 02:30:30 +00002609 if options.enable_auto_submit:
2610 refspec_opts.append('l=Auto-Submit+1')
2611 if options.use_commit_queue:
2612 refspec_opts.append('l=Commit-Queue+2')
2613 elif options.cq_dry_run:
2614 refspec_opts.append('l=Commit-Queue+1')
2615
2616 if change_desc.get_reviewers(tbr_only=True):
2617 score = gerrit_util.GetCodeReviewTbrScore(
2618 self._GetGerritHost(),
2619 self._GetGerritProject())
2620 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002621
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002622 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002623 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002624 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002625 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002626 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2627
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002628 refspec_suffix = ''
2629 if refspec_opts:
2630 refspec_suffix = '%' + ','.join(refspec_opts)
2631 assert ' ' not in refspec_suffix, (
2632 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2633 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2634
Edward Lemur1b52d872019-05-09 21:12:12 +00002635 git_push_metadata = {
2636 'gerrit_host': self._GetGerritHost(),
2637 'title': title or '<untitled>',
2638 'change_id': change_id,
2639 'description': change_desc.description,
2640 }
2641 push_stdout = self._RunGitPushWithTraces(
2642 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002643
2644 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002645 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002646 change_numbers = [m.group(1)
2647 for m in map(regex.match, push_stdout.splitlines())
2648 if m]
2649 if len(change_numbers) != 1:
2650 DieWithError(
2651 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002652 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002653 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002654 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002655
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002656 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002657 # GetIssue() is not set in case of non-squash uploads according to tests.
2658 # TODO(agable): non-squash uploads in git cl should be removed.
2659 gerrit_util.AddReviewers(
2660 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002661 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002662 reviewers, cc,
2663 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002664
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002665 return 0
2666
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002667 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2668 change_desc):
2669 """Computes parent of the generated commit to be uploaded to Gerrit.
2670
2671 Returns revision or a ref name.
2672 """
2673 if custom_cl_base:
2674 # Try to avoid creating additional unintended CLs when uploading, unless
2675 # user wants to take this risk.
2676 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2677 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2678 local_ref_of_target_remote])
2679 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002680 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002681 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2682 'If you proceed with upload, more than 1 CL may be created by '
2683 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2684 'If you are certain that specified base `%s` has already been '
2685 'uploaded to Gerrit as another CL, you may proceed.\n' %
2686 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2687 if not force:
2688 confirm_or_exit(
2689 'Do you take responsibility for cleaning up potential mess '
2690 'resulting from proceeding with upload?',
2691 action='upload')
2692 return custom_cl_base
2693
Aaron Gablef97e33d2017-03-30 15:44:27 -07002694 if remote != '.':
2695 return self.GetCommonAncestorWithUpstream()
2696
2697 # If our upstream branch is local, we base our squashed commit on its
2698 # squashed version.
2699 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2700
Aaron Gablef97e33d2017-03-30 15:44:27 -07002701 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002702 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002703
2704 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002705 # TODO(tandrii): consider checking parent change in Gerrit and using its
2706 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2707 # the tree hash of the parent branch. The upside is less likely bogus
2708 # requests to reupload parent change just because it's uploadhash is
2709 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002710 parent = RunGit(['config',
2711 'branch.%s.gerritsquashhash' % upstream_branch_name],
2712 error_ok=True).strip()
2713 # Verify that the upstream branch has been uploaded too, otherwise
2714 # Gerrit will create additional CLs when uploading.
2715 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2716 RunGitSilent(['rev-parse', parent + ':'])):
2717 DieWithError(
2718 '\nUpload upstream branch %s first.\n'
2719 'It is likely that this branch has been rebased since its last '
2720 'upload, so you just need to upload it again.\n'
2721 '(If you uploaded it with --no-squash, then branch dependencies '
2722 'are not supported, and you should reupload with --squash.)'
2723 % upstream_branch_name,
2724 change_desc)
2725 return parent
2726
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002727 def _AddChangeIdToCommitMessage(self, options, args):
2728 """Re-commits using the current message, assumes the commit hook is in
2729 place.
2730 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002731 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002732 git_command = ['commit', '--amend', '-m', log_desc]
2733 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002734 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002735 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002736 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002737 return new_log_desc
2738 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002739 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002740
tandriie113dfd2016-10-11 10:20:12 -07002741 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002742 try:
2743 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002744 except GerritChangeNotExists:
2745 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002746
2747 if data['status'] in ('ABANDONED', 'MERGED'):
2748 return 'CL %s is closed' % self.GetIssue()
2749
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002750 def GetGerritChange(self, patchset=None):
2751 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2752 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2753 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002754 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002755 data = self._GetChangeDetail(['ALL_REVISIONS'])
2756
2757 assert host and issue and patchset, 'CL must be uploaded first'
2758
2759 has_patchset = any(
2760 int(revision_data['_number']) == patchset
2761 for revision_data in data['revisions'].itervalues())
2762 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002763 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002764 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002765
tandrii8c5a3532016-11-04 07:52:02 -07002766 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002767 'host': host,
2768 'change': issue,
2769 'project': data['project'],
2770 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002771 }
tandriie113dfd2016-10-11 10:20:12 -07002772
tandriide281ae2016-10-12 06:02:30 -07002773 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002774 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002775
Edward Lemur707d70b2018-02-07 00:50:14 +01002776 def GetReviewers(self):
2777 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002778 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002779
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002780
2781_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002782 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002783}
2784
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002785
iannuccie53c9352016-08-17 14:40:40 -07002786def _add_codereview_issue_select_options(parser, extra=""):
2787 _add_codereview_select_options(parser)
2788
2789 text = ('Operate on this issue number instead of the current branch\'s '
2790 'implicit issue.')
2791 if extra:
2792 text += ' '+extra
2793 parser.add_option('-i', '--issue', type=int, help=text)
2794
2795
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002796def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002797 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002798 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002799 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002800 parser.add_option_group(parser.codereview_group)
2801 parser.codereview_group.add_option(
2802 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002803 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002804
2805
tandriif9aefb72016-07-01 09:06:51 -07002806def _get_bug_line_values(default_project, bugs):
2807 """Given default_project and comma separated list of bugs, yields bug line
2808 values.
2809
2810 Each bug can be either:
2811 * a number, which is combined with default_project
2812 * string, which is left as is.
2813
2814 This function may produce more than one line, because bugdroid expects one
2815 project per line.
2816
2817 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2818 ['v8:123', 'chromium:789']
2819 """
2820 default_bugs = []
2821 others = []
2822 for bug in bugs.split(','):
2823 bug = bug.strip()
2824 if bug:
2825 try:
2826 default_bugs.append(int(bug))
2827 except ValueError:
2828 others.append(bug)
2829
2830 if default_bugs:
2831 default_bugs = ','.join(map(str, default_bugs))
2832 if default_project:
2833 yield '%s:%s' % (default_project, default_bugs)
2834 else:
2835 yield default_bugs
2836 for other in sorted(others):
2837 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2838 yield other
2839
2840
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002841class ChangeDescription(object):
2842 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002843 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002844 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002845 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002846 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002847 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2848 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2849 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2850 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002851
Anthony Polito8b955342019-09-24 19:01:36 +00002852 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002853 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002854 if bug:
2855 regexp = re.compile(self.BUG_LINE)
2856 prefix = settings.GetBugPrefix()
2857 if not any((regexp.match(line) for line in self._description_lines)):
2858 values = list(_get_bug_line_values(prefix, bug))
2859 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002860
agable@chromium.org42c20792013-09-12 17:34:49 +00002861 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002862 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002863 return '\n'.join(self._description_lines)
2864
2865 def set_description(self, desc):
2866 if isinstance(desc, basestring):
2867 lines = desc.splitlines()
2868 else:
2869 lines = [line.rstrip() for line in desc]
2870 while lines and not lines[0]:
2871 lines.pop(0)
2872 while lines and not lines[-1]:
2873 lines.pop(-1)
2874 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002875
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002876 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2877 """Rewrites the R=/TBR= line(s) as a single line each.
2878
2879 Args:
2880 reviewers (list(str)) - list of additional emails to use for reviewers.
2881 tbrs (list(str)) - list of additional emails to use for TBRs.
2882 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2883 the change that are missing OWNER coverage. If this is not None, you
2884 must also pass a value for `change`.
2885 change (Change) - The Change that should be used for OWNERS lookups.
2886 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002887 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002888 assert isinstance(tbrs, list), tbrs
2889
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002890 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002891 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002892
2893 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002894 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002895
2896 reviewers = set(reviewers)
2897 tbrs = set(tbrs)
2898 LOOKUP = {
2899 'TBR': tbrs,
2900 'R': reviewers,
2901 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002902
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002903 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002904 regexp = re.compile(self.R_LINE)
2905 matches = [regexp.match(line) for line in self._description_lines]
2906 new_desc = [l for i, l in enumerate(self._description_lines)
2907 if not matches[i]]
2908 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002909
agable@chromium.org42c20792013-09-12 17:34:49 +00002910 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002911
2912 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002913 for match in matches:
2914 if not match:
2915 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002916 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2917
2918 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002919 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002920 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002921 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002922 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002923 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002924 LOOKUP[add_owners_to].update(
2925 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002926
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002927 # If any folks ended up in both groups, remove them from tbrs.
2928 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002929
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002930 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2931 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002932
2933 # Put the new lines in the description where the old first R= line was.
2934 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2935 if 0 <= line_loc < len(self._description_lines):
2936 if new_tbr_line:
2937 self._description_lines.insert(line_loc, new_tbr_line)
2938 if new_r_line:
2939 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002940 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002941 if new_r_line:
2942 self.append_footer(new_r_line)
2943 if new_tbr_line:
2944 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002945
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002946 def set_preserve_tryjobs(self):
2947 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2948 footers = git_footers.parse_footers(self.description)
2949 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2950 if v.lower() == 'true':
2951 return
2952 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2953
Anthony Polito8b955342019-09-24 19:01:36 +00002954 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002955 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002956 self.set_description([
2957 '# Enter a description of the change.',
2958 '# This will be displayed on the codereview site.',
2959 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002960 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002961 '--------------------',
2962 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002963 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002964 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002965 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002966 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002967
agable@chromium.org42c20792013-09-12 17:34:49 +00002968 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002969 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002970 if not content:
2971 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002972 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002973
Bruce Dawson2377b012018-01-11 16:46:49 -08002974 # Strip off comments and default inserted "Bug:" line.
2975 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002976 (line.startswith('#') or
2977 line.rstrip() == "Bug:" or
2978 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002979 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002980 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002981 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002982
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002983 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002984 """Adds a footer line to the description.
2985
2986 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2987 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2988 that Gerrit footers are always at the end.
2989 """
2990 parsed_footer_line = git_footers.parse_footer(line)
2991 if parsed_footer_line:
2992 # Line is a gerrit footer in the form: Footer-Key: any value.
2993 # Thus, must be appended observing Gerrit footer rules.
2994 self.set_description(
2995 git_footers.add_footer(self.description,
2996 key=parsed_footer_line[0],
2997 value=parsed_footer_line[1]))
2998 return
2999
3000 if not self._description_lines:
3001 self._description_lines.append(line)
3002 return
3003
3004 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3005 if gerrit_footers:
3006 # git_footers.split_footers ensures that there is an empty line before
3007 # actual (gerrit) footers, if any. We have to keep it that way.
3008 assert top_lines and top_lines[-1] == ''
3009 top_lines, separator = top_lines[:-1], top_lines[-1:]
3010 else:
3011 separator = [] # No need for separator if there are no gerrit_footers.
3012
3013 prev_line = top_lines[-1] if top_lines else ''
3014 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3015 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3016 top_lines.append('')
3017 top_lines.append(line)
3018 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003019
tandrii99a72f22016-08-17 14:33:24 -07003020 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003021 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003022 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003023 reviewers = [match.group(2).strip()
3024 for match in matches
3025 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003026 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003027
bradnelsond975b302016-10-23 12:20:23 -07003028 def get_cced(self):
3029 """Retrieves the list of reviewers."""
3030 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3031 cced = [match.group(2).strip() for match in matches if match]
3032 return cleanup_list(cced)
3033
Nodir Turakulov23b82142017-11-16 11:04:25 -08003034 def get_hash_tags(self):
3035 """Extracts and sanitizes a list of Gerrit hashtags."""
3036 subject = (self._description_lines or ('',))[0]
3037 subject = re.sub(
3038 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3039
3040 tags = []
3041 start = 0
3042 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3043 while True:
3044 m = bracket_exp.match(subject, start)
3045 if not m:
3046 break
3047 tags.append(self.sanitize_hash_tag(m.group(1)))
3048 start = m.end()
3049
3050 if not tags:
3051 # Try "Tag: " prefix.
3052 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3053 if m:
3054 tags.append(self.sanitize_hash_tag(m.group(1)))
3055 return tags
3056
3057 @classmethod
3058 def sanitize_hash_tag(cls, tag):
3059 """Returns a sanitized Gerrit hash tag.
3060
3061 A sanitized hashtag can be used as a git push refspec parameter value.
3062 """
3063 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3064
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003065 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3066 """Updates this commit description given the parent.
3067
3068 This is essentially what Gnumbd used to do.
3069 Consult https://goo.gl/WMmpDe for more details.
3070 """
3071 assert parent_msg # No, orphan branch creation isn't supported.
3072 assert parent_hash
3073 assert dest_ref
3074 parent_footer_map = git_footers.parse_footers(parent_msg)
3075 # This will also happily parse svn-position, which GnumbD is no longer
3076 # supporting. While we'd generate correct footers, the verifier plugin
3077 # installed in Gerrit will block such commit (ie git push below will fail).
3078 parent_position = git_footers.get_position(parent_footer_map)
3079
3080 # Cherry-picks may have last line obscuring their prior footers,
3081 # from git_footers perspective. This is also what Gnumbd did.
3082 cp_line = None
3083 if (self._description_lines and
3084 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3085 cp_line = self._description_lines.pop()
3086
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003087 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003088
3089 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3090 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003091 for i, line in enumerate(footer_lines):
3092 k, v = git_footers.parse_footer(line) or (None, None)
3093 if k and k.startswith('Cr-'):
3094 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003095
3096 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003097 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003098 if parent_position[0] == dest_ref:
3099 # Same branch as parent.
3100 number = int(parent_position[1]) + 1
3101 else:
3102 number = 1 # New branch, and extra lineage.
3103 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3104 int(parent_position[1])))
3105
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003106 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3107 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003108
3109 self._description_lines = top_lines
3110 if cp_line:
3111 self._description_lines.append(cp_line)
3112 if self._description_lines[-1] != '':
3113 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003114 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003115
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003116
Aaron Gablea1bab272017-04-11 16:38:18 -07003117def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003118 """Retrieves the reviewers that approved a CL from the issue properties with
3119 messages.
3120
3121 Note that the list may contain reviewers that are not committer, thus are not
3122 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003123
3124 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003125 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003126 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003127 return sorted(
3128 set(
3129 message['sender']
3130 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003131 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003132 )
3133 )
3134
3135
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003136def FindCodereviewSettingsFile(filename='codereview.settings'):
3137 """Finds the given file starting in the cwd and going up.
3138
3139 Only looks up to the top of the repository unless an
3140 'inherit-review-settings-ok' file exists in the root of the repository.
3141 """
3142 inherit_ok_file = 'inherit-review-settings-ok'
3143 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003144 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003145 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3146 root = '/'
3147 while True:
3148 if filename in os.listdir(cwd):
3149 if os.path.isfile(os.path.join(cwd, filename)):
3150 return open(os.path.join(cwd, filename))
3151 if cwd == root:
3152 break
3153 cwd = os.path.dirname(cwd)
3154
3155
3156def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003157 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003158 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003160 def SetProperty(name, setting, unset_error_ok=False):
3161 fullname = 'rietveld.' + name
3162 if setting in keyvals:
3163 RunGit(['config', fullname, keyvals[setting]])
3164 else:
3165 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3166
tandrii48df5812016-10-17 03:55:37 -07003167 if not keyvals.get('GERRIT_HOST', False):
3168 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003169 # Only server setting is required. Other settings can be absent.
3170 # In that case, we ignore errors raised during option deletion attempt.
3171 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3172 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3173 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003174 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003175 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3176 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003177 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3178 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003179
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003180 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003181 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003182
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003183 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003184 RunGit(['config', 'gerrit.squash-uploads',
3185 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003186
tandrii@chromium.org28253532016-04-14 13:46:56 +00003187 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003188 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003189 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3190
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003191 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003192 # should be of the form
3193 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3194 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003195 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3196 keyvals['ORIGIN_URL_CONFIG']])
3197
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003198
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003199def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003200 """Downloads a network object to a local file, like urllib.urlretrieve.
3201
3202 This is necessary because urllib is broken for SSL connections via a proxy.
3203 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003204 with open(destination, 'w') as f:
3205 f.write(urllib2.urlopen(source).read())
3206
3207
ukai@chromium.org712d6102013-11-27 00:52:58 +00003208def hasSheBang(fname):
3209 """Checks fname is a #! script."""
3210 with open(fname) as f:
3211 return f.read(2).startswith('#!')
3212
3213
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003214# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3215def DownloadHooks(*args, **kwargs):
3216 pass
3217
3218
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003219def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003220 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003221
3222 Args:
3223 force: True to update hooks. False to install hooks if not present.
3224 """
3225 if not settings.GetIsGerrit():
3226 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003227 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003228 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3229 if not os.access(dst, os.X_OK):
3230 if os.path.exists(dst):
3231 if not force:
3232 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003233 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003234 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003235 if not hasSheBang(dst):
3236 DieWithError('Not a script: %s\n'
3237 'You need to download from\n%s\n'
3238 'into .git/hooks/commit-msg and '
3239 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003240 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3241 except Exception:
3242 if os.path.exists(dst):
3243 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003244 DieWithError('\nFailed to download hooks.\n'
3245 'You need to download from\n%s\n'
3246 'into .git/hooks/commit-msg and '
3247 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003248
3249
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003250class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003251 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003252
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003253 _GOOGLESOURCE = 'googlesource.com'
3254
3255 def __init__(self):
3256 # Cached list of [host, identity, source], where source is either
3257 # .gitcookies or .netrc.
3258 self._all_hosts = None
3259
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003260 def ensure_configured_gitcookies(self):
3261 """Runs checks and suggests fixes to make git use .gitcookies from default
3262 path."""
3263 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3264 configured_path = RunGitSilent(
3265 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003266 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003267 if configured_path:
3268 self._ensure_default_gitcookies_path(configured_path, default)
3269 else:
3270 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003271
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003272 @staticmethod
3273 def _ensure_default_gitcookies_path(configured_path, default_path):
3274 assert configured_path
3275 if configured_path == default_path:
3276 print('git is already configured to use your .gitcookies from %s' %
3277 configured_path)
3278 return
3279
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003280 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003281 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3282 (configured_path, default_path))
3283
3284 if not os.path.exists(configured_path):
3285 print('However, your configured .gitcookies file is missing.')
3286 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3287 action='reconfigure')
3288 RunGit(['config', '--global', 'http.cookiefile', default_path])
3289 return
3290
3291 if os.path.exists(default_path):
3292 print('WARNING: default .gitcookies file already exists %s' %
3293 default_path)
3294 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3295 default_path)
3296
3297 confirm_or_exit('Move existing .gitcookies to default location?',
3298 action='move')
3299 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003300 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003301 print('Moved and reconfigured git to use .gitcookies from %s' %
3302 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003303
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003304 @staticmethod
3305 def _configure_gitcookies_path(default_path):
3306 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3307 if os.path.exists(netrc_path):
3308 print('You seem to be using outdated .netrc for git credentials: %s' %
3309 netrc_path)
3310 print('This tool will guide you through setting up recommended '
3311 '.gitcookies store for git credentials.\n'
3312 '\n'
3313 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3314 ' git config --global --unset http.cookiefile\n'
3315 ' mv %s %s.backup\n\n' % (default_path, default_path))
3316 confirm_or_exit(action='setup .gitcookies')
3317 RunGit(['config', '--global', 'http.cookiefile', default_path])
3318 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003319
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003320 def get_hosts_with_creds(self, include_netrc=False):
3321 if self._all_hosts is None:
3322 a = gerrit_util.CookiesAuthenticator()
3323 self._all_hosts = [
3324 (h, u, s)
3325 for h, u, s in itertools.chain(
3326 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3327 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3328 )
3329 if h.endswith(self._GOOGLESOURCE)
3330 ]
3331
3332 if include_netrc:
3333 return self._all_hosts
3334 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3335
3336 def print_current_creds(self, include_netrc=False):
3337 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3338 if not hosts:
3339 print('No Git/Gerrit credentials found')
3340 return
3341 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3342 header = [('Host', 'User', 'Which file'),
3343 ['=' * l for l in lengths]]
3344 for row in (header + hosts):
3345 print('\t'.join((('%%+%ds' % l) % s)
3346 for l, s in zip(lengths, row)))
3347
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003348 @staticmethod
3349 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003350 """Parses identity "git-<username>.domain" into <username> and domain."""
3351 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003352 # distinguishable from sub-domains. But we do know typical domains:
3353 if identity.endswith('.chromium.org'):
3354 domain = 'chromium.org'
3355 username = identity[:-len('.chromium.org')]
3356 else:
3357 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003358 if username.startswith('git-'):
3359 username = username[len('git-'):]
3360 return username, domain
3361
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003362 def _canonical_git_googlesource_host(self, host):
3363 """Normalizes Gerrit hosts (with '-review') to Git host."""
3364 assert host.endswith(self._GOOGLESOURCE)
3365 # Prefix doesn't include '.' at the end.
3366 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3367 if prefix.endswith('-review'):
3368 prefix = prefix[:-len('-review')]
3369 return prefix + '.' + self._GOOGLESOURCE
3370
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003371 def _canonical_gerrit_googlesource_host(self, host):
3372 git_host = self._canonical_git_googlesource_host(host)
3373 prefix = git_host.split('.', 1)[0]
3374 return prefix + '-review.' + self._GOOGLESOURCE
3375
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003376 def _get_counterpart_host(self, host):
3377 assert host.endswith(self._GOOGLESOURCE)
3378 git = self._canonical_git_googlesource_host(host)
3379 gerrit = self._canonical_gerrit_googlesource_host(git)
3380 return git if gerrit == host else gerrit
3381
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003382 def has_generic_host(self):
3383 """Returns whether generic .googlesource.com has been configured.
3384
3385 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3386 """
3387 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3388 if host == '.' + self._GOOGLESOURCE:
3389 return True
3390 return False
3391
3392 def _get_git_gerrit_identity_pairs(self):
3393 """Returns map from canonic host to pair of identities (Git, Gerrit).
3394
3395 One of identities might be None, meaning not configured.
3396 """
3397 host_to_identity_pairs = {}
3398 for host, identity, _ in self.get_hosts_with_creds():
3399 canonical = self._canonical_git_googlesource_host(host)
3400 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3401 idx = 0 if canonical == host else 1
3402 pair[idx] = identity
3403 return host_to_identity_pairs
3404
3405 def get_partially_configured_hosts(self):
3406 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003407 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3408 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3409 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003410
3411 def get_conflicting_hosts(self):
3412 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003413 host
3414 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003415 if None not in (i1, i2) and i1 != i2)
3416
3417 def get_duplicated_hosts(self):
3418 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3419 return set(host for host, count in counters.iteritems() if count > 1)
3420
3421 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3422 'chromium.googlesource.com': 'chromium.org',
3423 'chrome-internal.googlesource.com': 'google.com',
3424 }
3425
3426 def get_hosts_with_wrong_identities(self):
3427 """Finds hosts which **likely** reference wrong identities.
3428
3429 Note: skips hosts which have conflicting identities for Git and Gerrit.
3430 """
3431 hosts = set()
3432 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3433 pair = self._get_git_gerrit_identity_pairs().get(host)
3434 if pair and pair[0] == pair[1]:
3435 _, domain = self._parse_identity(pair[0])
3436 if domain != expected:
3437 hosts.add(host)
3438 return hosts
3439
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003440 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003442 hosts = sorted(hosts)
3443 assert hosts
3444 if extra_column_func is None:
3445 extras = [''] * len(hosts)
3446 else:
3447 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003448 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3449 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003450 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003451 lines.append(tmpl % he)
3452 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003453
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003454 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003455 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003456 yield ('.googlesource.com wildcard record detected',
3457 ['Chrome Infrastructure team recommends to list full host names '
3458 'explicitly.'],
3459 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003460
3461 dups = self.get_duplicated_hosts()
3462 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003463 yield ('The following hosts were defined twice',
3464 self._format_hosts(dups),
3465 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003466
3467 partial = self.get_partially_configured_hosts()
3468 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003469 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3470 'These hosts are missing',
3471 self._format_hosts(partial, lambda host: 'but %s defined' %
3472 self._get_counterpart_host(host)),
3473 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003474
3475 conflicting = self.get_conflicting_hosts()
3476 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003477 yield ('The following Git hosts have differing credentials from their '
3478 'Gerrit counterparts',
3479 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3480 tuple(self._get_git_gerrit_identity_pairs()[host])),
3481 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003482
3483 wrong = self.get_hosts_with_wrong_identities()
3484 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003485 yield ('These hosts likely use wrong identity',
3486 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3487 (self._get_git_gerrit_identity_pairs()[host][0],
3488 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3489 wrong)
3490
3491 def find_and_report_problems(self):
3492 """Returns True if there was at least one problem, else False."""
3493 found = False
3494 bad_hosts = set()
3495 for title, sublines, hosts in self._find_problems():
3496 if not found:
3497 found = True
3498 print('\n\n.gitcookies problem report:\n')
3499 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003500 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003501 if sublines:
3502 print()
3503 print(' %s' % '\n '.join(sublines))
3504 print()
3505
3506 if bad_hosts:
3507 assert found
3508 print(' You can manually remove corresponding lines in your %s file and '
3509 'visit the following URLs with correct account to generate '
3510 'correct credential lines:\n' %
3511 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3512 print(' %s' % '\n '.join(sorted(set(
3513 gerrit_util.CookiesAuthenticator().get_new_password_url(
3514 self._canonical_git_googlesource_host(host))
3515 for host in bad_hosts
3516 ))))
3517 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003518
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003519
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003520@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003521def CMDcreds_check(parser, args):
3522 """Checks credentials and suggests changes."""
3523 _, _ = parser.parse_args(args)
3524
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003525 # Code below checks .gitcookies. Abort if using something else.
3526 authn = gerrit_util.Authenticator.get()
3527 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3528 if isinstance(authn, gerrit_util.GceAuthenticator):
3529 DieWithError(
3530 'This command is not designed for GCE, are you on a bot?\n'
3531 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3532 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003533 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003534 'This command is not designed for bot environment. It checks '
3535 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003536
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003537 checker = _GitCookiesChecker()
3538 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003540 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003541 checker.print_current_creds(include_netrc=True)
3542
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003543 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003544 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003545 return 0
3546 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003547
3548
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003549@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003550def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003551 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003552 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3553 branch = ShortBranchName(branchref)
3554 _, args = parser.parse_args(args)
3555 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003556 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003557 return RunGit(['config', 'branch.%s.base-url' % branch],
3558 error_ok=False).strip()
3559 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003560 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003561 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3562 error_ok=False).strip()
3563
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003564
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003565def color_for_status(status):
3566 """Maps a Changelist status to color, for CMDstatus and other tools."""
3567 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003568 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003569 'waiting': Fore.BLUE,
3570 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003571 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003572 'lgtm': Fore.GREEN,
3573 'commit': Fore.MAGENTA,
3574 'closed': Fore.CYAN,
3575 'error': Fore.WHITE,
3576 }.get(status, Fore.WHITE)
3577
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003578
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003579def get_cl_statuses(changes, fine_grained, max_processes=None):
3580 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003581
3582 If fine_grained is true, this will fetch CL statuses from the server.
3583 Otherwise, simply indicate if there's a matching url for the given branches.
3584
3585 If max_processes is specified, it is used as the maximum number of processes
3586 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3587 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003588
3589 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003590 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003591 if not changes:
3592 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003593
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003594 if not fine_grained:
3595 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003596 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003597 for cl in changes:
3598 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003599 return
3600
3601 # First, sort out authentication issues.
3602 logging.debug('ensuring credentials exist')
3603 for cl in changes:
3604 cl.EnsureAuthenticated(force=False, refresh=True)
3605
3606 def fetch(cl):
3607 try:
3608 return (cl, cl.GetStatus())
3609 except:
3610 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003611 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003612 raise
3613
3614 threads_count = len(changes)
3615 if max_processes:
3616 threads_count = max(1, min(threads_count, max_processes))
3617 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3618
3619 pool = ThreadPool(threads_count)
3620 fetched_cls = set()
3621 try:
3622 it = pool.imap_unordered(fetch, changes).__iter__()
3623 while True:
3624 try:
3625 cl, status = it.next(timeout=5)
3626 except multiprocessing.TimeoutError:
3627 break
3628 fetched_cls.add(cl)
3629 yield cl, status
3630 finally:
3631 pool.close()
3632
3633 # Add any branches that failed to fetch.
3634 for cl in set(changes) - fetched_cls:
3635 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003636
rmistry@google.com2dd99862015-06-22 12:22:18 +00003637
3638def upload_branch_deps(cl, args):
3639 """Uploads CLs of local branches that are dependents of the current branch.
3640
3641 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003642
3643 test1 -> test2.1 -> test3.1
3644 -> test3.2
3645 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003646
3647 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3648 run on the dependent branches in this order:
3649 test2.1, test3.1, test3.2, test2.2, test3.3
3650
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003651 Note: This function does not rebase your local dependent branches. Use it
3652 when you make a change to the parent branch that will not conflict
3653 with its dependent branches, and you would like their dependencies
3654 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003655 """
3656 if git_common.is_dirty_git_tree('upload-branch-deps'):
3657 return 1
3658
3659 root_branch = cl.GetBranch()
3660 if root_branch is None:
3661 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3662 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003663 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003664 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3665 'patchset dependencies without an uploaded CL.')
3666
3667 branches = RunGit(['for-each-ref',
3668 '--format=%(refname:short) %(upstream:short)',
3669 'refs/heads'])
3670 if not branches:
3671 print('No local branches found.')
3672 return 0
3673
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003674 # Create a dictionary of all local branches to the branches that are
3675 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003676 tracked_to_dependents = collections.defaultdict(list)
3677 for b in branches.splitlines():
3678 tokens = b.split()
3679 if len(tokens) == 2:
3680 branch_name, tracked = tokens
3681 tracked_to_dependents[tracked].append(branch_name)
3682
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print()
3684 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003685 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003686
rmistry@google.com2dd99862015-06-22 12:22:18 +00003687 def traverse_dependents_preorder(branch, padding=''):
3688 dependents_to_process = tracked_to_dependents.get(branch, [])
3689 padding += ' '
3690 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003691 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003692 dependents.append(dependent)
3693 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003694
rmistry@google.com2dd99862015-06-22 12:22:18 +00003695 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003696 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003697
3698 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003699 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 return 0
3701
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003702 confirm_or_exit('This command will checkout all dependent branches and run '
3703 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003704
rmistry@google.com2dd99862015-06-22 12:22:18 +00003705 # Record all dependents that failed to upload.
3706 failures = {}
3707 # Go through all dependents, checkout the branch and upload.
3708 try:
3709 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003710 print()
3711 print('--------------------------------------')
3712 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003713 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003715 try:
3716 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003717 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003718 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003719 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003720 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003721 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003722 finally:
3723 # Swap back to the original root branch.
3724 RunGit(['checkout', '-q', root_branch])
3725
vapiera7fbd5a2016-06-16 09:17:49 -07003726 print()
3727 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003728 for dependent_branch in dependents:
3729 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003730 print(' %s : %s' % (dependent_branch, upload_status))
3731 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003732
3733 return 0
3734
3735
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003736@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003737def CMDarchive(parser, args):
3738 """Archives and deletes branches associated with closed changelists."""
3739 parser.add_option(
3740 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003741 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003742 parser.add_option(
3743 '-f', '--force', action='store_true',
3744 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003745 parser.add_option(
3746 '-d', '--dry-run', action='store_true',
3747 help='Skip the branch tagging and removal steps.')
3748 parser.add_option(
3749 '-t', '--notags', action='store_true',
3750 help='Do not tag archived branches. '
3751 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003752
kmarshall3bff56b2016-06-06 18:31:47 -07003753 options, args = parser.parse_args(args)
3754 if args:
3755 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003756
3757 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3758 if not branches:
3759 return 0
3760
vapiera7fbd5a2016-06-16 09:17:49 -07003761 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003762 changes = [Changelist(branchref=b)
3763 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003764 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3765 statuses = get_cl_statuses(changes,
3766 fine_grained=True,
3767 max_processes=options.maxjobs)
3768 proposal = [(cl.GetBranch(),
3769 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3770 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003771 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003772 proposal.sort()
3773
3774 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003775 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003776 return 0
3777
3778 current_branch = GetCurrentBranch()
3779
vapiera7fbd5a2016-06-16 09:17:49 -07003780 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003781 if options.notags:
3782 for next_item in proposal:
3783 print(' ' + next_item[0])
3784 else:
3785 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3786 for next_item in proposal:
3787 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003788
kmarshall9249e012016-08-23 12:02:16 -07003789 # Quit now on precondition failure or if instructed by the user, either
3790 # via an interactive prompt or by command line flags.
3791 if options.dry_run:
3792 print('\nNo changes were made (dry run).\n')
3793 return 0
3794 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003795 print('You are currently on a branch \'%s\' which is associated with a '
3796 'closed codereview issue, so archive cannot proceed. Please '
3797 'checkout another branch and run this command again.' %
3798 current_branch)
3799 return 1
kmarshall9249e012016-08-23 12:02:16 -07003800 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003801 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3802 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003803 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003804 return 1
3805
3806 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003807 if not options.notags:
3808 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003809 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003810
vapiera7fbd5a2016-06-16 09:17:49 -07003811 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003812
3813 return 0
3814
3815
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003816@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003817def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003818 """Show status of changelists.
3819
3820 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003821 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003822 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003823 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003824 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003825 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003826 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003827 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003828
3829 Also see 'git cl comments'.
3830 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003831 parser.add_option(
3832 '--no-branch-color',
3833 action='store_true',
3834 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003836 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003837 parser.add_option('-f', '--fast', action='store_true',
3838 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003839 parser.add_option(
3840 '-j', '--maxjobs', action='store', type=int,
3841 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003842
iannuccie53c9352016-08-17 14:40:40 -07003843 _add_codereview_issue_select_options(
3844 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003845 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003846 if args:
3847 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003848
iannuccie53c9352016-08-17 14:40:40 -07003849 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003850 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003851
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003853 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003854 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003855 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856 elif options.field == 'id':
3857 issueid = cl.GetIssue()
3858 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003859 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003861 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003862 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003864 elif options.field == 'status':
3865 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866 elif options.field == 'url':
3867 url = cl.GetIssueURL()
3868 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003869 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003870 return 0
3871
3872 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3873 if not branches:
3874 print('No local branch found.')
3875 return 0
3876
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003877 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003878 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003879 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003881 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003882 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003883 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003884
Daniel McArdlea23bf592019-02-12 00:25:12 +00003885 current_branch = GetCurrentBranch()
3886
3887 def FormatBranchName(branch, colorize=False):
3888 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3889 an asterisk when it is the current branch."""
3890
3891 asterisk = ""
3892 color = Fore.RESET
3893 if branch == current_branch:
3894 asterisk = "* "
3895 color = Fore.GREEN
3896 branch_name = ShortBranchName(branch)
3897
3898 if colorize:
3899 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003900 return asterisk + branch_name
3901
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003902 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003903
3904 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003905 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3906 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003907 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003908 c, status = output.next()
3909 branch_statuses[c.GetBranch()] = status
3910 status = branch_statuses.pop(branch)
3911 url = cl.GetIssueURL()
3912 if url and (not status or status == 'error'):
3913 # The issue probably doesn't exist anymore.
3914 url += ' (broken)'
3915
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003916 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003917 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003918 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003919 color = ''
3920 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003921 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003922
Alan Cuttera3be9a52019-03-04 18:50:33 +00003923 branch_display = FormatBranchName(branch)
3924 padding = ' ' * (alignment - len(branch_display))
3925 if not options.no_branch_color:
3926 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003927
Alan Cuttera3be9a52019-03-04 18:50:33 +00003928 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3929 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003930
vapiera7fbd5a2016-06-16 09:17:49 -07003931 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003932 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003933 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003934 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003935 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003936 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003937 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003938 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003939 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003940 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003941 print('Issue description:')
3942 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003943 return 0
3944
3945
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003946def colorize_CMDstatus_doc():
3947 """To be called once in main() to add colors to git cl status help."""
3948 colors = [i for i in dir(Fore) if i[0].isupper()]
3949
3950 def colorize_line(line):
3951 for color in colors:
3952 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003953 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003954 indent = len(line) - len(line.lstrip(' ')) + 1
3955 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3956 return line
3957
3958 lines = CMDstatus.__doc__.splitlines()
3959 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3960
3961
phajdan.jre328cf92016-08-22 04:12:17 -07003962def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003963 if path == '-':
3964 json.dump(contents, sys.stdout)
3965 else:
3966 with open(path, 'w') as f:
3967 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003968
3969
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003970@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003971@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003972def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003973 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003974
3975 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003976 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003977 parser.add_option('-r', '--reverse', action='store_true',
3978 help='Lookup the branch(es) for the specified issues. If '
3979 'no issues are specified, all branches with mapped '
3980 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003981 parser.add_option('--json',
3982 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003983 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003984 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003985
dnj@chromium.org406c4402015-03-03 17:22:28 +00003986 if options.reverse:
3987 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003988 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003989 # Reverse issue lookup.
3990 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003991
3992 git_config = {}
3993 for config in RunGit(['config', '--get-regexp',
3994 r'branch\..*issue']).splitlines():
3995 name, _space, val = config.partition(' ')
3996 git_config[name] = val
3997
dnj@chromium.org406c4402015-03-03 17:22:28 +00003998 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003999 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4000 config_key = _git_branch_config_key(ShortBranchName(branch),
4001 cls.IssueConfigKey())
4002 issue = git_config.get(config_key)
4003 if issue:
4004 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004005 if not args:
4006 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004007 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004008 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004009 try:
4010 issue_num = int(issue)
4011 except ValueError:
4012 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004013 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004014 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004015 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004016 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004017 if options.json:
4018 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004019 return 0
4020
4021 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004022 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004023 if not issue.valid:
4024 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4025 'or no argument to list it.\n'
4026 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004027 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004028 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004029 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004030 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004031 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4032 if options.json:
4033 write_json(options.json, {
4034 'issue': cl.GetIssue(),
4035 'issue_url': cl.GetIssueURL(),
4036 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004037 return 0
4038
4039
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004040@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004041def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004042 """Shows or posts review comments for any changelist."""
4043 parser.add_option('-a', '--add-comment', dest='comment',
4044 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004045 parser.add_option('-p', '--publish', action='store_true',
4046 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004047 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004048 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004049 parser.add_option('-m', '--machine-readable', dest='readable',
4050 action='store_false', default=True,
4051 help='output comments in a format compatible with '
4052 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004053 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004054 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004055 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004056 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004057
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004058 issue = None
4059 if options.issue:
4060 try:
4061 issue = int(options.issue)
4062 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004063 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004064
Edward Lemur934836a2019-09-09 20:16:54 +00004065 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004066
4067 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004068 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004069 return 0
4070
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004071 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4072 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004073 for comment in summary:
4074 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004075 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004076 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004077 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004078 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004079 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004080 elif comment.autogenerated:
4081 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004082 else:
4083 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004084 print('\n%s%s %s%s\n%s' % (
4085 color,
4086 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4087 comment.sender,
4088 Fore.RESET,
4089 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4090
smut@google.comc85ac942015-09-15 16:34:43 +00004091 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004092 def pre_serialize(c):
4093 dct = c.__dict__.copy()
4094 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4095 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004096 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004097 return 0
4098
4099
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004100@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004101@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004102def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004103 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004104 parser.add_option('-d', '--display', action='store_true',
4105 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004106 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004107 help='New description to set for this issue (- for stdin, '
4108 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004109 parser.add_option('-f', '--force', action='store_true',
4110 help='Delete any unpublished Gerrit edits for this issue '
4111 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004112
4113 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004114 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004115
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004116 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004117 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004118 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004119 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004120 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004121
Edward Lemur934836a2019-09-09 20:16:54 +00004122 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004123 if target_issue_arg:
4124 kwargs['issue'] = target_issue_arg.issue
4125 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004126
4127 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004128 if not cl.GetIssue():
4129 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004130
Edward Lemur678a6842019-10-03 22:25:05 +00004131 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004132 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004133
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004134 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004135
smut@google.com34fb6b12015-07-13 20:03:26 +00004136 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004137 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004138 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004139
4140 if options.new_description:
4141 text = options.new_description
4142 if text == '-':
4143 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004144 elif text == '+':
4145 base_branch = cl.GetCommonAncestorWithUpstream()
4146 change = cl.GetChange(base_branch, None, local_description=True)
4147 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004148
4149 description.set_description(text)
4150 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004151 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004152 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004153 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004154 return 0
4155
4156
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004157@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004158def CMDlint(parser, args):
4159 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004160 parser.add_option('--filter', action='append', metavar='-x,+y',
4161 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004162 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004163
4164 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004165 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004166 try:
4167 import cpplint
4168 import cpplint_chromium
4169 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004170 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004171 return 1
4172
4173 # Change the current working directory before calling lint so that it
4174 # shows the correct base.
4175 previous_cwd = os.getcwd()
4176 os.chdir(settings.GetRoot())
4177 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004178 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004179 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4180 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004181 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004183 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004184
4185 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004186 command = args + files
4187 if options.filter:
4188 command = ['--filter=' + ','.join(options.filter)] + command
4189 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190
4191 white_regex = re.compile(settings.GetLintRegex())
4192 black_regex = re.compile(settings.GetLintIgnoreRegex())
4193 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4194 for filename in filenames:
4195 if white_regex.match(filename):
4196 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004197 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004198 else:
4199 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4200 extra_check_functions)
4201 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004202 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004203 finally:
4204 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004206 if cpplint._cpplint_state.error_count != 0:
4207 return 1
4208 return 0
4209
4210
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004211@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004213 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004214 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004215 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004216 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004217 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004218 parser.add_option('--all', action='store_true',
4219 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004220 parser.add_option('--parallel', action='store_true',
4221 help='Run all tests specified by input_api.RunTests in all '
4222 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004223 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004224
sbc@chromium.org71437c02015-04-09 19:29:40 +00004225 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004226 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004227 return 1
4228
Edward Lemur934836a2019-09-09 20:16:54 +00004229 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004230 if args:
4231 base_branch = args[0]
4232 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004233 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004234 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
Aaron Gable8076c282017-11-29 14:39:41 -08004236 if options.all:
4237 base_change = cl.GetChange(base_branch, None)
4238 files = [('M', f) for f in base_change.AllFiles()]
4239 change = presubmit_support.GitChange(
4240 base_change.Name(),
4241 base_change.FullDescriptionText(),
4242 base_change.RepositoryRoot(),
4243 files,
4244 base_change.issue,
4245 base_change.patchset,
4246 base_change.author_email,
4247 base_change._upstream)
4248 else:
4249 change = cl.GetChange(base_branch, None)
4250
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004251 cl.RunHook(
4252 committing=not options.upload,
4253 may_prompt=False,
4254 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004255 change=change,
4256 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004257 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004258
4259
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004260def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004261 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004262
4263 Works the same way as
4264 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4265 but can be called on demand on all platforms.
4266
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004267 The basic idea is to generate git hash of a state of the tree, original
4268 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004269 """
4270 lines = []
4271 tree_hash = RunGitSilent(['write-tree'])
4272 lines.append('tree %s' % tree_hash.strip())
4273 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4274 if code == 0:
4275 lines.append('parent %s' % parent.strip())
4276 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4277 lines.append('author %s' % author.strip())
4278 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4279 lines.append('committer %s' % committer.strip())
4280 lines.append('')
4281 # Note: Gerrit's commit-hook actually cleans message of some lines and
4282 # whitespace. This code is not doing this, but it clearly won't decrease
4283 # entropy.
4284 lines.append(message)
4285 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004286 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004287 return 'I%s' % change_hash.strip()
4288
4289
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004290def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004291 """Computes the remote branch ref to use for the CL.
4292
4293 Args:
4294 remote (str): The git remote for the CL.
4295 remote_branch (str): The git remote branch for the CL.
4296 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004297 """
4298 if not (remote and remote_branch):
4299 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004300
wittman@chromium.org455dc922015-01-26 20:15:50 +00004301 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004302 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004303 # refs, which are then translated into the remote full symbolic refs
4304 # below.
4305 if '/' not in target_branch:
4306 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4307 else:
4308 prefix_replacements = (
4309 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4310 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4311 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4312 )
4313 match = None
4314 for regex, replacement in prefix_replacements:
4315 match = re.search(regex, target_branch)
4316 if match:
4317 remote_branch = target_branch.replace(match.group(0), replacement)
4318 break
4319 if not match:
4320 # This is a branch path but not one we recognize; use as-is.
4321 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004322 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4323 # Handle the refs that need to land in different refs.
4324 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004325
wittman@chromium.org455dc922015-01-26 20:15:50 +00004326 # Create the true path to the remote branch.
4327 # Does the following translation:
4328 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4329 # * refs/remotes/origin/master -> refs/heads/master
4330 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4331 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4332 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4333 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4334 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4335 'refs/heads/')
4336 elif remote_branch.startswith('refs/remotes/branch-heads'):
4337 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004338
wittman@chromium.org455dc922015-01-26 20:15:50 +00004339 return remote_branch
4340
4341
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004342def cleanup_list(l):
4343 """Fixes a list so that comma separated items are put as individual items.
4344
4345 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4346 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4347 """
4348 items = sum((i.split(',') for i in l), [])
4349 stripped_items = (i.strip() for i in items)
4350 return sorted(filter(None, stripped_items))
4351
4352
Aaron Gable4db38df2017-11-03 14:59:07 -07004353@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004354@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004355def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004356 """Uploads the current changelist to codereview.
4357
4358 Can skip dependency patchset uploads for a branch by running:
4359 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004360 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004361 git config --unset branch.branch_name.skip-deps-uploads
4362 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004363
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004364 If the name of the checked out branch starts with "bug-" or "fix-" followed
4365 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004366 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004367
4368 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004369 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004370 [git-cl] add support for hashtags
4371 Foo bar: implement foo
4372 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004373 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004374 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4375 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004376 parser.add_option('--bypass-watchlists', action='store_true',
4377 dest='bypass_watchlists',
4378 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004379 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004380 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004381 parser.add_option('--message', '-m', dest='message',
4382 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004383 parser.add_option('-b', '--bug',
4384 help='pre-populate the bug number(s) for this issue. '
4385 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004386 parser.add_option('--message-file', dest='message_file',
4387 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004388 parser.add_option('--title', '-t', dest='title',
4389 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004390 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004391 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004392 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004393 parser.add_option('--tbrs',
4394 action='append', default=[],
4395 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004396 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004397 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004398 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004399 parser.add_option('--hashtag', dest='hashtags',
4400 action='append', default=[],
4401 help=('Gerrit hashtag for new CL; '
4402 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004403 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004404 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004405 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004406 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004407 metavar='TARGET',
4408 help='Apply CL to remote ref TARGET. ' +
4409 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004410 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004411 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004412 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004413 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004414 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004415 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004416 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4417 const='TBR', help='add a set of OWNERS to TBR')
4418 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4419 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004420 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004421 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004422 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004423 'implies --send-mail')
4424 parser.add_option('-d', '--cq-dry-run',
4425 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004426 help='Send the patchset to do a CQ dry run right after '
4427 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004428 parser.add_option('--preserve-tryjobs', action='store_true',
4429 help='instruct the CQ to let tryjobs running even after '
4430 'new patchsets are uploaded instead of canceling '
4431 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004432 parser.add_option('--dependencies', action='store_true',
4433 help='Uploads CLs of all the local branches that depend on '
4434 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004435 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4436 help='Sends your change to the CQ after an approval. Only '
4437 'works on repos that have the Auto-Submit label '
4438 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004439 parser.add_option('--parallel', action='store_true',
4440 help='Run all tests specified by input_api.RunTests in all '
4441 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004442 parser.add_option('--no-autocc', action='store_true',
4443 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004444 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004445 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004446 parser.add_option('-R', '--retry-failed', action='store_true',
4447 help='Retry failed tryjobs from old patchset immediately '
4448 'after uploading new patchset. Cannot be used with '
4449 '--use-commit-queue or --cq-dry-run.')
4450 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4451 help='Host of buildbucket. The default host is %default.')
4452 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004453
rmistry@google.com2dd99862015-06-22 12:22:18 +00004454 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004455 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004456 (options, args) = parser.parse_args(args)
4457
sbc@chromium.org71437c02015-04-09 19:29:40 +00004458 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004459 return 1
4460
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004461 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004462 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004463 options.cc = cleanup_list(options.cc)
4464
tandriib80458a2016-06-23 12:20:07 -07004465 if options.message_file:
4466 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004467 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004468 options.message = gclient_utils.FileRead(options.message_file)
4469 options.message_file = None
4470
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004471 if ([options.cq_dry_run,
4472 options.use_commit_queue,
4473 options.retry_failed].count(True) > 1):
4474 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4475 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004476
Aaron Gableedbc4132017-09-11 13:22:28 -07004477 if options.use_commit_queue:
4478 options.send_mail = True
4479
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004480 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4481 settings.GetIsGerrit()
4482
Edward Lemur934836a2019-09-09 20:16:54 +00004483 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004484 if options.retry_failed and not cl.GetIssue():
4485 print('No previous patchsets, so --retry-failed has no effect.')
4486 options.retry_failed = False
4487 # cl.GetMostRecentPatchset uses cached information, and can return the last
4488 # patchset before upload. Calling it here makes it clear that it's the
4489 # last patchset before upload. Note that GetMostRecentPatchset will fail
4490 # if no CL has been uploaded yet.
4491 if options.retry_failed:
4492 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004493
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004494 ret = cl.CMDUpload(options, args, orig_args)
4495
4496 if options.retry_failed:
4497 if ret != 0:
4498 print('Upload failed, so --retry-failed has no effect.')
4499 return ret
4500 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004501 builds, _ = _fetch_latest_builds(
4502 auth_config, cl, options.buildbucket_host,
4503 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004504 buckets = _filter_failed(builds)
4505 if len(buckets) == 0:
4506 print('No failed tryjobs, so --retry-failed has no effect.')
4507 return ret
4508 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4509
4510 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004511
4512
Francois Dorayd42c6812017-05-30 15:10:20 -04004513@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004514@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004515def CMDsplit(parser, args):
4516 """Splits a branch into smaller branches and uploads CLs.
4517
4518 Creates a branch and uploads a CL for each group of files modified in the
4519 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004520 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004521 the shared OWNERS file.
4522 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004523 parser.add_option('-d', '--description', dest='description_file',
4524 help='A text file containing a CL description in which '
4525 '$directory will be replaced by each CL\'s directory.')
4526 parser.add_option('-c', '--comment', dest='comment_file',
4527 help='A text file containing a CL comment.')
4528 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004529 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004530 help='List the files and reviewers for each CL that would '
4531 'be created, but don\'t create branches or CLs.')
4532 parser.add_option('--cq-dry-run', action='store_true',
4533 help='If set, will do a cq dry run for each uploaded CL. '
4534 'Please be careful when doing this; more than ~10 CLs '
4535 'has the potential to overload our build '
4536 'infrastructure. Try to upload these not during high '
4537 'load times (usually 11-3 Mountain View time). Email '
4538 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004539 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4540 default=True,
4541 help='Sends your change to the CQ after an approval. Only '
4542 'works on repos that have the Auto-Submit label '
4543 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004544 options, _ = parser.parse_args(args)
4545
4546 if not options.description_file:
4547 parser.error('No --description flag specified.')
4548
4549 def WrappedCMDupload(args):
4550 return CMDupload(OptionParser(), args)
4551
4552 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004553 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004554 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004555
4556
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004557@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004558@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004560 """DEPRECATED: Used to commit the current changelist via git-svn."""
4561 message = ('git-cl no longer supports committing to SVN repositories via '
4562 'git-svn. You probably want to use `git cl land` instead.')
4563 print(message)
4564 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565
4566
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004567@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004568@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004569def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004570 """Commits the current changelist via git.
4571
4572 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4573 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004574 """
4575 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4576 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004577 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004578 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004579 parser.add_option('--parallel', action='store_true',
4580 help='Run all tests specified by input_api.RunTests in all '
4581 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004582 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004583
Edward Lemur934836a2019-09-09 20:16:54 +00004584 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004585
Robert Iannucci2e73d432018-03-14 01:10:47 -07004586 if not cl.GetIssue():
4587 DieWithError('You must upload the change first to Gerrit.\n'
4588 ' If you would rather have `git cl land` upload '
4589 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004590 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004591 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004592
4593
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004594@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004595@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004596def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004597 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598 parser.add_option('-b', dest='newbranch',
4599 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004600 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004601 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004603 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004604
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004605 group = optparse.OptionGroup(
4606 parser,
4607 'Options for continuing work on the current issue uploaded from a '
4608 'different clone (e.g. different machine). Must be used independently '
4609 'from the other options. No issue number should be specified, and the '
4610 'branch must have an issue number associated with it')
4611 group.add_option('--reapply', action='store_true', dest='reapply',
4612 help='Reset the branch and reapply the issue.\n'
4613 'CAUTION: This will undo any local changes in this '
4614 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004615
4616 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004617 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004618 parser.add_option_group(group)
4619
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004620 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004621 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004622
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004623 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004624 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004625 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004626 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004627 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004628
Edward Lemur934836a2019-09-09 20:16:54 +00004629 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004630 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004631 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004632
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004633 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004634 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004635 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004636
4637 RunGit(['reset', '--hard', upstream])
4638 if options.pull:
4639 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004640
Edward Lemur678a6842019-10-03 22:25:05 +00004641 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4642 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004643
4644 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004645 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004646
Edward Lemurf38bc172019-09-03 21:02:13 +00004647 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004648 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004649 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004650
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004651 # We don't want uncommitted changes mixed up with the patch.
4652 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004653 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004654
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004655 if options.newbranch:
4656 if options.force:
4657 RunGit(['branch', '-D', options.newbranch],
4658 stderr=subprocess2.PIPE, error_ok=True)
4659 RunGit(['new-branch', options.newbranch])
4660
Edward Lemur678a6842019-10-03 22:25:05 +00004661 cl = Changelist(
4662 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004663
Edward Lemur678a6842019-10-03 22:25:05 +00004664 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004665 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004666
Edward Lemurf38bc172019-09-03 21:02:13 +00004667 return cl.CMDPatchWithParsedIssue(
4668 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004669
4670
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004671def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004672 """Fetches the tree status and returns either 'open', 'closed',
4673 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004674 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004675 if url:
4676 status = urllib2.urlopen(url).read().lower()
4677 if status.find('closed') != -1 or status == '0':
4678 return 'closed'
4679 elif status.find('open') != -1 or status == '1':
4680 return 'open'
4681 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004682 return 'unset'
4683
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004684
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004685def GetTreeStatusReason():
4686 """Fetches the tree status from a json url and returns the message
4687 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004688 url = settings.GetTreeStatusUrl()
4689 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004690 connection = urllib2.urlopen(json_url)
4691 status = json.loads(connection.read())
4692 connection.close()
4693 return status['message']
4694
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004695
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004696@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004697def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004698 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004699 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004700 status = GetTreeStatus()
4701 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004702 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004703 return 2
4704
vapiera7fbd5a2016-06-16 09:17:49 -07004705 print('The tree is %s' % status)
4706 print()
4707 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004708 if status != 'open':
4709 return 1
4710 return 0
4711
4712
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004713@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004714def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004715 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4716 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004717 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004718 '-b', '--bot', action='append',
4719 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4720 'times to specify multiple builders. ex: '
4721 '"-b win_rel -b win_layout". See '
4722 'the try server waterfall for the builders name and the tests '
4723 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004724 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004725 '-B', '--bucket', default='',
4726 help=('Buildbucket bucket to send the try requests.'))
4727 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004728 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004729 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004730 'be determined by the try recipe that builder runs, which usually '
4731 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004732 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004733 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004734 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004735 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004736 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004737 '--category', default='git_cl_try', help='Specify custom build category.')
4738 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004739 '--project',
4740 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004741 'in recipe to determine to which repository or directory to '
4742 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004743 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004744 '-p', '--property', dest='properties', action='append', default=[],
4745 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004746 'key2=value2 etc. The value will be treated as '
4747 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004748 'NOTE: using this may make your tryjob not usable for CQ, '
4749 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004750 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004751 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4752 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004753 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004754 parser.add_option(
4755 '-R', '--retry-failed', action='store_true', default=False,
4756 help='Retry failed jobs from the latest set of tryjobs. '
4757 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004758 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004759 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004760 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004761 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004762
machenbach@chromium.org45453142015-09-15 08:45:22 +00004763 # Make sure that all properties are prop=value pairs.
4764 bad_params = [x for x in options.properties if '=' not in x]
4765 if bad_params:
4766 parser.error('Got properties with missing "=": %s' % bad_params)
4767
maruel@chromium.org15192402012-09-06 12:38:29 +00004768 if args:
4769 parser.error('Unknown arguments: %s' % args)
4770
Edward Lemur934836a2019-09-09 20:16:54 +00004771 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004772 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004773 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004774
Edward Lemurf38bc172019-09-03 21:02:13 +00004775 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004776 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004777
tandriie113dfd2016-10-11 10:20:12 -07004778 error_message = cl.CannotTriggerTryJobReason()
4779 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004780 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004781
Quinten Yearsley983111f2019-09-26 17:18:48 +00004782 if options.retry_failed:
4783 if options.bot or options.bucket:
4784 print('ERROR: The option --retry-failed is not compatible with '
4785 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4786 return 1
4787 print('Searching for failed tryjobs...')
4788 builds, patchset = _fetch_latest_builds(
4789 auth_config, cl, options.buildbucket_host)
4790 if options.verbose:
4791 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4792 buckets = _filter_failed(builds)
4793 if not buckets:
4794 print('There are no failed jobs in the latest set of jobs '
4795 '(patchset #%d), doing nothing.' % patchset)
4796 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004797 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004798 if num_builders > 10:
4799 confirm_or_exit('There are %d builders with failed builds.'
4800 % num_builders, action='continue')
4801 else:
4802 buckets = _get_bucket_map(cl, options, parser)
4803 if buckets and any(b.startswith('master.') for b in buckets):
4804 print('ERROR: Buildbot masters are not supported.')
4805 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004806
qyearsleydd49f942016-10-28 11:57:22 -07004807 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4808 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004809 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004810 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004811 print('git cl try with no bots now defaults to CQ dry run.')
4812 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4813 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004814
borenet6c0efe62016-10-19 08:13:29 -07004815 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004816 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004817 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004818 'of bot requires an initial job from a parent (usually a builder). '
4819 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004820 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004821 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004822
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004823 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004824 try:
4825 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4826 except BuildbucketResponseException as ex:
4827 print('ERROR: %s' % ex)
4828 return 1
4829 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004830
4831
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004832@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004833def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004834 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004835 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004836 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004837 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004838 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004839 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004840 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004841 '--color', action='store_true', default=setup_color.IS_TTY,
4842 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004843 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004844 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4845 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004846 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004847 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004848 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004849 parser.add_option_group(group)
4850 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004851 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004852 options, args = parser.parse_args(args)
4853 if args:
4854 parser.error('Unrecognized args: %s' % ' '.join(args))
4855
4856 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004857 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004858 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004859 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004860
tandrii221ab252016-10-06 08:12:04 -07004861 patchset = options.patchset
4862 if not patchset:
4863 patchset = cl.GetMostRecentPatchset()
4864 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004865 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004866 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004867 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004868 cl.GetIssue())
4869
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004870 try:
tandrii221ab252016-10-06 08:12:04 -07004871 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004872 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004873 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004874 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004875 if options.json:
4876 write_try_results_json(options.json, jobs)
4877 else:
4878 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004879 return 0
4880
4881
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004882@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004883@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004884def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004885 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004886 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004887 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004888 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004889
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004890 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004891 if args:
4892 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004893 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004894 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004895 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004896 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004897
4898 # Clear configured merge-base, if there is one.
4899 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004900 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004901 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004902 return 0
4903
4904
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004905@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004906def CMDweb(parser, args):
4907 """Opens the current CL in the web browser."""
4908 _, args = parser.parse_args(args)
4909 if args:
4910 parser.error('Unrecognized args: %s' % ' '.join(args))
4911
4912 issue_url = Changelist().GetIssueURL()
4913 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004914 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004915 return 1
4916
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004917 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004918 # allows us to hide the "Created new window in existing browser session."
4919 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004920 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004921 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004922 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004923 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004924 os.open(os.devnull, os.O_RDWR)
4925 try:
4926 webbrowser.open(issue_url)
4927 finally:
4928 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004929 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004930 return 0
4931
4932
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004933@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004934def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004935 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004936 parser.add_option('-d', '--dry-run', action='store_true',
4937 help='trigger in dry run mode')
4938 parser.add_option('-c', '--clear', action='store_true',
4939 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004940 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004941 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004942 if args:
4943 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004944 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004945 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004946
Edward Lemur934836a2019-09-09 20:16:54 +00004947 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004948 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004949 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004950 elif options.dry_run:
4951 state = _CQState.DRY_RUN
4952 else:
4953 state = _CQState.COMMIT
4954 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004955 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004956 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004957 return 0
4958
4959
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004960@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004961def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004962 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004963 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004964 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004965 if args:
4966 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004967 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004968 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004969 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004970 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004971 cl.CloseIssue()
4972 return 0
4973
4974
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004975@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004976def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004977 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004978 parser.add_option(
4979 '--stat',
4980 action='store_true',
4981 dest='stat',
4982 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004983 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004984 if args:
4985 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004986
Edward Lemur934836a2019-09-09 20:16:54 +00004987 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004988 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004989 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004990 if not issue:
4991 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004992
Aaron Gablea718c3e2017-08-28 17:47:28 -07004993 base = cl._GitGetBranchConfigValue('last-upload-hash')
4994 if not base:
4995 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4996 if not base:
4997 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4998 revision_info = detail['revisions'][detail['current_revision']]
4999 fetch_info = revision_info['fetch']['http']
5000 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5001 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005002
Aaron Gablea718c3e2017-08-28 17:47:28 -07005003 cmd = ['git', 'diff']
5004 if options.stat:
5005 cmd.append('--stat')
5006 cmd.append(base)
5007 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005008
5009 return 0
5010
5011
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005012@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005013def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005014 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005015 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005016 '--ignore-current',
5017 action='store_true',
5018 help='Ignore the CL\'s current reviewers and start from scratch.')
5019 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005020 '--ignore-self',
5021 action='store_true',
5022 help='Do not consider CL\'s author as an owners.')
5023 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005024 '--no-color',
5025 action='store_true',
5026 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005027 parser.add_option(
5028 '--batch',
5029 action='store_true',
5030 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005031 # TODO: Consider moving this to another command, since other
5032 # git-cl owners commands deal with owners for a given CL.
5033 parser.add_option(
5034 '--show-all',
5035 action='store_true',
5036 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005037 options, args = parser.parse_args(args)
5038
5039 author = RunGit(['config', 'user.email']).strip() or None
5040
Edward Lemur934836a2019-09-09 20:16:54 +00005041 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005042
Yang Guo6e269a02019-06-26 11:17:02 +00005043 if options.show_all:
5044 for arg in args:
5045 base_branch = cl.GetCommonAncestorWithUpstream()
5046 change = cl.GetChange(base_branch, None)
5047 database = owners.Database(change.RepositoryRoot(), file, os.path)
5048 database.load_data_needed_for([arg])
5049 print('Owners for %s:' % arg)
5050 for owner in sorted(database.all_possible_owners([arg], None)):
5051 print(' - %s' % owner)
5052 return 0
5053
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005054 if args:
5055 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005056 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005057 base_branch = args[0]
5058 else:
5059 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005060 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005061
5062 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005063 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5064
5065 if options.batch:
5066 db = owners.Database(change.RepositoryRoot(), file, os.path)
5067 print('\n'.join(db.reviewers_for(affected_files, author)))
5068 return 0
5069
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005070 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005071 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005072 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005073 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005074 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005075 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005076 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005077 override_files=change.OriginalOwnersFiles(),
5078 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005079
5080
Aiden Bennerc08566e2018-10-03 17:52:42 +00005081def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005082 """Generates a diff command."""
5083 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005084 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5085
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005086 if allow_prefix:
5087 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5088 # case that diff.noprefix is set in the user's git config.
5089 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5090 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005091 diff_cmd += ['--no-prefix']
5092
5093 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005094
5095 if args:
5096 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005097 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005098 diff_cmd.append(arg)
5099 else:
5100 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005101
5102 return diff_cmd
5103
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005104
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005105def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005106 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005107 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005108
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005109
enne@chromium.org555cfe42014-01-29 18:21:39 +00005110@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005111@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005112def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005113 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005114 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005115 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005116 parser.add_option('--full', action='store_true',
5117 help='Reformat the full content of all touched files')
5118 parser.add_option('--dry-run', action='store_true',
5119 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005120 parser.add_option(
5121 '--python',
5122 action='store_true',
5123 default=None,
5124 help='Enables python formatting on all python files.')
5125 parser.add_option(
5126 '--no-python',
5127 action='store_true',
5128 dest='python',
5129 help='Disables python formatting on all python files. '
5130 'Takes precedence over --python. '
5131 'If neither --python or --no-python are set, python '
5132 'files that have a .style.yapf file in an ancestor '
5133 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005134 parser.add_option('--js', action='store_true',
5135 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005136 parser.add_option('--diff', action='store_true',
5137 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005138 parser.add_option('--presubmit', action='store_true',
5139 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005140 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005141
Daniel Chengc55eecf2016-12-30 03:11:02 -08005142 # Normalize any remaining args against the current path, so paths relative to
5143 # the current directory are still resolved as expected.
5144 args = [os.path.join(os.getcwd(), arg) for arg in args]
5145
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005146 # git diff generates paths against the root of the repository. Change
5147 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005148 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005149 if rel_base_path:
5150 os.chdir(rel_base_path)
5151
digit@chromium.org29e47272013-05-17 17:01:46 +00005152 # Grab the merge-base commit, i.e. the upstream commit of the current
5153 # branch when it was created or the last time it was rebased. This is
5154 # to cover the case where the user may have called "git fetch origin",
5155 # moving the origin branch to a newer commit, but hasn't rebased yet.
5156 upstream_commit = None
5157 cl = Changelist()
5158 upstream_branch = cl.GetUpstreamBranch()
5159 if upstream_branch:
5160 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5161 upstream_commit = upstream_commit.strip()
5162
5163 if not upstream_commit:
5164 DieWithError('Could not find base commit for this branch. '
5165 'Are you in detached state?')
5166
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005167 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5168 diff_output = RunGit(changed_files_cmd)
5169 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005170 # Filter out files deleted by this CL
5171 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005172
Christopher Lamc5ba6922017-01-24 11:19:14 +11005173 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005174 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005175
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005176 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5177 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5178 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005179 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005180
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005181 top_dir = os.path.normpath(
5182 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5183
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005184 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5185 # formatted. This is used to block during the presubmit.
5186 return_value = 0
5187
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005188 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005189 # Locate the clang-format binary in the checkout
5190 try:
5191 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005192 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005193 DieWithError(e)
5194
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005195 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005196 cmd = [clang_format_tool]
5197 if not opts.dry_run and not opts.diff:
5198 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005199 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005200 if opts.diff:
5201 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005202 else:
5203 env = os.environ.copy()
5204 env['PATH'] = str(os.path.dirname(clang_format_tool))
5205 try:
5206 script = clang_format.FindClangFormatScriptInChromiumTree(
5207 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005208 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005209 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005210
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005211 cmd = [sys.executable, script, '-p0']
5212 if not opts.dry_run and not opts.diff:
5213 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005214
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005215 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5216 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005217
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005218 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5219 if opts.diff:
5220 sys.stdout.write(stdout)
5221 if opts.dry_run and len(stdout) > 0:
5222 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005223
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005224 # Similar code to above, but using yapf on .py files rather than clang-format
5225 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005226 py_explicitly_disabled = opts.python is not None and not opts.python
5227 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005228 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5229 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5230 if sys.platform.startswith('win'):
5231 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005232
Aiden Bennerc08566e2018-10-03 17:52:42 +00005233 # If we couldn't find a yapf file we'll default to the chromium style
5234 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005235 chromium_default_yapf_style = os.path.join(depot_tools_path,
5236 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005237 # Used for caching.
5238 yapf_configs = {}
5239 for f in python_diff_files:
5240 # Find the yapf style config for the current file, defaults to depot
5241 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005242 _FindYapfConfigFile(f, yapf_configs, top_dir)
5243
5244 # Turn on python formatting by default if a yapf config is specified.
5245 # This breaks in the case of this repo though since the specified
5246 # style file is also the global default.
5247 if opts.python is None:
5248 filtered_py_files = []
5249 for f in python_diff_files:
5250 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5251 filtered_py_files.append(f)
5252 else:
5253 filtered_py_files = python_diff_files
5254
5255 # Note: yapf still seems to fix indentation of the entire file
5256 # even if line ranges are specified.
5257 # See https://github.com/google/yapf/issues/499
5258 if not opts.full and filtered_py_files:
5259 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5260
5261 for f in filtered_py_files:
5262 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5263 if yapf_config is None:
5264 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005265
5266 cmd = [yapf_tool, '--style', yapf_config, f]
5267
5268 has_formattable_lines = False
5269 if not opts.full:
5270 # Only run yapf over changed line ranges.
5271 for diff_start, diff_len in py_line_diffs[f]:
5272 diff_end = diff_start + diff_len - 1
5273 # Yapf errors out if diff_end < diff_start but this
5274 # is a valid line range diff for a removal.
5275 if diff_end >= diff_start:
5276 has_formattable_lines = True
5277 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5278 # If all line diffs were removals we have nothing to format.
5279 if not has_formattable_lines:
5280 continue
5281
5282 if opts.diff or opts.dry_run:
5283 cmd += ['--diff']
5284 # Will return non-zero exit code if non-empty diff.
5285 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5286 if opts.diff:
5287 sys.stdout.write(stdout)
5288 elif len(stdout) > 0:
5289 return_value = 2
5290 else:
5291 cmd += ['-i']
5292 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005293
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005294 # Dart's formatter does not have the nice property of only operating on
5295 # modified chunks, so hard code full.
5296 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005297 try:
5298 command = [dart_format.FindDartFmtToolInChromiumTree()]
5299 if not opts.dry_run and not opts.diff:
5300 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005301 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005302
ppi@chromium.org6593d932016-03-03 15:41:15 +00005303 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005304 if opts.dry_run and stdout:
5305 return_value = 2
5306 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005307 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5308 'found in this checkout. Files in other languages are still '
5309 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005310
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005311 # Format GN build files. Always run on full build files for canonical form.
5312 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005313 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005314 if opts.dry_run or opts.diff:
5315 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005316 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005317 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5318 shell=sys.platform == 'win32',
5319 cwd=top_dir)
5320 if opts.dry_run and gn_ret == 2:
5321 return_value = 2 # Not formatted.
5322 elif opts.diff and gn_ret == 2:
5323 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005324 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005325 elif gn_ret != 0:
5326 # For non-dry run cases (and non-2 return values for dry-run), a
5327 # nonzero error code indicates a failure, probably because the file
5328 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005329 DieWithError('gn format failed on ' + gn_diff_file +
5330 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005331
Ilya Shermane081cbe2017-08-15 17:51:04 -07005332 # Skip the metrics formatting from the global presubmit hook. These files have
5333 # a separate presubmit hook that issues an error if the files need formatting,
5334 # whereas the top-level presubmit script merely issues a warning. Formatting
5335 # these files is somewhat slow, so it's important not to duplicate the work.
5336 if not opts.presubmit:
5337 for xml_dir in GetDirtyMetricsDirs(diff_files):
5338 tool_dir = os.path.join(top_dir, xml_dir)
5339 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5340 if opts.dry_run or opts.diff:
5341 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005342 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005343 if opts.diff:
5344 sys.stdout.write(stdout)
5345 if opts.dry_run and stdout:
5346 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005347
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005348 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005349
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005350
Steven Holte2e664bf2017-04-21 13:10:47 -07005351def GetDirtyMetricsDirs(diff_files):
5352 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5353 metrics_xml_dirs = [
5354 os.path.join('tools', 'metrics', 'actions'),
5355 os.path.join('tools', 'metrics', 'histograms'),
5356 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005357 os.path.join('tools', 'metrics', 'ukm'),
5358 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005359 for xml_dir in metrics_xml_dirs:
5360 if any(file.startswith(xml_dir) for file in xml_diff_files):
5361 yield xml_dir
5362
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005363
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005364@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005365@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005366def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005367 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005368 _, args = parser.parse_args(args)
5369
5370 if len(args) != 1:
5371 parser.print_help()
5372 return 1
5373
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005374 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005375 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005376 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005377
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005378 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005379
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005380 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005381 output = RunGit(['config', '--local', '--get-regexp',
5382 r'branch\..*\.%s' % issueprefix],
5383 error_ok=True)
5384 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005385 if issue == target_issue:
5386 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005387
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005388 branches = []
5389 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005390 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005391 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005392 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005393 return 1
5394 if len(branches) == 1:
5395 RunGit(['checkout', branches[0]])
5396 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005397 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005398 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005399 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005400 which = raw_input('Choose by index: ')
5401 try:
5402 RunGit(['checkout', branches[int(which)]])
5403 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005404 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005405 return 1
5406
5407 return 0
5408
5409
maruel@chromium.org29404b52014-09-08 22:58:00 +00005410def CMDlol(parser, args):
5411 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005412 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005413 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5414 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5415 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005416 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005417 return 0
5418
5419
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005420class OptionParser(optparse.OptionParser):
5421 """Creates the option parse and add --verbose support."""
5422 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005423 optparse.OptionParser.__init__(
5424 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005425 self.add_option(
5426 '-v', '--verbose', action='count', default=0,
5427 help='Use 2 times for more debugging info')
5428
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005429 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005430 try:
5431 return self._parse_args(args)
5432 finally:
5433 # Regardless of success or failure of args parsing, we want to report
5434 # metrics, but only after logging has been initialized (if parsing
5435 # succeeded).
5436 global settings
5437 settings = Settings()
5438
5439 if not metrics.DISABLE_METRICS_COLLECTION:
5440 # GetViewVCUrl ultimately calls logging method.
5441 project_url = settings.GetViewVCUrl().strip('/+')
5442 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5443 metrics.collector.add('project_urls', [project_url])
5444
5445 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005446 # Create an optparse.Values object that will store only the actual passed
5447 # options, without the defaults.
5448 actual_options = optparse.Values()
5449 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5450 # Create an optparse.Values object with the default options.
5451 options = optparse.Values(self.get_default_values().__dict__)
5452 # Update it with the options passed by the user.
5453 options._update_careful(actual_options.__dict__)
5454 # Store the options passed by the user in an _actual_options attribute.
5455 # We store only the keys, and not the values, since the values can contain
5456 # arbitrary information, which might be PII.
5457 metrics.collector.add('arguments', actual_options.__dict__.keys())
5458
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005459 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005460 logging.basicConfig(
5461 level=levels[min(options.verbose, len(levels) - 1)],
5462 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5463 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005464
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005465 return options, args
5466
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005467
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005468def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005469 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005470 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005471 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005472 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005473
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005474 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005475 dispatcher = subcommand.CommandDispatcher(__name__)
5476 try:
5477 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005478 except auth.AuthenticationError as e:
5479 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005480 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005481 if e.code != 500:
5482 raise
5483 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005484 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005485 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005486 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005487
5488
5489if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005490 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5491 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005492 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005493 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005494 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005495 sys.exit(main(sys.argv[1:]))