blob: ed3f10ff13bde8baba8483ae5ae2d439b343e0b7 [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
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529 """
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000530 fields = ['id', 'builder', 'status']
531 request = {
532 'predicate': {
533 'gerritChanges': [changelist.GetGerritChange(patchset)],
534 },
535 'fields': ','.join('builds.*.' + field for field in fields),
536 }
tandrii221ab252016-10-06 08:12:04 -0700537
538 codereview_url = changelist.GetCodereviewServer()
539 codereview_host = urlparse.urlparse(codereview_url).hostname
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000540
tandrii221ab252016-10-06 08:12:04 -0700541 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000542 if authenticator.has_cached_credentials():
543 http = authenticator.authorize(httplib2.Http())
544 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700545 print('Warning: Some results might be missing because %s' %
546 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000547 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 http.force_exception_to_status_code = True
550
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000551 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
552 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000554def _fetch_latest_builds(
555 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556 """Fetches builds from the latest patchset that has builds (within
557 the last few patchsets).
558
559 Args:
560 auth_config (auth.AuthConfig): Auth info for Buildbucket
561 changelist (Changelist): The CL to fetch builds for
562 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000563 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
564 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000565 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
567 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000568 """
569 assert buildbucket_host
570 assert changelist.GetIssue(), 'CL must be uploaded first'
571 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000572 if latest_patchset is None:
573 assert changelist.GetMostRecentPatchset()
574 ps = changelist.GetMostRecentPatchset()
575 else:
576 assert latest_patchset > 0, latest_patchset
577 ps = latest_patchset
578
Quinten Yearsley983111f2019-09-26 17:18:48 +0000579 min_ps = max(1, ps - 5)
580 while ps >= min_ps:
581 builds = fetch_try_jobs(
582 auth_config, changelist, buildbucket_host, patchset=ps)
583 if len(builds):
584 return builds, ps
585 ps -= 1
586 return [], 0
587
588
589def _filter_failed(builds):
590 """Returns a list of buckets/builders that had failed builds.
591
592 Args:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 builds (list): Builds, in the format returned by fetch_try_jobs,
594 i.e. a list of buildbucket.v2.Builds which includes status and builder
595 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000596
597 Returns:
598 A dict of bucket to builder to tests (empty list). This is the same format
599 accepted by _trigger_try_jobs and returned by _get_bucket_map.
600 """
601 buckets = collections.defaultdict(dict)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 for build in builds:
603 if build['status'] in ('FAILURE', 'INFRA_FAILURE'):
604 project = build['builder']['project']
605 bucket = build['builder']['bucket']
606 builder = build['builder']['builder']
Quinten Yearsley983111f2019-09-26 17:18:48 +0000607 buckets[project + '/' + bucket][builder] = []
608 return buckets
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000614 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000617 longest_builder = max(len(b['builder']['builder']) for b in builds)
618 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000619 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000620 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
621 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000622
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000623 builds_by_status = {}
624 for b in builds:
625 builds_by_status.setdefault(b['status'], []).append({
626 'id': b['id'],
627 'name': name_fmt.format(
628 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
629 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000630
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000631 sort_key = lambda b: (b['name'], b['id'])
632
633 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000635 if not builds:
636 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000638 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000639 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000640 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641 else:
642 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
643
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000644 print(colorize(title))
645 for b in sorted(builds, key=sort_key):
646 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000647
648 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000649 print_builds(
650 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
651 print_builds(
652 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
653 color=Fore.MAGENTA)
654 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
655 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
656 color=Fore.MAGENTA)
657 print_builds('Started:', builds_by_status.pop('STARTED', []))
658 print_builds(
659 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000661 print_builds(
662 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000663 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000664
665
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666def _ComputeDiffLineRanges(files, upstream_commit):
667 """Gets the changed line ranges for each file since upstream_commit.
668
669 Parses a git diff on provided files and returns a dict that maps a file name
670 to an ordered list of range tuples in the form (start_line, count).
671 Ranges are in the same format as a git diff.
672 """
673 # If files is empty then diff_output will be a full diff.
674 if len(files) == 0:
675 return {}
676
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000677 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000678 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
679 diff_output = RunGit(diff_cmd)
680
681 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
682 # 2 capture groups
683 # 0 == fname of diff file
684 # 1 == 'diff_start,diff_count' or 'diff_start'
685 # will match each of
686 # diff --git a/foo.foo b/foo.py
687 # @@ -12,2 +14,3 @@
688 # @@ -12,2 +17 @@
689 # running re.findall on the above string with pattern will give
690 # [('foo.py', ''), ('', '14,3'), ('', '17')]
691
692 curr_file = None
693 line_diffs = {}
694 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
695 if match[0] != '':
696 # Will match the second filename in diff --git a/a.py b/b.py.
697 curr_file = match[0]
698 line_diffs[curr_file] = []
699 else:
700 # Matches +14,3
701 if ',' in match[1]:
702 diff_start, diff_count = match[1].split(',')
703 else:
704 # Single line changes are of the form +12 instead of +12,1.
705 diff_start = match[1]
706 diff_count = 1
707
708 diff_start = int(diff_start)
709 diff_count = int(diff_count)
710
711 # If diff_count == 0 this is a removal we can ignore.
712 line_diffs[curr_file].append((diff_start, diff_count))
713
714 return line_diffs
715
716
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000717def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000718 """Checks if a yapf file is in any parent directory of fpath until top_dir.
719
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000720 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000721 is found returns None. Uses yapf_config_cache as a cache for previously found
722 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000723 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000724 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000725 # Return result if we've already computed it.
726 if fpath in yapf_config_cache:
727 return yapf_config_cache[fpath]
728
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000729 parent_dir = os.path.dirname(fpath)
730 if os.path.isfile(fpath):
731 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000732 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000733 # Otherwise fpath is a directory
734 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
735 if os.path.isfile(yapf_file):
736 ret = yapf_file
737 elif fpath == top_dir or parent_dir == fpath:
738 # If we're at the top level directory, or if we're at root
739 # there is no provided style.
740 ret = None
741 else:
742 # Otherwise recurse on the current directory.
743 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000744 yapf_config_cache[fpath] = ret
745 return ret
746
747
Aaron Gable13101a62018-02-09 13:20:41 -0800748def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000749 """Prints statistics about the change to the user."""
750 # --no-ext-diff is broken in some versions of Git, so try to work around
751 # this by overriding the environment (but there is still a problem if the
752 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000753 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 if 'GIT_EXTERNAL_DIFF' in env:
755 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000756
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000757 try:
758 stdout = sys.stdout.fileno()
759 except AttributeError:
760 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000761 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800762 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000763 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000764
765
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000766class BuildbucketResponseException(Exception):
767 pass
768
769
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770class Settings(object):
771 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000772 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000773 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000774 self.tree_status_url = None
775 self.viewvc_url = None
776 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000777 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000778 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000779 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000780 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000781
782 def LazyUpdateIfNeeded(self):
783 """Updates the settings from a codereview.settings file, if available."""
784 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000785 # The only value that actually changes the behavior is
786 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000787 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 error_ok=True
789 ).strip().lower()
790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000792 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 LoadCodereviewSettingsFromFile(cr_settings_file)
794 self.updated = True
795
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 @staticmethod
797 def GetRelativeRoot():
798 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000801 if self.root is None:
802 self.root = os.path.abspath(self.GetRelativeRoot())
803 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 def GetTreeStatusUrl(self, error_ok=False):
806 if not self.tree_status_url:
807 error_message = ('You must configure your tree status URL by running '
808 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000809 self.tree_status_url = self._GetConfig(
810 'rietveld.tree-status-url', error_ok=error_ok,
811 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.tree_status_url
813
814 def GetViewVCUrl(self):
815 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000816 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000817 return self.viewvc_url
818
rmistry@google.com90752582014-01-14 21:04:50 +0000819 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000820 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000821
rmistry@google.com5626a922015-02-26 14:03:30 +0000822 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000823 run_post_upload_hook = self._GetConfig(
824 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000825 return run_post_upload_hook == "True"
826
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000827 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000828 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000829
ukai@chromium.orge8077812012-02-03 03:41:46 +0000830 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000831 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000832 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700833 self.is_gerrit = (
834 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000835 return self.is_gerrit
836
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000837 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000838 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000839 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700840 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
841 if self.squash_gerrit_uploads is None:
842 # Default is squash now (http://crbug.com/611892#c23).
843 self.squash_gerrit_uploads = not (
844 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
845 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000846 return self.squash_gerrit_uploads
847
tandriia60502f2016-06-20 02:01:53 -0700848 def GetSquashGerritUploadsOverride(self):
849 """Return True or False if codereview.settings should be overridden.
850
851 Returns None if no override has been defined.
852 """
853 # See also http://crbug.com/611892#c23
854 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
855 error_ok=True).strip()
856 if result == 'true':
857 return True
858 if result == 'false':
859 return False
860 return None
861
tandrii@chromium.org28253532016-04-14 13:46:56 +0000862 def GetGerritSkipEnsureAuthenticated(self):
863 """Return True if EnsureAuthenticated should not be done for Gerrit
864 uploads."""
865 if self.gerrit_skip_ensure_authenticated is None:
866 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000867 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000868 error_ok=True).strip() == 'true')
869 return self.gerrit_skip_ensure_authenticated
870
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000871 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000872 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000874 # Git requires single quotes for paths with spaces. We need to replace
875 # them with double quotes for Windows to treat such paths as a single
876 # path.
877 self.git_editor = self._GetConfig(
878 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 return self.git_editor or None
880
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000882 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883 DEFAULT_LINT_REGEX)
884
885 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000886 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000887 DEFAULT_LINT_IGNORE_REGEX)
888
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000889 def _GetConfig(self, param, **kwargs):
890 self.LazyUpdateIfNeeded()
891 return RunGit(['config', param], **kwargs).strip()
892
893
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000894def ShortBranchName(branch):
895 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000896 return branch.replace('refs/heads/', '', 1)
897
898
899def GetCurrentBranchRef():
900 """Returns branch ref (e.g., refs/heads/master) or None."""
901 return RunGit(['symbolic-ref', 'HEAD'],
902 stderr=subprocess2.VOID, error_ok=True).strip() or None
903
904
905def GetCurrentBranch():
906 """Returns current branch or None.
907
908 For refs/heads/* branches, returns just last part. For others, full ref.
909 """
910 branchref = GetCurrentBranchRef()
911 if branchref:
912 return ShortBranchName(branchref)
913 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000914
915
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000916class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000917 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000918 NONE = 'none'
919 DRY_RUN = 'dry_run'
920 COMMIT = 'commit'
921
922 ALL_STATES = [NONE, DRY_RUN, COMMIT]
923
924
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000926 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927 self.issue = issue
928 self.patchset = patchset
929 self.hostname = hostname
930
931 @property
932 def valid(self):
933 return self.issue is not None
934
935
Edward Lemurf38bc172019-09-03 21:02:13 +0000936def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000937 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
938 fail_result = _ParsedIssueNumberArgument()
939
Edward Lemur678a6842019-10-03 22:25:05 +0000940 if isinstance(arg, int):
941 return _ParsedIssueNumberArgument(issue=arg)
942 if not isinstance(arg, basestring):
943 return fail_result
944
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000945 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000946 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947 if not arg.startswith('http'):
948 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700949
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 url = gclient_utils.UpgradeToHttps(arg)
951 try:
952 parsed_url = urlparse.urlparse(url)
953 except ValueError:
954 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200955
Edward Lemur678a6842019-10-03 22:25:05 +0000956 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
957 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
958 # Short urls like https://domain/<issue_number> can be used, but don't allow
959 # specifying the patchset (you'd 404), but we allow that here.
960 if parsed_url.path == '/':
961 part = parsed_url.fragment
962 else:
963 part = parsed_url.path
964
965 match = re.match(
966 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
967 if not match:
968 return fail_result
969
970 issue = int(match.group('issue'))
971 patchset = match.group('patchset')
972 return _ParsedIssueNumberArgument(
973 issue=issue,
974 patchset=int(patchset) if patchset else None,
975 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000976
977
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000978def _create_description_from_log(args):
979 """Pulls out the commit log to use as a base for the CL description."""
980 log_args = []
981 if len(args) == 1 and not args[0].endswith('.'):
982 log_args = [args[0] + '..']
983 elif len(args) == 1 and args[0].endswith('...'):
984 log_args = [args[0][:-1]]
985 elif len(args) == 2:
986 log_args = [args[0] + '..' + args[1]]
987 else:
988 log_args = args[:] # Hope for the best!
989 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
990
991
Aaron Gablea45ee112016-11-22 15:14:38 -0800992class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700993 def __init__(self, issue, url):
994 self.issue = issue
995 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700997
998 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800999 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001000 self.issue, self.url)
1001
1002
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001003_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001004 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005 # TODO(tandrii): these two aren't known in Gerrit.
1006 'approval', 'disapproval'])
1007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001010 """Changelist works with one changelist in local branch.
1011
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001012 Notes:
1013 * Not safe for concurrent multi-{thread,process} use.
1014 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001015 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001016 """
1017
Edward Lemur125d60a2019-09-13 18:25:41 +00001018 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """Create a new ChangeList instance.
1020
Edward Lemurf38bc172019-09-03 21:02:13 +00001021 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001024 global settings
1025 if not settings:
1026 # Happens when git_cl.py is used as a utility library.
1027 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 self.branchref = branchref
1030 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001031 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032 self.branch = ShortBranchName(self.branchref)
1033 else:
1034 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001035 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001036 self.lookedup_issue = False
1037 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 self.has_description = False
1039 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001040 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001042 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001043 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001044 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001045 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046
Edward Lemur125d60a2019-09-13 18:25:41 +00001047 # Lazily cached values.
1048 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1049 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1050 # Map from change number (issue) to its detail cache.
1051 self._detail_cache = {}
1052
1053 if codereview_host is not None:
1054 assert not codereview_host.startswith('https://'), codereview_host
1055 self._gerrit_host = codereview_host
1056 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001057
1058 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001059 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001061 The return value is a string suitable for passing to git cl with the --cc
1062 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001063 """
1064 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001065 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001066 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001067 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1068 return self.cc
1069
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001070 def GetCCListWithoutDefault(self):
1071 """Return the users cc'd on this CL excluding default ones."""
1072 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001073 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001074 return self.cc
1075
Daniel Cheng7227d212017-11-17 08:12:37 -08001076 def ExtendCC(self, more_cc):
1077 """Extends the list of users to cc on this CL based on the changed files."""
1078 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001079
1080 def GetBranch(self):
1081 """Returns the short branch name, e.g. 'master'."""
1082 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001083 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001084 if not branchref:
1085 return None
1086 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001087 self.branch = ShortBranchName(self.branchref)
1088 return self.branch
1089
1090 def GetBranchRef(self):
1091 """Returns the full branch name, e.g. 'refs/heads/master'."""
1092 self.GetBranch() # Poke the lazy loader.
1093 return self.branchref
1094
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001095 def ClearBranch(self):
1096 """Clears cached branch data of this object."""
1097 self.branch = self.branchref = None
1098
tandrii5d48c322016-08-18 16:19:37 -07001099 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1100 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1101 kwargs['branch'] = self.GetBranch()
1102 return _git_get_branch_config_value(key, default, **kwargs)
1103
1104 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1105 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1106 assert self.GetBranch(), (
1107 'this CL must have an associated branch to %sset %s%s' %
1108 ('un' if value is None else '',
1109 key,
1110 '' if value is None else ' to %r' % value))
1111 kwargs['branch'] = self.GetBranch()
1112 return _git_set_branch_config_value(key, value, **kwargs)
1113
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 @staticmethod
1115 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001116 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 e.g. 'origin', 'refs/heads/master'
1118 """
1119 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001120 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1121
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001123 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001125 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1126 error_ok=True).strip()
1127 if upstream_branch:
1128 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001130 # Else, try to guess the origin remote.
1131 remote_branches = RunGit(['branch', '-r']).split()
1132 if 'origin/master' in remote_branches:
1133 # Fall back on origin/master if it exits.
1134 remote = 'origin'
1135 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001137 DieWithError(
1138 'Unable to determine default branch to diff against.\n'
1139 'Either pass complete "git diff"-style arguments, like\n'
1140 ' git cl upload origin/master\n'
1141 'or verify this branch is set up to track another \n'
1142 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143
1144 return remote, upstream_branch
1145
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001146 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001147 upstream_branch = self.GetUpstreamBranch()
1148 if not BranchExists(upstream_branch):
1149 DieWithError('The upstream for the current branch (%s) does not exist '
1150 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001151 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001152 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001153
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 def GetUpstreamBranch(self):
1155 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001157 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001158 upstream_branch = upstream_branch.replace('refs/heads/',
1159 'refs/remotes/%s/' % remote)
1160 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1161 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162 self.upstream_branch = upstream_branch
1163 return self.upstream_branch
1164
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001166 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 remote, branch = None, self.GetBranch()
1168 seen_branches = set()
1169 while branch not in seen_branches:
1170 seen_branches.add(branch)
1171 remote, branch = self.FetchUpstreamTuple(branch)
1172 branch = ShortBranchName(branch)
1173 if remote != '.' or branch.startswith('refs/remotes'):
1174 break
1175 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001176 remotes = RunGit(['remote'], error_ok=True).split()
1177 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001181 logging.warn('Could not determine which remote this change is '
1182 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001183 else:
1184 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001185 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 branch = 'HEAD'
1187 if branch.startswith('refs/remotes'):
1188 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001189 elif branch.startswith('refs/branch-heads/'):
1190 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001191 else:
1192 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001193 return self._remote
1194
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001195 def GitSanityChecks(self, upstream_git_obj):
1196 """Checks git repo status and ensures diff is from local commits."""
1197
sbc@chromium.org79706062015-01-14 21:18:12 +00001198 if upstream_git_obj is None:
1199 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001200 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001201 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001202 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001203 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001204 return False
1205
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001206 # Verify the commit we're diffing against is in our current branch.
1207 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1208 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1209 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001210 print('ERROR: %s is not in the current branch. You may need to rebase '
1211 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 return False
1213
1214 # List the commits inside the diff, and verify they are all local.
1215 commits_in_diff = RunGit(
1216 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1217 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1218 remote_branch = remote_branch.strip()
1219 if code != 0:
1220 _, remote_branch = self.GetRemoteBranch()
1221
1222 commits_in_remote = RunGit(
1223 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1224
1225 common_commits = set(commits_in_diff) & set(commits_in_remote)
1226 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001227 print('ERROR: Your diff contains %d commits already in %s.\n'
1228 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1229 'the diff. If you are using a custom git flow, you can override'
1230 ' the reference used for this check with "git config '
1231 'gitcl.remotebranch <git-ref>".' % (
1232 len(common_commits), remote_branch, upstream_git_obj),
1233 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001234 return False
1235 return True
1236
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001237 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001238 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001239
1240 Returns None if it is not set.
1241 """
tandrii5d48c322016-08-18 16:19:37 -07001242 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001243
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001244 def GetRemoteUrl(self):
1245 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1246
1247 Returns None if there is no remote.
1248 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001249 is_cached, value = self._cached_remote_url
1250 if is_cached:
1251 return value
1252
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001253 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001254 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1255
Edward Lemur298f2cf2019-02-22 21:40:39 +00001256 # Check if the remote url can be parsed as an URL.
1257 host = urlparse.urlparse(url).netloc
1258 if host:
1259 self._cached_remote_url = (True, url)
1260 return url
1261
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001262 # If it cannot be parsed as an url, assume it is a local directory,
1263 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001264 logging.warning('"%s" doesn\'t appear to point to a git host. '
1265 'Interpreting it as a local directory.', url)
1266 if not os.path.isdir(url):
1267 logging.error(
1268 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001269 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001270 return None
1271
1272 cache_path = url
1273 url = RunGit(['config', 'remote.%s.url' % remote],
1274 error_ok=True,
1275 cwd=url).strip()
1276
1277 host = urlparse.urlparse(url).netloc
1278 if not host:
1279 logging.error(
1280 'Remote "%(remote)s" for branch "%(branch)s" points to '
1281 '"%(cache_path)s", but it is misconfigured.\n'
1282 '"%(cache_path)s" must be a git repo and must have a remote named '
1283 '"%(remote)s" pointing to the git host.', {
1284 'remote': remote,
1285 'cache_path': cache_path,
1286 'branch': self.GetBranch()})
1287 return None
1288
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001289 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001290 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001292 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001293 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001294 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001295 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001296 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001297 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 return self.issue
1299
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 def GetIssueURL(self):
1301 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001302 issue = self.GetIssue()
1303 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001304 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001305 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001307 def GetDescription(self, pretty=False, force=False):
1308 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001310 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 self.has_description = True
1312 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001313 # Set width to 72 columns + 2 space indent.
1314 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001316 lines = self.description.splitlines()
1317 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 return self.description
1319
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001320 def GetDescriptionFooters(self):
1321 """Returns (non_footer_lines, footers) for the commit message.
1322
1323 Returns:
1324 non_footer_lines (list(str)) - Simple list of description lines without
1325 any footer. The lines do not contain newlines, nor does the list contain
1326 the empty line between the message and the footers.
1327 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1328 [("Change-Id", "Ideadbeef...."), ...]
1329 """
1330 raw_description = self.GetDescription()
1331 msg_lines, _, footers = git_footers.split_footers(raw_description)
1332 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001333 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001334 return msg_lines, footers
1335
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001336 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001337 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001338 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001339 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001340 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001341 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342 return self.patchset
1343
1344 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001345 """Set this branch's patchset. If patchset=0, clears the patchset."""
1346 assert self.GetBranch()
1347 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001348 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001349 else:
1350 self.patchset = int(patchset)
1351 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001352 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001353
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001354 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001355 """Set this branch's issue. If issue isn't given, clears the issue."""
1356 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001357 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001358 issue = int(issue)
1359 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001360 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001361 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001362 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001363 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001364 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001365 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001366 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367 else:
tandrii5d48c322016-08-18 16:19:37 -07001368 # Reset all of these just to be clean.
1369 reset_suffixes = [
1370 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001371 self.IssueConfigKey(),
1372 self.PatchsetConfigKey(),
1373 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001374 ] + self._PostUnsetIssueProperties()
1375 for prop in reset_suffixes:
1376 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001377 msg = RunGit(['log', '-1', '--format=%B']).strip()
1378 if msg and git_footers.get_footer_change_id(msg):
1379 print('WARNING: The change patched into this branch has a Change-Id. '
1380 'Removing it.')
1381 RunGit(['commit', '--amend', '-m',
1382 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001383 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001384 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001385 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386
dnjba1b0f32016-09-02 12:37:42 -07001387 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 if not self.GitSanityChecks(upstream_branch):
1389 DieWithError('\nGit sanity check failure')
1390
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001391 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001392 if not root:
1393 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001394 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001395
1396 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001397 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001398 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001399 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001400 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001401 except subprocess2.CalledProcessError:
1402 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001403 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001404 'This branch probably doesn\'t exist anymore. To reset the\n'
1405 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001406 ' git branch --set-upstream-to origin/master %s\n'
1407 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001408 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001409
maruel@chromium.org52424302012-08-29 15:14:30 +00001410 issue = self.GetIssue()
1411 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001412 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001413 description = self.GetDescription()
1414 else:
1415 # If the change was never uploaded, use the log messages of all commits
1416 # up to the branch point, as git cl upload will prefill the description
1417 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001418 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1419 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001420
1421 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001422 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001423 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001424 name,
1425 description,
1426 absroot,
1427 files,
1428 issue,
1429 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001430 author,
1431 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001432
dsansomee2d6fd92016-09-08 00:10:47 -07001433 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001434 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001435 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001436 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001437
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001438 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1439 """Sets the description for this CL remotely.
1440
1441 You can get description_lines and footers with GetDescriptionFooters.
1442
1443 Args:
1444 description_lines (list(str)) - List of CL description lines without
1445 newline characters.
1446 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1447 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1448 `List-Of-Tokens`). It will be case-normalized so that each token is
1449 title-cased.
1450 """
1451 new_description = '\n'.join(description_lines)
1452 if footers:
1453 new_description += '\n'
1454 for k, v in footers:
1455 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1456 if not git_footers.FOOTER_PATTERN.match(foot):
1457 raise ValueError('Invalid footer %r' % foot)
1458 new_description += foot + '\n'
1459 self.UpdateDescription(new_description, force)
1460
Edward Lesmes8e282792018-04-03 18:50:29 -04001461 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001462 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1463 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001464 start = time_time()
1465 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001466 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1467 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001468 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001469 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001470 metrics.collector.add_repeated('sub_commands', {
1471 'command': 'presubmit',
1472 'execution_time': time_time() - start,
1473 'exit_code': 0 if result.should_continue() else 1,
1474 })
1475 return result
vapierfd77ac72016-06-16 08:33:57 -07001476 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001477 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001478
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 def CMDUpload(self, options, git_diff_args, orig_args):
1480 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001481 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001483 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001484 else:
1485 if self.GetBranch() is None:
1486 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1487
1488 # Default to diffing against common ancestor of upstream branch
1489 base_branch = self.GetCommonAncestorWithUpstream()
1490 git_diff_args = [base_branch, 'HEAD']
1491
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001492 # Fast best-effort checks to abort before running potentially expensive
1493 # hooks if uploading is likely to fail anyway. Passing these checks does
1494 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001495 self.EnsureAuthenticated(force=options.force)
1496 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497
1498 # Apply watchlists on upload.
1499 change = self.GetChange(base_branch, None)
1500 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1501 files = [f.LocalPath() for f in change.AffectedFiles()]
1502 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001503 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001504
1505 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001506 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001507 # Set the reviewer list now so that presubmit checks can access it.
1508 change_description = ChangeDescription(change.FullDescriptionText())
1509 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001510 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001511 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001512 change)
1513 change.SetDescriptionText(change_description.description)
1514 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001515 may_prompt=not options.force,
1516 verbose=options.verbose,
1517 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518 if not hook_results.should_continue():
1519 return 1
1520 if not options.reviewers and hook_results.reviewers:
1521 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001522 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001523
Aaron Gable13101a62018-02-09 13:20:41 -08001524 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001525 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001527 _git_set_branch_config_value('last-upload-hash',
1528 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529 # Run post upload hooks, if specified.
1530 if settings.GetRunPostUploadHook():
1531 presubmit_support.DoPostUploadExecuter(
1532 change,
1533 self,
1534 settings.GetRoot(),
1535 options.verbose,
1536 sys.stdout)
1537
1538 # Upload all dependencies if specified.
1539 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001540 print()
1541 print('--dependencies has been specified.')
1542 print('All dependent local branches will be re-uploaded.')
1543 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 # Remove the dependencies flag from args so that we do not end up in a
1545 # loop.
1546 orig_args.remove('--dependencies')
1547 ret = upload_branch_deps(self, orig_args)
1548 return ret
1549
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001550 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001551 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001552
1553 Issue must have been already uploaded and known.
1554 """
1555 assert new_state in _CQState.ALL_STATES
1556 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001557 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001558 vote_map = {
1559 _CQState.NONE: 0,
1560 _CQState.DRY_RUN: 1,
1561 _CQState.COMMIT: 2,
1562 }
1563 labels = {'Commit-Queue': vote_map[new_state]}
1564 notify = False if new_state == _CQState.DRY_RUN else None
1565 gerrit_util.SetReview(
1566 self._GetGerritHost(), self._GerritChangeIdentifier(),
1567 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001568 return 0
1569 except KeyboardInterrupt:
1570 raise
1571 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001572 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001573 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001574 ' * Your project has no CQ,\n'
1575 ' * You don\'t have permission to change the CQ state,\n'
1576 ' * There\'s a bug in this code (see stack trace below).\n'
1577 'Consider specifying which bots to trigger manually or asking your '
1578 'project owners for permissions or contacting Chrome Infra at:\n'
1579 'https://www.chromium.org/infra\n\n' %
1580 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001581 # Still raise exception so that stack trace is printed.
1582 raise
1583
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001584 def _GetGerritHost(self):
1585 # Lazy load of configs.
1586 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001587 if self._gerrit_host and '.' not in self._gerrit_host:
1588 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1589 # This happens for internal stuff http://crbug.com/614312.
1590 parsed = urlparse.urlparse(self.GetRemoteUrl())
1591 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001592 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001593 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001594 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1595 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001596 return self._gerrit_host
1597
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598 def _GetGitHost(self):
1599 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001600 remote_url = self.GetRemoteUrl()
1601 if not remote_url:
1602 return None
1603 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001604
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001605 def GetCodereviewServer(self):
1606 if not self._gerrit_server:
1607 # If we're on a branch then get the server potentially associated
1608 # with that branch.
1609 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001610 self._gerrit_server = self._GitGetBranchConfigValue(
1611 self.CodereviewServerConfigKey())
1612 if self._gerrit_server:
1613 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001614 if not self._gerrit_server:
1615 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1616 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001617 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001618 parts[0] = parts[0] + '-review'
1619 self._gerrit_host = '.'.join(parts)
1620 self._gerrit_server = 'https://%s' % self._gerrit_host
1621 return self._gerrit_server
1622
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001623 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001624 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001625 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001626 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001627 logging.warn('can\'t detect Gerrit project.')
1628 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001629 project = urlparse.urlparse(remote_url).path.strip('/')
1630 if project.endswith('.git'):
1631 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001632 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1633 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1634 # gitiles/git-over-https protocol. E.g.,
1635 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1636 # as
1637 # https://chromium.googlesource.com/v8/v8
1638 if project.startswith('a/'):
1639 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001640 return project
1641
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001642 def _GerritChangeIdentifier(self):
1643 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1644
1645 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001646 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001647 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001648 project = self._GetGerritProject()
1649 if project:
1650 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1651 # Fall back on still unique, but less efficient change number.
1652 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001653
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001654 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001655 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001656 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001657
tandrii5d48c322016-08-18 16:19:37 -07001658 @classmethod
1659 def PatchsetConfigKey(cls):
1660 return 'gerritpatchset'
1661
1662 @classmethod
1663 def CodereviewServerConfigKey(cls):
1664 return 'gerritserver'
1665
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001666 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001667 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001668 if settings.GetGerritSkipEnsureAuthenticated():
1669 # For projects with unusual authentication schemes.
1670 # See http://crbug.com/603378.
1671 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001672
1673 # Check presence of cookies only if using cookies-based auth method.
1674 cookie_auth = gerrit_util.Authenticator.get()
1675 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001676 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001677
Daniel Chengcf6269b2019-05-18 01:02:12 +00001678 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1679 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001680 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001681 return
1682
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001683 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001684 self.GetCodereviewServer()
1685 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001686 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001687
1688 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1689 git_auth = cookie_auth.get_auth_header(git_host)
1690 if gerrit_auth and git_auth:
1691 if gerrit_auth == git_auth:
1692 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001693 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001694 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001695 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001696 ' %s\n'
1697 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001698 ' Consider running the following command:\n'
1699 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001700 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001701 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001702 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001703 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001704 cookie_auth.get_new_password_message(git_host)))
1705 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001706 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001707 return
1708 else:
1709 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001710 ([] if gerrit_auth else [self._gerrit_host]) +
1711 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001712 DieWithError('Credentials for the following hosts are required:\n'
1713 ' %s\n'
1714 'These are read from %s (or legacy %s)\n'
1715 '%s' % (
1716 '\n '.join(missing),
1717 cookie_auth.get_gitcookies_path(),
1718 cookie_auth.get_netrc_path(),
1719 cookie_auth.get_new_password_message(git_host)))
1720
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001721 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001722 if not self.GetIssue():
1723 return
1724
1725 # Warm change details cache now to avoid RPCs later, reducing latency for
1726 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001727 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001728 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001729
1730 status = self._GetChangeDetail()['status']
1731 if status in ('MERGED', 'ABANDONED'):
1732 DieWithError('Change %s has been %s, new uploads are not allowed' %
1733 (self.GetIssueURL(),
1734 'submitted' if status == 'MERGED' else 'abandoned'))
1735
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001736 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1737 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1738 # Apparently this check is not very important? Otherwise get_auth_email
1739 # could have been added to other implementations of Authenticator.
1740 cookies_auth = gerrit_util.Authenticator.get()
1741 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001742 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001743
1744 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001745 if self.GetIssueOwner() == cookies_user:
1746 return
1747 logging.debug('change %s owner is %s, cookies user is %s',
1748 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001749 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001750 # so ask what Gerrit thinks of this user.
1751 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1752 if details['email'] == self.GetIssueOwner():
1753 return
1754 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001755 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001756 'as %s.\n'
1757 'Uploading may fail due to lack of permissions.' %
1758 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1759 confirm_or_exit(action='upload')
1760
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001761 def _PostUnsetIssueProperties(self):
1762 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001763 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001764
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001765 def GetGerritObjForPresubmit(self):
1766 return presubmit_support.GerritAccessor(self._GetGerritHost())
1767
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001768 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001769 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001770 or CQ status, assuming adherence to a common workflow.
1771
1772 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001773 * 'error' - error from review tool (including deleted issues)
1774 * 'unsent' - no reviewers added
1775 * 'waiting' - waiting for review
1776 * 'reply' - waiting for uploader to reply to review
1777 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001778 * 'dry-run' - dry-running in the CQ
1779 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001780 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001781 """
1782 if not self.GetIssue():
1783 return None
1784
1785 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001786 data = self._GetChangeDetail([
1787 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001788 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001789 return 'error'
1790
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001791 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001792 return 'closed'
1793
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001794 cq_label = data['labels'].get('Commit-Queue', {})
1795 max_cq_vote = 0
1796 for vote in cq_label.get('all', []):
1797 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1798 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001799 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001800 if max_cq_vote == 1:
1801 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001802
Aaron Gable9ab38c62017-04-06 14:36:33 -07001803 if data['labels'].get('Code-Review', {}).get('approved'):
1804 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001805
1806 if not data.get('reviewers', {}).get('REVIEWER', []):
1807 return 'unsent'
1808
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001809 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001810 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1811 last_message_author = messages.pop().get('author', {})
1812 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001813 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1814 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001815 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001816 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 if last_message_author.get('_account_id') == owner:
1818 # Most recent message was by owner.
1819 return 'waiting'
1820 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001821 # Some reply from non-owner.
1822 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001823
1824 # Somehow there are no messages even though there are reviewers.
1825 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826
1827 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001828 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001829 patchset = data['revisions'][data['current_revision']]['_number']
1830 self.SetPatchset(patchset)
1831 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001832
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001833 def FetchDescription(self, force=False):
1834 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1835 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001836 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001837 return data['revisions'][current_rev]['commit']['message'].encode(
1838 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839
dsansomee2d6fd92016-09-08 00:10:47 -07001840 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001841 if gerrit_util.HasPendingChangeEdit(
1842 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001843 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001844 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001845 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001846 'unpublished edit. Either publish the edit in the Gerrit web UI '
1847 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001848
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001849 gerrit_util.DeletePendingChangeEdit(
1850 self._GetGerritHost(), self._GerritChangeIdentifier())
1851 gerrit_util.SetCommitMessage(
1852 self._GetGerritHost(), self._GerritChangeIdentifier(),
1853 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001854
Aaron Gable636b13f2017-07-14 10:42:48 -07001855 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001856 gerrit_util.SetReview(
1857 self._GetGerritHost(), self._GerritChangeIdentifier(),
1858 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001859
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001860 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001861 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001862 # CURRENT_REVISION is included to get the latest patchset so that
1863 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001864 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001865 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1866 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001867 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001868 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001869 robot_file_comments = gerrit_util.GetChangeRobotComments(
1870 self._GetGerritHost(), self._GerritChangeIdentifier())
1871
1872 # Add the robot comments onto the list of comments, but only
1873 # keep those that are from the latest pachset.
1874 latest_patch_set = self.GetMostRecentPatchset()
1875 for path, robot_comments in robot_file_comments.iteritems():
1876 line_comments = file_comments.setdefault(path, [])
1877 line_comments.extend(
1878 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001879
1880 # Build dictionary of file comments for easy access and sorting later.
1881 # {author+date: {path: {patchset: {line: url+message}}}}
1882 comments = collections.defaultdict(
1883 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1884 for path, line_comments in file_comments.iteritems():
1885 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001886 tag = comment.get('tag', '')
1887 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001888 continue
1889 key = (comment['author']['email'], comment['updated'])
1890 if comment.get('side', 'REVISION') == 'PARENT':
1891 patchset = 'Base'
1892 else:
1893 patchset = 'PS%d' % comment['patch_set']
1894 line = comment.get('line', 0)
1895 url = ('https://%s/c/%s/%s/%s#%s%s' %
1896 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1897 'b' if comment.get('side') == 'PARENT' else '',
1898 str(line) if line else ''))
1899 comments[key][path][patchset][line] = (url, comment['message'])
1900
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001901 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001902 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 summary = self._BuildCommentSummary(msg, comments, readable)
1904 if summary:
1905 summaries.append(summary)
1906 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001907
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001908 @staticmethod
1909 def _BuildCommentSummary(msg, comments, readable):
1910 key = (msg['author']['email'], msg['date'])
1911 # Don't bother showing autogenerated messages that don't have associated
1912 # file or line comments. this will filter out most autogenerated
1913 # messages, but will keep robot comments like those from Tricium.
1914 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1915 if is_autogenerated and not comments.get(key):
1916 return None
1917 message = msg['message']
1918 # Gerrit spits out nanoseconds.
1919 assert len(msg['date'].split('.')[-1]) == 9
1920 date = datetime.datetime.strptime(msg['date'][:-3],
1921 '%Y-%m-%d %H:%M:%S.%f')
1922 if key in comments:
1923 message += '\n'
1924 for path, patchsets in sorted(comments.get(key, {}).items()):
1925 if readable:
1926 message += '\n%s' % path
1927 for patchset, lines in sorted(patchsets.items()):
1928 for line, (url, content) in sorted(lines.items()):
1929 if line:
1930 line_str = 'Line %d' % line
1931 path_str = '%s:%d:' % (path, line)
1932 else:
1933 line_str = 'File comment'
1934 path_str = '%s:0:' % path
1935 if readable:
1936 message += '\n %s, %s: %s' % (patchset, line_str, url)
1937 message += '\n %s\n' % content
1938 else:
1939 message += '\n%s ' % path_str
1940 message += '\n%s\n' % content
1941
1942 return _CommentSummary(
1943 date=date,
1944 message=message,
1945 sender=msg['author']['email'],
1946 autogenerated=is_autogenerated,
1947 # These could be inferred from the text messages and correlated with
1948 # Code-Review label maximum, however this is not reliable.
1949 # Leaving as is until the need arises.
1950 approval=False,
1951 disapproval=False,
1952 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001953
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001955 gerrit_util.AbandonChange(
1956 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001957
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001958 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001959 gerrit_util.SubmitChange(
1960 self._GetGerritHost(), self._GerritChangeIdentifier(),
1961 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001962
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001963 def _GetChangeDetail(self, options=None, no_cache=False):
1964 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001965
1966 If fresh data is needed, set no_cache=True which will clear cache and
1967 thus new data will be fetched from Gerrit.
1968 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001969 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001970 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001971
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001972 # Optimization to avoid multiple RPCs:
1973 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1974 'CURRENT_COMMIT' not in options):
1975 options.append('CURRENT_COMMIT')
1976
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001977 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001978 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001979 options = [o.upper() for o in options]
1980
1981 # Check in cache first unless no_cache is True.
1982 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001983 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001984 else:
1985 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001986 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001987 # Assumption: data fetched before with extra options is suitable
1988 # for return for a smaller set of options.
1989 # For example, if we cached data for
1990 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1991 # and request is for options=[CURRENT_REVISION],
1992 # THEN we can return prior cached data.
1993 if options_set.issubset(cached_options_set):
1994 return data
1995
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001996 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001997 data = gerrit_util.GetChangeDetail(
1998 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001999 except gerrit_util.GerritError as e:
2000 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002001 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002002 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002003
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002004 self._detail_cache.setdefault(cache_key, []).append(
2005 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002006 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002007
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002008 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002009 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002010 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002011 data = gerrit_util.GetChangeCommit(
2012 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002013 except gerrit_util.GerritError as e:
2014 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002015 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002016 raise
agable32978d92016-11-01 12:55:02 -07002017 return data
2018
Karen Qian40c19422019-03-13 21:28:29 +00002019 def _IsCqConfigured(self):
2020 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002021 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002022 return False
2023 # TODO(crbug/753213): Remove temporary hack
2024 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002025 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002026 detail['branch'].startswith('refs/branch-heads/')):
2027 return False
2028 return True
2029
Olivier Robin75ee7252018-04-13 10:02:56 +02002030 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002031 if git_common.is_dirty_git_tree('land'):
2032 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002033
tandriid60367b2016-06-22 05:25:12 -07002034 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002035 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002036 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002037 'which can test and land changes for you. '
2038 'Are you sure you wish to bypass it?\n',
2039 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002040 differs = True
tandriic4344b52016-08-29 06:04:54 -07002041 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002042 # Note: git diff outputs nothing if there is no diff.
2043 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002044 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002045 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002046 if detail['current_revision'] == last_upload:
2047 differs = False
2048 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002049 print('WARNING: Local branch contents differ from latest uploaded '
2050 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002051 if differs:
2052 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002053 confirm_or_exit(
2054 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2055 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002056 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 elif not bypass_hooks:
2058 hook_results = self.RunHook(
2059 committing=True,
2060 may_prompt=not force,
2061 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002062 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2063 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002064 if not hook_results.should_continue():
2065 return 1
2066
2067 self.SubmitIssue(wait_for_merge=True)
2068 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002069 links = self._GetChangeCommit().get('web_links', [])
2070 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002071 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002072 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002073 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002074 return 0
2075
Edward Lemurf38bc172019-09-03 21:02:13 +00002076 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002077 assert parsed_issue_arg.valid
2078
Edward Lemur125d60a2019-09-13 18:25:41 +00002079 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080
2081 if parsed_issue_arg.hostname:
2082 self._gerrit_host = parsed_issue_arg.hostname
2083 self._gerrit_server = 'https://%s' % self._gerrit_host
2084
tandriic2405f52016-10-10 08:13:15 -07002085 try:
2086 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002087 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002088 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002089
2090 if not parsed_issue_arg.patchset:
2091 # Use current revision by default.
2092 revision_info = detail['revisions'][detail['current_revision']]
2093 patchset = int(revision_info['_number'])
2094 else:
2095 patchset = parsed_issue_arg.patchset
2096 for revision_info in detail['revisions'].itervalues():
2097 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2098 break
2099 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002100 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002101 (parsed_issue_arg.patchset, self.GetIssue()))
2102
Edward Lemur125d60a2019-09-13 18:25:41 +00002103 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002104 if remote_url.endswith('.git'):
2105 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002106 remote_url = remote_url.rstrip('/')
2107
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002108 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002109 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002110
2111 if remote_url != fetch_info['url']:
2112 DieWithError('Trying to patch a change from %s but this repo appears '
2113 'to be %s.' % (fetch_info['url'], remote_url))
2114
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002116
Aaron Gable62619a32017-06-16 08:22:09 -07002117 if force:
2118 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2119 print('Checked out commit for change %i patchset %i locally' %
2120 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002121 elif nocommit:
2122 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2123 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002124 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002125 RunGit(['cherry-pick', 'FETCH_HEAD'])
2126 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002127 (parsed_issue_arg.issue, patchset))
2128 print('Note: this created a local commit which does not have '
2129 'the same hash as the one uploaded for review. This will make '
2130 'uploading changes based on top of this branch difficult.\n'
2131 'If you want to do that, use "git cl patch --force" instead.')
2132
Stefan Zagerd08043c2017-10-12 12:07:02 -07002133 if self.GetBranch():
2134 self.SetIssue(parsed_issue_arg.issue)
2135 self.SetPatchset(patchset)
2136 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2137 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2138 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2139 else:
2140 print('WARNING: You are in detached HEAD state.\n'
2141 'The patch has been applied to your checkout, but you will not be '
2142 'able to upload a new patch set to the gerrit issue.\n'
2143 'Try using the \'-b\' option if you would like to work on a '
2144 'branch and/or upload a new patch set.')
2145
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002146 return 0
2147
tandrii16e0b4e2016-06-07 10:34:28 -07002148 def _GerritCommitMsgHookCheck(self, offer_removal):
2149 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2150 if not os.path.exists(hook):
2151 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002152 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2153 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002154 data = gclient_utils.FileRead(hook)
2155 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2156 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002157 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002158 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002159 'and may interfere with it in subtle ways.\n'
2160 'We recommend you remove the commit-msg hook.')
2161 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002162 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002163 gclient_utils.rm_file_or_tree(hook)
2164 print('Gerrit commit-msg hook removed.')
2165 else:
2166 print('OK, will keep Gerrit commit-msg hook in place.')
2167
Edward Lemur1b52d872019-05-09 21:12:12 +00002168 def _CleanUpOldTraces(self):
2169 """Keep only the last |MAX_TRACES| traces."""
2170 try:
2171 traces = sorted([
2172 os.path.join(TRACES_DIR, f)
2173 for f in os.listdir(TRACES_DIR)
2174 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2175 and not f.startswith('tmp'))
2176 ])
2177 traces_to_delete = traces[:-MAX_TRACES]
2178 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002179 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002180 except OSError:
2181 print('WARNING: Failed to remove old git traces from\n'
2182 ' %s'
2183 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002184
Edward Lemur5737f022019-05-17 01:24:00 +00002185 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002186 """Zip and write the git push traces stored in traces_dir."""
2187 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002188 traces_zip = trace_name + '-traces'
2189 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002190 # Create a temporary dir to store git config and gitcookies in. It will be
2191 # compressed and stored next to the traces.
2192 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002193 git_info_zip = trace_name + '-git-info'
2194
Edward Lemur5737f022019-05-17 01:24:00 +00002195 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002196 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002197 git_push_metadata['now'] = git_push_metadata['now'].decode(
2198 sys.stdin.encoding)
2199
Edward Lemur1b52d872019-05-09 21:12:12 +00002200 git_push_metadata['trace_name'] = trace_name
2201 gclient_utils.FileWrite(
2202 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2203
2204 # Keep only the first 6 characters of the git hashes on the packet
2205 # trace. This greatly decreases size after compression.
2206 packet_traces = os.path.join(traces_dir, 'trace-packet')
2207 if os.path.isfile(packet_traces):
2208 contents = gclient_utils.FileRead(packet_traces)
2209 gclient_utils.FileWrite(
2210 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2211 shutil.make_archive(traces_zip, 'zip', traces_dir)
2212
2213 # Collect and compress the git config and gitcookies.
2214 git_config = RunGit(['config', '-l'])
2215 gclient_utils.FileWrite(
2216 os.path.join(git_info_dir, 'git-config'),
2217 git_config)
2218
2219 cookie_auth = gerrit_util.Authenticator.get()
2220 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2221 gitcookies_path = cookie_auth.get_gitcookies_path()
2222 if os.path.isfile(gitcookies_path):
2223 gitcookies = gclient_utils.FileRead(gitcookies_path)
2224 gclient_utils.FileWrite(
2225 os.path.join(git_info_dir, 'gitcookies'),
2226 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2227 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2228
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 gclient_utils.rmtree(git_info_dir)
2230
2231 def _RunGitPushWithTraces(
2232 self, change_desc, refspec, refspec_opts, git_push_metadata):
2233 """Run git push and collect the traces resulting from the execution."""
2234 # Create a temporary directory to store traces in. Traces will be compressed
2235 # and stored in a 'traces' dir inside depot_tools.
2236 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002237 trace_name = os.path.join(
2238 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002239
2240 env = os.environ.copy()
2241 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2242 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002243 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002244 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2245 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2246 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2247
2248 try:
2249 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002250 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002251 before_push = time_time()
2252 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002253 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002254 env=env,
2255 print_stdout=True,
2256 # Flush after every line: useful for seeing progress when running as
2257 # recipe.
2258 filter_fn=lambda _: sys.stdout.flush())
2259 except subprocess2.CalledProcessError as e:
2260 push_returncode = e.returncode
2261 DieWithError('Failed to create a change. Please examine output above '
2262 'for the reason of the failure.\n'
2263 'Hint: run command below to diagnose common Git/Gerrit '
2264 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002265 ' git cl creds-check\n'
2266 '\n'
2267 'If git-cl is not working correctly, file a bug under the '
2268 'Infra>SDK component including the files below.\n'
2269 'Review the files before upload, since they might contain '
2270 'sensitive information.\n'
2271 'Set the Restrict-View-Google label so that they are not '
2272 'publicly accessible.\n'
2273 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002274 change_desc)
2275 finally:
2276 execution_time = time_time() - before_push
2277 metrics.collector.add_repeated('sub_commands', {
2278 'command': 'git push',
2279 'execution_time': execution_time,
2280 'exit_code': push_returncode,
2281 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2282 })
2283
Edward Lemur1b52d872019-05-09 21:12:12 +00002284 git_push_metadata['execution_time'] = execution_time
2285 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002286 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002287
Edward Lemur1b52d872019-05-09 21:12:12 +00002288 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289 gclient_utils.rmtree(traces_dir)
2290
2291 return push_stdout
2292
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002293 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002294 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002295 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002296 # Load default for user, repo, squash=true, in this order.
2297 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002298
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002299 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002300 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002301 # This may be None; default fallback value is determined in logic below.
2302 title = options.title
2303
Dominic Battre7d1c4842017-10-27 09:17:28 +02002304 # Extract bug number from branch name.
2305 bug = options.bug
2306 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2307 if not bug and match:
2308 bug = match.group(1)
2309
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002311 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 if self.GetIssue():
2313 # Try to get the message from a previous upload.
2314 message = self.GetDescription()
2315 if not message:
2316 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002317 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002319 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002320 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002321 # When uploading a subsequent patchset, -m|--message is taken
2322 # as the patchset title if --title was not provided.
2323 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002324 else:
2325 default_title = RunGit(
2326 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002327 if options.force:
2328 title = default_title
2329 else:
2330 title = ask_for_data(
2331 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002332 change_id = self._GetChangeDetail()['change_id']
2333 while True:
2334 footer_change_ids = git_footers.get_footer_change_id(message)
2335 if footer_change_ids == [change_id]:
2336 break
2337 if not footer_change_ids:
2338 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002339 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002340 continue
2341 # There is already a valid footer but with different or several ids.
2342 # Doing this automatically is non-trivial as we don't want to lose
2343 # existing other footers, yet we want to append just 1 desired
2344 # Change-Id. Thus, just create a new footer, but let user verify the
2345 # new description.
2346 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002347 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002348 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002349 print(
2350 'WARNING: change %s has Change-Id footer(s):\n'
2351 ' %s\n'
2352 'but change has Change-Id %s, according to Gerrit.\n'
2353 'Please, check the proposed correction to the description, '
2354 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2355 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2356 change_id))
2357 confirm_or_exit(action='edit')
2358 change_desc.prompt()
2359
2360 message = change_desc.description
2361 if not message:
2362 DieWithError("Description is empty. Aborting...")
2363
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002364 # Continue the while loop.
2365 # Sanity check of this code - we should end up with proper message
2366 # footer.
2367 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002368 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002369 else: # if not self.GetIssue()
2370 if options.message:
2371 message = options.message
2372 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002373 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002374 if options.title:
2375 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002376 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002377 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002378 change_desc.prompt()
2379
Aaron Gableb56ad332017-01-06 15:24:31 -08002380 # On first upload, patchset title is always this string, while
2381 # --title flag gets converted to first line of message.
2382 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002383 if not change_desc.description:
2384 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002385 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 if len(change_ids) > 1:
2387 DieWithError('too many Change-Id footers, at most 1 allowed.')
2388 if not change_ids:
2389 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002390 change_desc.set_description(git_footers.add_footer_change_id(
2391 change_desc.description,
2392 GenerateGerritChangeId(change_desc.description)))
2393 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 assert len(change_ids) == 1
2395 change_id = change_ids[0]
2396
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002397 if options.reviewers or options.tbrs or options.add_owners_to:
2398 change_desc.update_reviewers(options.reviewers, options.tbrs,
2399 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002400 if options.preserve_tryjobs:
2401 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002402
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002404 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2405 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002407 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2408 desc_tempfile.write(change_desc.description)
2409 desc_tempfile.close()
2410 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2411 '-F', desc_tempfile.name]).strip()
2412 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002413 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002414 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002415 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 if not change_desc.description:
2417 DieWithError("Description is empty. Aborting...")
2418
2419 if not git_footers.get_footer_change_id(change_desc.description):
2420 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002421 change_desc.set_description(
2422 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002423 if options.reviewers or options.tbrs or options.add_owners_to:
2424 change_desc.update_reviewers(options.reviewers, options.tbrs,
2425 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002427 # For no-squash mode, we assume the remote called "origin" is the one we
2428 # want. It is not worthwhile to support different workflows for
2429 # no-squash mode.
2430 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002431 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2432
2433 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002434 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002435 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2436 ref_to_push)]).splitlines()
2437 if len(commits) > 1:
2438 print('WARNING: This will upload %d commits. Run the following command '
2439 'to see which commits will be uploaded: ' % len(commits))
2440 print('git log %s..%s' % (parent, ref_to_push))
2441 print('You can also use `git squash-branch` to squash these into a '
2442 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002443 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002444
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002445 if options.reviewers or options.tbrs or options.add_owners_to:
2446 change_desc.update_reviewers(options.reviewers, options.tbrs,
2447 options.add_owners_to, change)
2448
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002449 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002450 cc = []
2451 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2452 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2453 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002454 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002455 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002456 if options.cc:
2457 cc.extend(options.cc)
2458 cc = filter(None, [email.strip() for email in cc])
2459 if change_desc.get_cced():
2460 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002461 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2462 valid_accounts = set(reviewers + cc)
2463 # TODO(crbug/877717): relax this for all hosts.
2464 else:
2465 valid_accounts = gerrit_util.ValidAccounts(
2466 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002467 logging.info('accounts %s are recognized, %s invalid',
2468 sorted(valid_accounts),
2469 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002470
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002471 # Extra options that can be specified at push time. Doc:
2472 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002473 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002474
Aaron Gable844cf292017-06-28 11:32:59 -07002475 # By default, new changes are started in WIP mode, and subsequent patchsets
2476 # don't send email. At any time, passing --send-mail will mark the change
2477 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002478 if options.send_mail:
2479 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002480 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002481 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002482 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002483 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002484 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002485
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002486 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002487 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002488
Aaron Gable9b713dd2016-12-14 16:04:21 -08002489 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002490 # Punctuation and whitespace in |title| must be percent-encoded.
2491 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002492
agablec6787972016-09-09 16:13:34 -07002493 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002494 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002495
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002496 for r in sorted(reviewers):
2497 if r in valid_accounts:
2498 refspec_opts.append('r=%s' % r)
2499 reviewers.remove(r)
2500 else:
2501 # TODO(tandrii): this should probably be a hard failure.
2502 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2503 % r)
2504 for c in sorted(cc):
2505 # refspec option will be rejected if cc doesn't correspond to an
2506 # account, even though REST call to add such arbitrary cc may succeed.
2507 if c in valid_accounts:
2508 refspec_opts.append('cc=%s' % c)
2509 cc.remove(c)
2510
rmistry9eadede2016-09-19 11:22:43 -07002511 if options.topic:
2512 # Documentation on Gerrit topics is here:
2513 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002514 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002515
Edward Lemur687ca902018-12-05 02:30:30 +00002516 if options.enable_auto_submit:
2517 refspec_opts.append('l=Auto-Submit+1')
2518 if options.use_commit_queue:
2519 refspec_opts.append('l=Commit-Queue+2')
2520 elif options.cq_dry_run:
2521 refspec_opts.append('l=Commit-Queue+1')
2522
2523 if change_desc.get_reviewers(tbr_only=True):
2524 score = gerrit_util.GetCodeReviewTbrScore(
2525 self._GetGerritHost(),
2526 self._GetGerritProject())
2527 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002528
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002529 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002530 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002531 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002532 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002533 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2534
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002535 refspec_suffix = ''
2536 if refspec_opts:
2537 refspec_suffix = '%' + ','.join(refspec_opts)
2538 assert ' ' not in refspec_suffix, (
2539 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2540 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2541
Edward Lemur1b52d872019-05-09 21:12:12 +00002542 git_push_metadata = {
2543 'gerrit_host': self._GetGerritHost(),
2544 'title': title or '<untitled>',
2545 'change_id': change_id,
2546 'description': change_desc.description,
2547 }
2548 push_stdout = self._RunGitPushWithTraces(
2549 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002550
2551 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002552 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002553 change_numbers = [m.group(1)
2554 for m in map(regex.match, push_stdout.splitlines())
2555 if m]
2556 if len(change_numbers) != 1:
2557 DieWithError(
2558 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002559 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002560 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002561 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002562
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002563 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002564 # GetIssue() is not set in case of non-squash uploads according to tests.
2565 # TODO(agable): non-squash uploads in git cl should be removed.
2566 gerrit_util.AddReviewers(
2567 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002568 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002569 reviewers, cc,
2570 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002571
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002572 return 0
2573
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002574 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2575 change_desc):
2576 """Computes parent of the generated commit to be uploaded to Gerrit.
2577
2578 Returns revision or a ref name.
2579 """
2580 if custom_cl_base:
2581 # Try to avoid creating additional unintended CLs when uploading, unless
2582 # user wants to take this risk.
2583 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2584 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2585 local_ref_of_target_remote])
2586 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002587 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002588 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2589 'If you proceed with upload, more than 1 CL may be created by '
2590 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2591 'If you are certain that specified base `%s` has already been '
2592 'uploaded to Gerrit as another CL, you may proceed.\n' %
2593 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2594 if not force:
2595 confirm_or_exit(
2596 'Do you take responsibility for cleaning up potential mess '
2597 'resulting from proceeding with upload?',
2598 action='upload')
2599 return custom_cl_base
2600
Aaron Gablef97e33d2017-03-30 15:44:27 -07002601 if remote != '.':
2602 return self.GetCommonAncestorWithUpstream()
2603
2604 # If our upstream branch is local, we base our squashed commit on its
2605 # squashed version.
2606 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2607
Aaron Gablef97e33d2017-03-30 15:44:27 -07002608 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002609 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002610
2611 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002612 # TODO(tandrii): consider checking parent change in Gerrit and using its
2613 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2614 # the tree hash of the parent branch. The upside is less likely bogus
2615 # requests to reupload parent change just because it's uploadhash is
2616 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002617 parent = RunGit(['config',
2618 'branch.%s.gerritsquashhash' % upstream_branch_name],
2619 error_ok=True).strip()
2620 # Verify that the upstream branch has been uploaded too, otherwise
2621 # Gerrit will create additional CLs when uploading.
2622 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2623 RunGitSilent(['rev-parse', parent + ':'])):
2624 DieWithError(
2625 '\nUpload upstream branch %s first.\n'
2626 'It is likely that this branch has been rebased since its last '
2627 'upload, so you just need to upload it again.\n'
2628 '(If you uploaded it with --no-squash, then branch dependencies '
2629 'are not supported, and you should reupload with --squash.)'
2630 % upstream_branch_name,
2631 change_desc)
2632 return parent
2633
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002634 def _AddChangeIdToCommitMessage(self, options, args):
2635 """Re-commits using the current message, assumes the commit hook is in
2636 place.
2637 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002638 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002639 git_command = ['commit', '--amend', '-m', log_desc]
2640 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002641 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002642 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002643 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002644 return new_log_desc
2645 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002646 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002647
tandriie113dfd2016-10-11 10:20:12 -07002648 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002649 try:
2650 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002651 except GerritChangeNotExists:
2652 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002653
2654 if data['status'] in ('ABANDONED', 'MERGED'):
2655 return 'CL %s is closed' % self.GetIssue()
2656
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002657 def GetGerritChange(self, patchset=None):
2658 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2659 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2660 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002661 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002662 data = self._GetChangeDetail(['ALL_REVISIONS'])
2663
2664 assert host and issue and patchset, 'CL must be uploaded first'
2665
2666 has_patchset = any(
2667 int(revision_data['_number']) == patchset
2668 for revision_data in data['revisions'].itervalues())
2669 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002670 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002671 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002672
tandrii8c5a3532016-11-04 07:52:02 -07002673 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002674 'host': host,
2675 'change': issue,
2676 'project': data['project'],
2677 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002678 }
tandriie113dfd2016-10-11 10:20:12 -07002679
tandriide281ae2016-10-12 06:02:30 -07002680 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002681 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002682
Edward Lemur707d70b2018-02-07 00:50:14 +01002683 def GetReviewers(self):
2684 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002685 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002686
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002687
2688_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002689 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002690}
2691
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002692
iannuccie53c9352016-08-17 14:40:40 -07002693def _add_codereview_issue_select_options(parser, extra=""):
2694 _add_codereview_select_options(parser)
2695
2696 text = ('Operate on this issue number instead of the current branch\'s '
2697 'implicit issue.')
2698 if extra:
2699 text += ' '+extra
2700 parser.add_option('-i', '--issue', type=int, help=text)
2701
2702
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002703def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002704 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002705 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002706 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002707 parser.add_option_group(parser.codereview_group)
2708 parser.codereview_group.add_option(
2709 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002710 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002711
2712
tandriif9aefb72016-07-01 09:06:51 -07002713def _get_bug_line_values(default_project, bugs):
2714 """Given default_project and comma separated list of bugs, yields bug line
2715 values.
2716
2717 Each bug can be either:
2718 * a number, which is combined with default_project
2719 * string, which is left as is.
2720
2721 This function may produce more than one line, because bugdroid expects one
2722 project per line.
2723
2724 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2725 ['v8:123', 'chromium:789']
2726 """
2727 default_bugs = []
2728 others = []
2729 for bug in bugs.split(','):
2730 bug = bug.strip()
2731 if bug:
2732 try:
2733 default_bugs.append(int(bug))
2734 except ValueError:
2735 others.append(bug)
2736
2737 if default_bugs:
2738 default_bugs = ','.join(map(str, default_bugs))
2739 if default_project:
2740 yield '%s:%s' % (default_project, default_bugs)
2741 else:
2742 yield default_bugs
2743 for other in sorted(others):
2744 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2745 yield other
2746
2747
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002748class ChangeDescription(object):
2749 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002750 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002751 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002752 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002753 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002754 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2755 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2756 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2757 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002758
Anthony Polito8b955342019-09-24 19:01:36 +00002759 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002760 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002761 if bug:
2762 regexp = re.compile(self.BUG_LINE)
2763 prefix = settings.GetBugPrefix()
2764 if not any((regexp.match(line) for line in self._description_lines)):
2765 values = list(_get_bug_line_values(prefix, bug))
2766 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002767
agable@chromium.org42c20792013-09-12 17:34:49 +00002768 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002769 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002770 return '\n'.join(self._description_lines)
2771
2772 def set_description(self, desc):
2773 if isinstance(desc, basestring):
2774 lines = desc.splitlines()
2775 else:
2776 lines = [line.rstrip() for line in desc]
2777 while lines and not lines[0]:
2778 lines.pop(0)
2779 while lines and not lines[-1]:
2780 lines.pop(-1)
2781 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002782
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002783 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2784 """Rewrites the R=/TBR= line(s) as a single line each.
2785
2786 Args:
2787 reviewers (list(str)) - list of additional emails to use for reviewers.
2788 tbrs (list(str)) - list of additional emails to use for TBRs.
2789 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2790 the change that are missing OWNER coverage. If this is not None, you
2791 must also pass a value for `change`.
2792 change (Change) - The Change that should be used for OWNERS lookups.
2793 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002794 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002795 assert isinstance(tbrs, list), tbrs
2796
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002797 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002798 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002799
2800 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002801 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002802
2803 reviewers = set(reviewers)
2804 tbrs = set(tbrs)
2805 LOOKUP = {
2806 'TBR': tbrs,
2807 'R': reviewers,
2808 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002810 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002811 regexp = re.compile(self.R_LINE)
2812 matches = [regexp.match(line) for line in self._description_lines]
2813 new_desc = [l for i, l in enumerate(self._description_lines)
2814 if not matches[i]]
2815 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002816
agable@chromium.org42c20792013-09-12 17:34:49 +00002817 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002818
2819 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002820 for match in matches:
2821 if not match:
2822 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002823 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2824
2825 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002826 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002827 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002828 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002829 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002830 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002831 LOOKUP[add_owners_to].update(
2832 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002833
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002834 # If any folks ended up in both groups, remove them from tbrs.
2835 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002836
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002837 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2838 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002839
2840 # Put the new lines in the description where the old first R= line was.
2841 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2842 if 0 <= line_loc < len(self._description_lines):
2843 if new_tbr_line:
2844 self._description_lines.insert(line_loc, new_tbr_line)
2845 if new_r_line:
2846 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 if new_r_line:
2849 self.append_footer(new_r_line)
2850 if new_tbr_line:
2851 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002852
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002853 def set_preserve_tryjobs(self):
2854 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2855 footers = git_footers.parse_footers(self.description)
2856 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2857 if v.lower() == 'true':
2858 return
2859 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2860
Anthony Polito8b955342019-09-24 19:01:36 +00002861 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002862 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002863 self.set_description([
2864 '# Enter a description of the change.',
2865 '# This will be displayed on the codereview site.',
2866 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002867 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002868 '--------------------',
2869 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002870 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002871 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002872 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002873 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002874
agable@chromium.org42c20792013-09-12 17:34:49 +00002875 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002876 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002877 if not content:
2878 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002879 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002880
Bruce Dawson2377b012018-01-11 16:46:49 -08002881 # Strip off comments and default inserted "Bug:" line.
2882 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002883 (line.startswith('#') or
2884 line.rstrip() == "Bug:" or
2885 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002886 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002887 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002888 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002889
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002890 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002891 """Adds a footer line to the description.
2892
2893 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2894 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2895 that Gerrit footers are always at the end.
2896 """
2897 parsed_footer_line = git_footers.parse_footer(line)
2898 if parsed_footer_line:
2899 # Line is a gerrit footer in the form: Footer-Key: any value.
2900 # Thus, must be appended observing Gerrit footer rules.
2901 self.set_description(
2902 git_footers.add_footer(self.description,
2903 key=parsed_footer_line[0],
2904 value=parsed_footer_line[1]))
2905 return
2906
2907 if not self._description_lines:
2908 self._description_lines.append(line)
2909 return
2910
2911 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2912 if gerrit_footers:
2913 # git_footers.split_footers ensures that there is an empty line before
2914 # actual (gerrit) footers, if any. We have to keep it that way.
2915 assert top_lines and top_lines[-1] == ''
2916 top_lines, separator = top_lines[:-1], top_lines[-1:]
2917 else:
2918 separator = [] # No need for separator if there are no gerrit_footers.
2919
2920 prev_line = top_lines[-1] if top_lines else ''
2921 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2922 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2923 top_lines.append('')
2924 top_lines.append(line)
2925 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002926
tandrii99a72f22016-08-17 14:33:24 -07002927 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002929 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002930 reviewers = [match.group(2).strip()
2931 for match in matches
2932 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002933 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002934
bradnelsond975b302016-10-23 12:20:23 -07002935 def get_cced(self):
2936 """Retrieves the list of reviewers."""
2937 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2938 cced = [match.group(2).strip() for match in matches if match]
2939 return cleanup_list(cced)
2940
Nodir Turakulov23b82142017-11-16 11:04:25 -08002941 def get_hash_tags(self):
2942 """Extracts and sanitizes a list of Gerrit hashtags."""
2943 subject = (self._description_lines or ('',))[0]
2944 subject = re.sub(
2945 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2946
2947 tags = []
2948 start = 0
2949 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2950 while True:
2951 m = bracket_exp.match(subject, start)
2952 if not m:
2953 break
2954 tags.append(self.sanitize_hash_tag(m.group(1)))
2955 start = m.end()
2956
2957 if not tags:
2958 # Try "Tag: " prefix.
2959 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2960 if m:
2961 tags.append(self.sanitize_hash_tag(m.group(1)))
2962 return tags
2963
2964 @classmethod
2965 def sanitize_hash_tag(cls, tag):
2966 """Returns a sanitized Gerrit hash tag.
2967
2968 A sanitized hashtag can be used as a git push refspec parameter value.
2969 """
2970 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2971
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002972 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2973 """Updates this commit description given the parent.
2974
2975 This is essentially what Gnumbd used to do.
2976 Consult https://goo.gl/WMmpDe for more details.
2977 """
2978 assert parent_msg # No, orphan branch creation isn't supported.
2979 assert parent_hash
2980 assert dest_ref
2981 parent_footer_map = git_footers.parse_footers(parent_msg)
2982 # This will also happily parse svn-position, which GnumbD is no longer
2983 # supporting. While we'd generate correct footers, the verifier plugin
2984 # installed in Gerrit will block such commit (ie git push below will fail).
2985 parent_position = git_footers.get_position(parent_footer_map)
2986
2987 # Cherry-picks may have last line obscuring their prior footers,
2988 # from git_footers perspective. This is also what Gnumbd did.
2989 cp_line = None
2990 if (self._description_lines and
2991 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2992 cp_line = self._description_lines.pop()
2993
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002994 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002995
2996 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2997 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002998 for i, line in enumerate(footer_lines):
2999 k, v = git_footers.parse_footer(line) or (None, None)
3000 if k and k.startswith('Cr-'):
3001 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003002
3003 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003004 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003005 if parent_position[0] == dest_ref:
3006 # Same branch as parent.
3007 number = int(parent_position[1]) + 1
3008 else:
3009 number = 1 # New branch, and extra lineage.
3010 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3011 int(parent_position[1])))
3012
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003013 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3014 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003015
3016 self._description_lines = top_lines
3017 if cp_line:
3018 self._description_lines.append(cp_line)
3019 if self._description_lines[-1] != '':
3020 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003021 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003022
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003023
Aaron Gablea1bab272017-04-11 16:38:18 -07003024def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003025 """Retrieves the reviewers that approved a CL from the issue properties with
3026 messages.
3027
3028 Note that the list may contain reviewers that are not committer, thus are not
3029 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003030
3031 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003032 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003033 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003034 return sorted(
3035 set(
3036 message['sender']
3037 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003038 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003039 )
3040 )
3041
3042
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003043def FindCodereviewSettingsFile(filename='codereview.settings'):
3044 """Finds the given file starting in the cwd and going up.
3045
3046 Only looks up to the top of the repository unless an
3047 'inherit-review-settings-ok' file exists in the root of the repository.
3048 """
3049 inherit_ok_file = 'inherit-review-settings-ok'
3050 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003051 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003052 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3053 root = '/'
3054 while True:
3055 if filename in os.listdir(cwd):
3056 if os.path.isfile(os.path.join(cwd, filename)):
3057 return open(os.path.join(cwd, filename))
3058 if cwd == root:
3059 break
3060 cwd = os.path.dirname(cwd)
3061
3062
3063def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003064 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003065 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003066
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003067 def SetProperty(name, setting, unset_error_ok=False):
3068 fullname = 'rietveld.' + name
3069 if setting in keyvals:
3070 RunGit(['config', fullname, keyvals[setting]])
3071 else:
3072 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3073
tandrii48df5812016-10-17 03:55:37 -07003074 if not keyvals.get('GERRIT_HOST', False):
3075 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003076 # Only server setting is required. Other settings can be absent.
3077 # In that case, we ignore errors raised during option deletion attempt.
3078 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3079 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3080 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003081 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003082 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3083 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003084 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3085 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003086
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003087 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003088 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003089
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003090 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003091 RunGit(['config', 'gerrit.squash-uploads',
3092 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003093
tandrii@chromium.org28253532016-04-14 13:46:56 +00003094 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003095 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003096 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3097
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003098 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003099 # should be of the form
3100 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3101 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003102 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3103 keyvals['ORIGIN_URL_CONFIG']])
3104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003105
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003106def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003107 """Downloads a network object to a local file, like urllib.urlretrieve.
3108
3109 This is necessary because urllib is broken for SSL connections via a proxy.
3110 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003111 with open(destination, 'w') as f:
3112 f.write(urllib2.urlopen(source).read())
3113
3114
ukai@chromium.org712d6102013-11-27 00:52:58 +00003115def hasSheBang(fname):
3116 """Checks fname is a #! script."""
3117 with open(fname) as f:
3118 return f.read(2).startswith('#!')
3119
3120
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003121# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3122def DownloadHooks(*args, **kwargs):
3123 pass
3124
3125
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003126def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003127 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003128
3129 Args:
3130 force: True to update hooks. False to install hooks if not present.
3131 """
3132 if not settings.GetIsGerrit():
3133 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003134 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003135 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3136 if not os.access(dst, os.X_OK):
3137 if os.path.exists(dst):
3138 if not force:
3139 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003140 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003141 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003142 if not hasSheBang(dst):
3143 DieWithError('Not a script: %s\n'
3144 'You need to download from\n%s\n'
3145 'into .git/hooks/commit-msg and '
3146 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003147 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3148 except Exception:
3149 if os.path.exists(dst):
3150 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003151 DieWithError('\nFailed to download hooks.\n'
3152 'You need to download from\n%s\n'
3153 'into .git/hooks/commit-msg and '
3154 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003155
3156
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003157class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003158 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003159
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003160 _GOOGLESOURCE = 'googlesource.com'
3161
3162 def __init__(self):
3163 # Cached list of [host, identity, source], where source is either
3164 # .gitcookies or .netrc.
3165 self._all_hosts = None
3166
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003167 def ensure_configured_gitcookies(self):
3168 """Runs checks and suggests fixes to make git use .gitcookies from default
3169 path."""
3170 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3171 configured_path = RunGitSilent(
3172 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003173 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003174 if configured_path:
3175 self._ensure_default_gitcookies_path(configured_path, default)
3176 else:
3177 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003178
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003179 @staticmethod
3180 def _ensure_default_gitcookies_path(configured_path, default_path):
3181 assert configured_path
3182 if configured_path == default_path:
3183 print('git is already configured to use your .gitcookies from %s' %
3184 configured_path)
3185 return
3186
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003187 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003188 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3189 (configured_path, default_path))
3190
3191 if not os.path.exists(configured_path):
3192 print('However, your configured .gitcookies file is missing.')
3193 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3194 action='reconfigure')
3195 RunGit(['config', '--global', 'http.cookiefile', default_path])
3196 return
3197
3198 if os.path.exists(default_path):
3199 print('WARNING: default .gitcookies file already exists %s' %
3200 default_path)
3201 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3202 default_path)
3203
3204 confirm_or_exit('Move existing .gitcookies to default location?',
3205 action='move')
3206 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003207 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003208 print('Moved and reconfigured git to use .gitcookies from %s' %
3209 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003210
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003211 @staticmethod
3212 def _configure_gitcookies_path(default_path):
3213 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3214 if os.path.exists(netrc_path):
3215 print('You seem to be using outdated .netrc for git credentials: %s' %
3216 netrc_path)
3217 print('This tool will guide you through setting up recommended '
3218 '.gitcookies store for git credentials.\n'
3219 '\n'
3220 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3221 ' git config --global --unset http.cookiefile\n'
3222 ' mv %s %s.backup\n\n' % (default_path, default_path))
3223 confirm_or_exit(action='setup .gitcookies')
3224 RunGit(['config', '--global', 'http.cookiefile', default_path])
3225 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003226
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003227 def get_hosts_with_creds(self, include_netrc=False):
3228 if self._all_hosts is None:
3229 a = gerrit_util.CookiesAuthenticator()
3230 self._all_hosts = [
3231 (h, u, s)
3232 for h, u, s in itertools.chain(
3233 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3234 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3235 )
3236 if h.endswith(self._GOOGLESOURCE)
3237 ]
3238
3239 if include_netrc:
3240 return self._all_hosts
3241 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3242
3243 def print_current_creds(self, include_netrc=False):
3244 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3245 if not hosts:
3246 print('No Git/Gerrit credentials found')
3247 return
3248 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3249 header = [('Host', 'User', 'Which file'),
3250 ['=' * l for l in lengths]]
3251 for row in (header + hosts):
3252 print('\t'.join((('%%+%ds' % l) % s)
3253 for l, s in zip(lengths, row)))
3254
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003255 @staticmethod
3256 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003257 """Parses identity "git-<username>.domain" into <username> and domain."""
3258 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003259 # distinguishable from sub-domains. But we do know typical domains:
3260 if identity.endswith('.chromium.org'):
3261 domain = 'chromium.org'
3262 username = identity[:-len('.chromium.org')]
3263 else:
3264 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003265 if username.startswith('git-'):
3266 username = username[len('git-'):]
3267 return username, domain
3268
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003269 def _canonical_git_googlesource_host(self, host):
3270 """Normalizes Gerrit hosts (with '-review') to Git host."""
3271 assert host.endswith(self._GOOGLESOURCE)
3272 # Prefix doesn't include '.' at the end.
3273 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3274 if prefix.endswith('-review'):
3275 prefix = prefix[:-len('-review')]
3276 return prefix + '.' + self._GOOGLESOURCE
3277
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003278 def _canonical_gerrit_googlesource_host(self, host):
3279 git_host = self._canonical_git_googlesource_host(host)
3280 prefix = git_host.split('.', 1)[0]
3281 return prefix + '-review.' + self._GOOGLESOURCE
3282
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003283 def _get_counterpart_host(self, host):
3284 assert host.endswith(self._GOOGLESOURCE)
3285 git = self._canonical_git_googlesource_host(host)
3286 gerrit = self._canonical_gerrit_googlesource_host(git)
3287 return git if gerrit == host else gerrit
3288
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003289 def has_generic_host(self):
3290 """Returns whether generic .googlesource.com has been configured.
3291
3292 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3293 """
3294 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3295 if host == '.' + self._GOOGLESOURCE:
3296 return True
3297 return False
3298
3299 def _get_git_gerrit_identity_pairs(self):
3300 """Returns map from canonic host to pair of identities (Git, Gerrit).
3301
3302 One of identities might be None, meaning not configured.
3303 """
3304 host_to_identity_pairs = {}
3305 for host, identity, _ in self.get_hosts_with_creds():
3306 canonical = self._canonical_git_googlesource_host(host)
3307 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3308 idx = 0 if canonical == host else 1
3309 pair[idx] = identity
3310 return host_to_identity_pairs
3311
3312 def get_partially_configured_hosts(self):
3313 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003314 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3315 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3316 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003317
3318 def get_conflicting_hosts(self):
3319 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003320 host
3321 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003322 if None not in (i1, i2) and i1 != i2)
3323
3324 def get_duplicated_hosts(self):
3325 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3326 return set(host for host, count in counters.iteritems() if count > 1)
3327
3328 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3329 'chromium.googlesource.com': 'chromium.org',
3330 'chrome-internal.googlesource.com': 'google.com',
3331 }
3332
3333 def get_hosts_with_wrong_identities(self):
3334 """Finds hosts which **likely** reference wrong identities.
3335
3336 Note: skips hosts which have conflicting identities for Git and Gerrit.
3337 """
3338 hosts = set()
3339 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3340 pair = self._get_git_gerrit_identity_pairs().get(host)
3341 if pair and pair[0] == pair[1]:
3342 _, domain = self._parse_identity(pair[0])
3343 if domain != expected:
3344 hosts.add(host)
3345 return hosts
3346
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003347 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003348 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003349 hosts = sorted(hosts)
3350 assert hosts
3351 if extra_column_func is None:
3352 extras = [''] * len(hosts)
3353 else:
3354 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003355 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3356 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003357 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003358 lines.append(tmpl % he)
3359 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003360
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003361 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003362 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003363 yield ('.googlesource.com wildcard record detected',
3364 ['Chrome Infrastructure team recommends to list full host names '
3365 'explicitly.'],
3366 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003367
3368 dups = self.get_duplicated_hosts()
3369 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003370 yield ('The following hosts were defined twice',
3371 self._format_hosts(dups),
3372 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003373
3374 partial = self.get_partially_configured_hosts()
3375 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003376 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3377 'These hosts are missing',
3378 self._format_hosts(partial, lambda host: 'but %s defined' %
3379 self._get_counterpart_host(host)),
3380 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003381
3382 conflicting = self.get_conflicting_hosts()
3383 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003384 yield ('The following Git hosts have differing credentials from their '
3385 'Gerrit counterparts',
3386 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3387 tuple(self._get_git_gerrit_identity_pairs()[host])),
3388 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003389
3390 wrong = self.get_hosts_with_wrong_identities()
3391 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003392 yield ('These hosts likely use wrong identity',
3393 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3394 (self._get_git_gerrit_identity_pairs()[host][0],
3395 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3396 wrong)
3397
3398 def find_and_report_problems(self):
3399 """Returns True if there was at least one problem, else False."""
3400 found = False
3401 bad_hosts = set()
3402 for title, sublines, hosts in self._find_problems():
3403 if not found:
3404 found = True
3405 print('\n\n.gitcookies problem report:\n')
3406 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003407 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 if sublines:
3409 print()
3410 print(' %s' % '\n '.join(sublines))
3411 print()
3412
3413 if bad_hosts:
3414 assert found
3415 print(' You can manually remove corresponding lines in your %s file and '
3416 'visit the following URLs with correct account to generate '
3417 'correct credential lines:\n' %
3418 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3419 print(' %s' % '\n '.join(sorted(set(
3420 gerrit_util.CookiesAuthenticator().get_new_password_url(
3421 self._canonical_git_googlesource_host(host))
3422 for host in bad_hosts
3423 ))))
3424 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003425
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003426
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003427@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003428def CMDcreds_check(parser, args):
3429 """Checks credentials and suggests changes."""
3430 _, _ = parser.parse_args(args)
3431
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003432 # Code below checks .gitcookies. Abort if using something else.
3433 authn = gerrit_util.Authenticator.get()
3434 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3435 if isinstance(authn, gerrit_util.GceAuthenticator):
3436 DieWithError(
3437 'This command is not designed for GCE, are you on a bot?\n'
3438 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3439 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003440 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003441 'This command is not designed for bot environment. It checks '
3442 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003443
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003444 checker = _GitCookiesChecker()
3445 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003446
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003447 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003448 checker.print_current_creds(include_netrc=True)
3449
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003450 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003451 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003452 return 0
3453 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003454
3455
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003456@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003457def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003458 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003459 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3460 branch = ShortBranchName(branchref)
3461 _, args = parser.parse_args(args)
3462 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003463 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003464 return RunGit(['config', 'branch.%s.base-url' % branch],
3465 error_ok=False).strip()
3466 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003467 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003468 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3469 error_ok=False).strip()
3470
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003471
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003472def color_for_status(status):
3473 """Maps a Changelist status to color, for CMDstatus and other tools."""
3474 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003475 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003476 'waiting': Fore.BLUE,
3477 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003478 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003479 'lgtm': Fore.GREEN,
3480 'commit': Fore.MAGENTA,
3481 'closed': Fore.CYAN,
3482 'error': Fore.WHITE,
3483 }.get(status, Fore.WHITE)
3484
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003485
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003486def get_cl_statuses(changes, fine_grained, max_processes=None):
3487 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003488
3489 If fine_grained is true, this will fetch CL statuses from the server.
3490 Otherwise, simply indicate if there's a matching url for the given branches.
3491
3492 If max_processes is specified, it is used as the maximum number of processes
3493 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3494 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003495
3496 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003497 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003498 if not changes:
3499 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003500
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003501 if not fine_grained:
3502 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003503 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003504 for cl in changes:
3505 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003506 return
3507
3508 # First, sort out authentication issues.
3509 logging.debug('ensuring credentials exist')
3510 for cl in changes:
3511 cl.EnsureAuthenticated(force=False, refresh=True)
3512
3513 def fetch(cl):
3514 try:
3515 return (cl, cl.GetStatus())
3516 except:
3517 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003518 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003519 raise
3520
3521 threads_count = len(changes)
3522 if max_processes:
3523 threads_count = max(1, min(threads_count, max_processes))
3524 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3525
3526 pool = ThreadPool(threads_count)
3527 fetched_cls = set()
3528 try:
3529 it = pool.imap_unordered(fetch, changes).__iter__()
3530 while True:
3531 try:
3532 cl, status = it.next(timeout=5)
3533 except multiprocessing.TimeoutError:
3534 break
3535 fetched_cls.add(cl)
3536 yield cl, status
3537 finally:
3538 pool.close()
3539
3540 # Add any branches that failed to fetch.
3541 for cl in set(changes) - fetched_cls:
3542 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003543
rmistry@google.com2dd99862015-06-22 12:22:18 +00003544
3545def upload_branch_deps(cl, args):
3546 """Uploads CLs of local branches that are dependents of the current branch.
3547
3548 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003549
3550 test1 -> test2.1 -> test3.1
3551 -> test3.2
3552 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003553
3554 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3555 run on the dependent branches in this order:
3556 test2.1, test3.1, test3.2, test2.2, test3.3
3557
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003558 Note: This function does not rebase your local dependent branches. Use it
3559 when you make a change to the parent branch that will not conflict
3560 with its dependent branches, and you would like their dependencies
3561 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562 """
3563 if git_common.is_dirty_git_tree('upload-branch-deps'):
3564 return 1
3565
3566 root_branch = cl.GetBranch()
3567 if root_branch is None:
3568 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3569 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003570 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003571 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3572 'patchset dependencies without an uploaded CL.')
3573
3574 branches = RunGit(['for-each-ref',
3575 '--format=%(refname:short) %(upstream:short)',
3576 'refs/heads'])
3577 if not branches:
3578 print('No local branches found.')
3579 return 0
3580
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003581 # Create a dictionary of all local branches to the branches that are
3582 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003583 tracked_to_dependents = collections.defaultdict(list)
3584 for b in branches.splitlines():
3585 tokens = b.split()
3586 if len(tokens) == 2:
3587 branch_name, tracked = tokens
3588 tracked_to_dependents[tracked].append(branch_name)
3589
vapiera7fbd5a2016-06-16 09:17:49 -07003590 print()
3591 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003592 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003593
rmistry@google.com2dd99862015-06-22 12:22:18 +00003594 def traverse_dependents_preorder(branch, padding=''):
3595 dependents_to_process = tracked_to_dependents.get(branch, [])
3596 padding += ' '
3597 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003598 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003599 dependents.append(dependent)
3600 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003601
rmistry@google.com2dd99862015-06-22 12:22:18 +00003602 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003603 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003604
3605 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003606 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003607 return 0
3608
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003609 confirm_or_exit('This command will checkout all dependent branches and run '
3610 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003611
rmistry@google.com2dd99862015-06-22 12:22:18 +00003612 # Record all dependents that failed to upload.
3613 failures = {}
3614 # Go through all dependents, checkout the branch and upload.
3615 try:
3616 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003617 print()
3618 print('--------------------------------------')
3619 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003620 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003621 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003622 try:
3623 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003624 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003625 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003626 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003627 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003628 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629 finally:
3630 # Swap back to the original root branch.
3631 RunGit(['checkout', '-q', root_branch])
3632
vapiera7fbd5a2016-06-16 09:17:49 -07003633 print()
3634 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003635 for dependent_branch in dependents:
3636 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003637 print(' %s : %s' % (dependent_branch, upload_status))
3638 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003639
3640 return 0
3641
3642
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003643@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003644def CMDarchive(parser, args):
3645 """Archives and deletes branches associated with closed changelists."""
3646 parser.add_option(
3647 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003648 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003649 parser.add_option(
3650 '-f', '--force', action='store_true',
3651 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003652 parser.add_option(
3653 '-d', '--dry-run', action='store_true',
3654 help='Skip the branch tagging and removal steps.')
3655 parser.add_option(
3656 '-t', '--notags', action='store_true',
3657 help='Do not tag archived branches. '
3658 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003659
kmarshall3bff56b2016-06-06 18:31:47 -07003660 options, args = parser.parse_args(args)
3661 if args:
3662 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003663
3664 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3665 if not branches:
3666 return 0
3667
vapiera7fbd5a2016-06-16 09:17:49 -07003668 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003669 changes = [Changelist(branchref=b)
3670 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003671 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3672 statuses = get_cl_statuses(changes,
3673 fine_grained=True,
3674 max_processes=options.maxjobs)
3675 proposal = [(cl.GetBranch(),
3676 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3677 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003678 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003679 proposal.sort()
3680
3681 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003682 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003683 return 0
3684
3685 current_branch = GetCurrentBranch()
3686
vapiera7fbd5a2016-06-16 09:17:49 -07003687 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003688 if options.notags:
3689 for next_item in proposal:
3690 print(' ' + next_item[0])
3691 else:
3692 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3693 for next_item in proposal:
3694 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003695
kmarshall9249e012016-08-23 12:02:16 -07003696 # Quit now on precondition failure or if instructed by the user, either
3697 # via an interactive prompt or by command line flags.
3698 if options.dry_run:
3699 print('\nNo changes were made (dry run).\n')
3700 return 0
3701 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003702 print('You are currently on a branch \'%s\' which is associated with a '
3703 'closed codereview issue, so archive cannot proceed. Please '
3704 'checkout another branch and run this command again.' %
3705 current_branch)
3706 return 1
kmarshall9249e012016-08-23 12:02:16 -07003707 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003708 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3709 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003710 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003711 return 1
3712
3713 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003714 if not options.notags:
3715 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003716 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003717
vapiera7fbd5a2016-06-16 09:17:49 -07003718 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003719
3720 return 0
3721
3722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003723@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003724def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003725 """Show status of changelists.
3726
3727 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003728 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003729 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003730 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003731 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003732 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003733 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003734 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003735
3736 Also see 'git cl comments'.
3737 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003738 parser.add_option(
3739 '--no-branch-color',
3740 action='store_true',
3741 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003742 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003743 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003744 parser.add_option('-f', '--fast', action='store_true',
3745 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003746 parser.add_option(
3747 '-j', '--maxjobs', action='store', type=int,
3748 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003749
iannuccie53c9352016-08-17 14:40:40 -07003750 _add_codereview_issue_select_options(
3751 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003752 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003753 if args:
3754 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003755
iannuccie53c9352016-08-17 14:40:40 -07003756 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003757 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003758
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003759 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003760 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003761 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003763 elif options.field == 'id':
3764 issueid = cl.GetIssue()
3765 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003767 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003768 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003769 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003770 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003771 elif options.field == 'status':
3772 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003773 elif options.field == 'url':
3774 url = cl.GetIssueURL()
3775 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003776 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003777 return 0
3778
3779 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3780 if not branches:
3781 print('No local branch found.')
3782 return 0
3783
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003784 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003785 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003787 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003788 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003789 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003790 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003791
Daniel McArdlea23bf592019-02-12 00:25:12 +00003792 current_branch = GetCurrentBranch()
3793
3794 def FormatBranchName(branch, colorize=False):
3795 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3796 an asterisk when it is the current branch."""
3797
3798 asterisk = ""
3799 color = Fore.RESET
3800 if branch == current_branch:
3801 asterisk = "* "
3802 color = Fore.GREEN
3803 branch_name = ShortBranchName(branch)
3804
3805 if colorize:
3806 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003807 return asterisk + branch_name
3808
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003809 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003810
3811 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003812 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3813 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003814 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003815 c, status = output.next()
3816 branch_statuses[c.GetBranch()] = status
3817 status = branch_statuses.pop(branch)
3818 url = cl.GetIssueURL()
3819 if url and (not status or status == 'error'):
3820 # The issue probably doesn't exist anymore.
3821 url += ' (broken)'
3822
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003823 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003824 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003825 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003826 color = ''
3827 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003828 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003829
Alan Cuttera3be9a52019-03-04 18:50:33 +00003830 branch_display = FormatBranchName(branch)
3831 padding = ' ' * (alignment - len(branch_display))
3832 if not options.no_branch_color:
3833 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003834
Alan Cuttera3be9a52019-03-04 18:50:33 +00003835 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3836 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003837
vapiera7fbd5a2016-06-16 09:17:49 -07003838 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003839 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003840 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003841 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003842 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003843 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003844 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003845 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003847 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print('Issue description:')
3849 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850 return 0
3851
3852
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003853def colorize_CMDstatus_doc():
3854 """To be called once in main() to add colors to git cl status help."""
3855 colors = [i for i in dir(Fore) if i[0].isupper()]
3856
3857 def colorize_line(line):
3858 for color in colors:
3859 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003860 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003861 indent = len(line) - len(line.lstrip(' ')) + 1
3862 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3863 return line
3864
3865 lines = CMDstatus.__doc__.splitlines()
3866 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3867
3868
phajdan.jre328cf92016-08-22 04:12:17 -07003869def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003870 if path == '-':
3871 json.dump(contents, sys.stdout)
3872 else:
3873 with open(path, 'w') as f:
3874 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003875
3876
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003877@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003878@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003879def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003880 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003881
3882 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003883 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003884 parser.add_option('-r', '--reverse', action='store_true',
3885 help='Lookup the branch(es) for the specified issues. If '
3886 'no issues are specified, all branches with mapped '
3887 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003888 parser.add_option('--json',
3889 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003890 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003891 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003892
dnj@chromium.org406c4402015-03-03 17:22:28 +00003893 if options.reverse:
3894 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003895 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003896 # Reverse issue lookup.
3897 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003898
3899 git_config = {}
3900 for config in RunGit(['config', '--get-regexp',
3901 r'branch\..*issue']).splitlines():
3902 name, _space, val = config.partition(' ')
3903 git_config[name] = val
3904
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003906 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3907 config_key = _git_branch_config_key(ShortBranchName(branch),
3908 cls.IssueConfigKey())
3909 issue = git_config.get(config_key)
3910 if issue:
3911 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003912 if not args:
3913 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003914 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003915 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003916 try:
3917 issue_num = int(issue)
3918 except ValueError:
3919 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003920 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003921 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003922 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003923 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003924 if options.json:
3925 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003926 return 0
3927
3928 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003929 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003930 if not issue.valid:
3931 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3932 'or no argument to list it.\n'
3933 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003934 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003935 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003936 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003937 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003938 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3939 if options.json:
3940 write_json(options.json, {
3941 'issue': cl.GetIssue(),
3942 'issue_url': cl.GetIssueURL(),
3943 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003944 return 0
3945
3946
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003947@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003948def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 """Shows or posts review comments for any changelist."""
3950 parser.add_option('-a', '--add-comment', dest='comment',
3951 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003952 parser.add_option('-p', '--publish', action='store_true',
3953 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003954 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003955 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003956 parser.add_option('-m', '--machine-readable', dest='readable',
3957 action='store_false', default=True,
3958 help='output comments in a format compatible with '
3959 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003960 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003961 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003962 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003963 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003964
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 issue = None
3966 if options.issue:
3967 try:
3968 issue = int(options.issue)
3969 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003970 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003971
Edward Lemur934836a2019-09-09 20:16:54 +00003972 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003973
3974 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003975 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003976 return 0
3977
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003978 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3979 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003980 for comment in summary:
3981 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003982 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003983 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003984 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003985 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003986 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003987 elif comment.autogenerated:
3988 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003989 else:
3990 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003991 print('\n%s%s %s%s\n%s' % (
3992 color,
3993 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3994 comment.sender,
3995 Fore.RESET,
3996 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3997
smut@google.comc85ac942015-09-15 16:34:43 +00003998 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003999 def pre_serialize(c):
4000 dct = c.__dict__.copy()
4001 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4002 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004003 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004004 return 0
4005
4006
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004007@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004008@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004009def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004010 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004011 parser.add_option('-d', '--display', action='store_true',
4012 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004013 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004014 help='New description to set for this issue (- for stdin, '
4015 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004016 parser.add_option('-f', '--force', action='store_true',
4017 help='Delete any unpublished Gerrit edits for this issue '
4018 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004019
4020 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004021 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004022
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004023 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004024 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004025 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004026 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004027 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004028
Edward Lemur934836a2019-09-09 20:16:54 +00004029 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004030 if target_issue_arg:
4031 kwargs['issue'] = target_issue_arg.issue
4032 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004033
4034 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004035 if not cl.GetIssue():
4036 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004037
Edward Lemur678a6842019-10-03 22:25:05 +00004038 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004039 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004040
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004041 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004042
smut@google.com34fb6b12015-07-13 20:03:26 +00004043 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004045 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004046
4047 if options.new_description:
4048 text = options.new_description
4049 if text == '-':
4050 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004051 elif text == '+':
4052 base_branch = cl.GetCommonAncestorWithUpstream()
4053 change = cl.GetChange(base_branch, None, local_description=True)
4054 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004055
4056 description.set_description(text)
4057 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004058 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004059 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004060 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004061 return 0
4062
4063
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004064@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004065def CMDlint(parser, args):
4066 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004067 parser.add_option('--filter', action='append', metavar='-x,+y',
4068 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004069 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004070
4071 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004072 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004073 try:
4074 import cpplint
4075 import cpplint_chromium
4076 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004078 return 1
4079
4080 # Change the current working directory before calling lint so that it
4081 # shows the correct base.
4082 previous_cwd = os.getcwd()
4083 os.chdir(settings.GetRoot())
4084 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004085 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004086 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4087 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004088 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004089 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004090 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004091
4092 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004093 command = args + files
4094 if options.filter:
4095 command = ['--filter=' + ','.join(options.filter)] + command
4096 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004097
4098 white_regex = re.compile(settings.GetLintRegex())
4099 black_regex = re.compile(settings.GetLintIgnoreRegex())
4100 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4101 for filename in filenames:
4102 if white_regex.match(filename):
4103 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004104 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004105 else:
4106 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4107 extra_check_functions)
4108 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004110 finally:
4111 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004112 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004113 if cpplint._cpplint_state.error_count != 0:
4114 return 1
4115 return 0
4116
4117
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004118@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004119def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004120 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004121 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004122 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004123 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004124 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004125 parser.add_option('--all', action='store_true',
4126 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004127 parser.add_option('--parallel', action='store_true',
4128 help='Run all tests specified by input_api.RunTests in all '
4129 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004130 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004131
sbc@chromium.org71437c02015-04-09 19:29:40 +00004132 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004133 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004134 return 1
4135
Edward Lemur934836a2019-09-09 20:16:54 +00004136 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004137 if args:
4138 base_branch = args[0]
4139 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004140 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004141 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004142
Aaron Gable8076c282017-11-29 14:39:41 -08004143 if options.all:
4144 base_change = cl.GetChange(base_branch, None)
4145 files = [('M', f) for f in base_change.AllFiles()]
4146 change = presubmit_support.GitChange(
4147 base_change.Name(),
4148 base_change.FullDescriptionText(),
4149 base_change.RepositoryRoot(),
4150 files,
4151 base_change.issue,
4152 base_change.patchset,
4153 base_change.author_email,
4154 base_change._upstream)
4155 else:
4156 change = cl.GetChange(base_branch, None)
4157
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004158 cl.RunHook(
4159 committing=not options.upload,
4160 may_prompt=False,
4161 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004162 change=change,
4163 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004164 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165
4166
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004167def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004168 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004169
4170 Works the same way as
4171 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4172 but can be called on demand on all platforms.
4173
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004174 The basic idea is to generate git hash of a state of the tree, original
4175 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004176 """
4177 lines = []
4178 tree_hash = RunGitSilent(['write-tree'])
4179 lines.append('tree %s' % tree_hash.strip())
4180 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4181 if code == 0:
4182 lines.append('parent %s' % parent.strip())
4183 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4184 lines.append('author %s' % author.strip())
4185 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4186 lines.append('committer %s' % committer.strip())
4187 lines.append('')
4188 # Note: Gerrit's commit-hook actually cleans message of some lines and
4189 # whitespace. This code is not doing this, but it clearly won't decrease
4190 # entropy.
4191 lines.append(message)
4192 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004193 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004194 return 'I%s' % change_hash.strip()
4195
4196
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004197def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004198 """Computes the remote branch ref to use for the CL.
4199
4200 Args:
4201 remote (str): The git remote for the CL.
4202 remote_branch (str): The git remote branch for the CL.
4203 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004204 """
4205 if not (remote and remote_branch):
4206 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004207
wittman@chromium.org455dc922015-01-26 20:15:50 +00004208 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004209 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004210 # refs, which are then translated into the remote full symbolic refs
4211 # below.
4212 if '/' not in target_branch:
4213 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4214 else:
4215 prefix_replacements = (
4216 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4217 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4218 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4219 )
4220 match = None
4221 for regex, replacement in prefix_replacements:
4222 match = re.search(regex, target_branch)
4223 if match:
4224 remote_branch = target_branch.replace(match.group(0), replacement)
4225 break
4226 if not match:
4227 # This is a branch path but not one we recognize; use as-is.
4228 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004229 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4230 # Handle the refs that need to land in different refs.
4231 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004232
wittman@chromium.org455dc922015-01-26 20:15:50 +00004233 # Create the true path to the remote branch.
4234 # Does the following translation:
4235 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4236 # * refs/remotes/origin/master -> refs/heads/master
4237 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4238 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4239 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4240 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4241 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4242 'refs/heads/')
4243 elif remote_branch.startswith('refs/remotes/branch-heads'):
4244 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004245
wittman@chromium.org455dc922015-01-26 20:15:50 +00004246 return remote_branch
4247
4248
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004249def cleanup_list(l):
4250 """Fixes a list so that comma separated items are put as individual items.
4251
4252 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4253 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4254 """
4255 items = sum((i.split(',') for i in l), [])
4256 stripped_items = (i.strip() for i in items)
4257 return sorted(filter(None, stripped_items))
4258
4259
Aaron Gable4db38df2017-11-03 14:59:07 -07004260@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004261@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004262def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004263 """Uploads the current changelist to codereview.
4264
4265 Can skip dependency patchset uploads for a branch by running:
4266 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004267 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004268 git config --unset branch.branch_name.skip-deps-uploads
4269 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004270
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004271 If the name of the checked out branch starts with "bug-" or "fix-" followed
4272 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004273 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004274
4275 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004276 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004277 [git-cl] add support for hashtags
4278 Foo bar: implement foo
4279 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004280 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004281 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4282 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004283 parser.add_option('--bypass-watchlists', action='store_true',
4284 dest='bypass_watchlists',
4285 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004286 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004287 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004288 parser.add_option('--message', '-m', dest='message',
4289 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004290 parser.add_option('-b', '--bug',
4291 help='pre-populate the bug number(s) for this issue. '
4292 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004293 parser.add_option('--message-file', dest='message_file',
4294 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004295 parser.add_option('--title', '-t', dest='title',
4296 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004297 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004298 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004299 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004300 parser.add_option('--tbrs',
4301 action='append', default=[],
4302 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004303 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004304 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004305 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004306 parser.add_option('--hashtag', dest='hashtags',
4307 action='append', default=[],
4308 help=('Gerrit hashtag for new CL; '
4309 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004310 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004311 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004312 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004313 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004314 metavar='TARGET',
4315 help='Apply CL to remote ref TARGET. ' +
4316 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004317 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004318 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004319 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004320 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004321 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004322 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004323 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4324 const='TBR', help='add a set of OWNERS to TBR')
4325 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4326 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004327 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004328 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004329 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004330 'implies --send-mail')
4331 parser.add_option('-d', '--cq-dry-run',
4332 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004333 help='Send the patchset to do a CQ dry run right after '
4334 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004335 parser.add_option('--preserve-tryjobs', action='store_true',
4336 help='instruct the CQ to let tryjobs running even after '
4337 'new patchsets are uploaded instead of canceling '
4338 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004339 parser.add_option('--dependencies', action='store_true',
4340 help='Uploads CLs of all the local branches that depend on '
4341 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004342 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4343 help='Sends your change to the CQ after an approval. Only '
4344 'works on repos that have the Auto-Submit label '
4345 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004346 parser.add_option('--parallel', action='store_true',
4347 help='Run all tests specified by input_api.RunTests in all '
4348 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004349 parser.add_option('--no-autocc', action='store_true',
4350 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004351 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004352 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004353 parser.add_option('-R', '--retry-failed', action='store_true',
4354 help='Retry failed tryjobs from old patchset immediately '
4355 'after uploading new patchset. Cannot be used with '
4356 '--use-commit-queue or --cq-dry-run.')
4357 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4358 help='Host of buildbucket. The default host is %default.')
4359 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004360
rmistry@google.com2dd99862015-06-22 12:22:18 +00004361 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004362 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004363 (options, args) = parser.parse_args(args)
4364
sbc@chromium.org71437c02015-04-09 19:29:40 +00004365 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004366 return 1
4367
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004368 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004369 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004370 options.cc = cleanup_list(options.cc)
4371
tandriib80458a2016-06-23 12:20:07 -07004372 if options.message_file:
4373 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004374 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004375 options.message = gclient_utils.FileRead(options.message_file)
4376 options.message_file = None
4377
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004378 if ([options.cq_dry_run,
4379 options.use_commit_queue,
4380 options.retry_failed].count(True) > 1):
4381 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4382 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004383
Aaron Gableedbc4132017-09-11 13:22:28 -07004384 if options.use_commit_queue:
4385 options.send_mail = True
4386
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004387 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4388 settings.GetIsGerrit()
4389
Edward Lemur934836a2019-09-09 20:16:54 +00004390 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004391 if options.retry_failed and not cl.GetIssue():
4392 print('No previous patchsets, so --retry-failed has no effect.')
4393 options.retry_failed = False
4394 # cl.GetMostRecentPatchset uses cached information, and can return the last
4395 # patchset before upload. Calling it here makes it clear that it's the
4396 # last patchset before upload. Note that GetMostRecentPatchset will fail
4397 # if no CL has been uploaded yet.
4398 if options.retry_failed:
4399 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004400
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004401 ret = cl.CMDUpload(options, args, orig_args)
4402
4403 if options.retry_failed:
4404 if ret != 0:
4405 print('Upload failed, so --retry-failed has no effect.')
4406 return ret
4407 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004408 builds, _ = _fetch_latest_builds(
4409 auth_config, cl, options.buildbucket_host,
4410 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004411 buckets = _filter_failed(builds)
4412 if len(buckets) == 0:
4413 print('No failed tryjobs, so --retry-failed has no effect.')
4414 return ret
4415 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4416
4417 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004418
4419
Francois Dorayd42c6812017-05-30 15:10:20 -04004420@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004421@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004422def CMDsplit(parser, args):
4423 """Splits a branch into smaller branches and uploads CLs.
4424
4425 Creates a branch and uploads a CL for each group of files modified in the
4426 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004427 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004428 the shared OWNERS file.
4429 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004430 parser.add_option('-d', '--description', dest='description_file',
4431 help='A text file containing a CL description in which '
4432 '$directory will be replaced by each CL\'s directory.')
4433 parser.add_option('-c', '--comment', dest='comment_file',
4434 help='A text file containing a CL comment.')
4435 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004436 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004437 help='List the files and reviewers for each CL that would '
4438 'be created, but don\'t create branches or CLs.')
4439 parser.add_option('--cq-dry-run', action='store_true',
4440 help='If set, will do a cq dry run for each uploaded CL. '
4441 'Please be careful when doing this; more than ~10 CLs '
4442 'has the potential to overload our build '
4443 'infrastructure. Try to upload these not during high '
4444 'load times (usually 11-3 Mountain View time). Email '
4445 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004446 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4447 default=True,
4448 help='Sends your change to the CQ after an approval. Only '
4449 'works on repos that have the Auto-Submit label '
4450 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004451 options, _ = parser.parse_args(args)
4452
4453 if not options.description_file:
4454 parser.error('No --description flag specified.')
4455
4456 def WrappedCMDupload(args):
4457 return CMDupload(OptionParser(), args)
4458
4459 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004460 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004461 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004462
4463
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004464@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004465@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004467 """DEPRECATED: Used to commit the current changelist via git-svn."""
4468 message = ('git-cl no longer supports committing to SVN repositories via '
4469 'git-svn. You probably want to use `git cl land` instead.')
4470 print(message)
4471 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004472
4473
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004474@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004476def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004477 """Commits the current changelist via git.
4478
4479 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4480 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004481 """
4482 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4483 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004484 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004485 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004486 parser.add_option('--parallel', action='store_true',
4487 help='Run all tests specified by input_api.RunTests in all '
4488 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004489 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004490
Edward Lemur934836a2019-09-09 20:16:54 +00004491 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004492
Robert Iannucci2e73d432018-03-14 01:10:47 -07004493 if not cl.GetIssue():
4494 DieWithError('You must upload the change first to Gerrit.\n'
4495 ' If you would rather have `git cl land` upload '
4496 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004497 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004498 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004499
4500
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004501@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004502@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004503def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004504 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505 parser.add_option('-b', dest='newbranch',
4506 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004507 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004508 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004509 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004510 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004511
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004512 group = optparse.OptionGroup(
4513 parser,
4514 'Options for continuing work on the current issue uploaded from a '
4515 'different clone (e.g. different machine). Must be used independently '
4516 'from the other options. No issue number should be specified, and the '
4517 'branch must have an issue number associated with it')
4518 group.add_option('--reapply', action='store_true', dest='reapply',
4519 help='Reset the branch and reapply the issue.\n'
4520 'CAUTION: This will undo any local changes in this '
4521 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004522
4523 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004524 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004525 parser.add_option_group(group)
4526
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004527 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004528 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004529
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004530 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004531 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004532 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004533 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004535
Edward Lemur934836a2019-09-09 20:16:54 +00004536 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004537 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004538 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004539
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004540 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004541 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004542 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004543
4544 RunGit(['reset', '--hard', upstream])
4545 if options.pull:
4546 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004547
Edward Lemur678a6842019-10-03 22:25:05 +00004548 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4549 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004550
4551 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004552 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004553
Edward Lemurf38bc172019-09-03 21:02:13 +00004554 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004555 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004556 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004557
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004558 # We don't want uncommitted changes mixed up with the patch.
4559 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004560 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004561
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004562 if options.newbranch:
4563 if options.force:
4564 RunGit(['branch', '-D', options.newbranch],
4565 stderr=subprocess2.PIPE, error_ok=True)
4566 RunGit(['new-branch', options.newbranch])
4567
Edward Lemur678a6842019-10-03 22:25:05 +00004568 cl = Changelist(
4569 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004570
Edward Lemur678a6842019-10-03 22:25:05 +00004571 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004572 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004573
Edward Lemurf38bc172019-09-03 21:02:13 +00004574 return cl.CMDPatchWithParsedIssue(
4575 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004576
4577
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004578def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 """Fetches the tree status and returns either 'open', 'closed',
4580 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004581 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582 if url:
4583 status = urllib2.urlopen(url).read().lower()
4584 if status.find('closed') != -1 or status == '0':
4585 return 'closed'
4586 elif status.find('open') != -1 or status == '1':
4587 return 'open'
4588 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004589 return 'unset'
4590
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004591
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004592def GetTreeStatusReason():
4593 """Fetches the tree status from a json url and returns the message
4594 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004595 url = settings.GetTreeStatusUrl()
4596 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004597 connection = urllib2.urlopen(json_url)
4598 status = json.loads(connection.read())
4599 connection.close()
4600 return status['message']
4601
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004602
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004603@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004605 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004606 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004607 status = GetTreeStatus()
4608 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004609 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 return 2
4611
vapiera7fbd5a2016-06-16 09:17:49 -07004612 print('The tree is %s' % status)
4613 print()
4614 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004615 if status != 'open':
4616 return 1
4617 return 0
4618
4619
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004620@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004621def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004622 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4623 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004624 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004625 '-b', '--bot', action='append',
4626 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4627 'times to specify multiple builders. ex: '
4628 '"-b win_rel -b win_layout". See '
4629 'the try server waterfall for the builders name and the tests '
4630 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004631 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004632 '-B', '--bucket', default='',
4633 help=('Buildbucket bucket to send the try requests.'))
4634 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004635 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004636 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004637 'be determined by the try recipe that builder runs, which usually '
4638 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004639 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004640 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004641 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004642 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004643 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004644 '--category', default='git_cl_try', help='Specify custom build category.')
4645 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004646 '--project',
4647 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004648 'in recipe to determine to which repository or directory to '
4649 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004650 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004651 '-p', '--property', dest='properties', action='append', default=[],
4652 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004653 'key2=value2 etc. The value will be treated as '
4654 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004655 'NOTE: using this may make your tryjob not usable for CQ, '
4656 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004657 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004658 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4659 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004660 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004661 parser.add_option(
4662 '-R', '--retry-failed', action='store_true', default=False,
4663 help='Retry failed jobs from the latest set of tryjobs. '
4664 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004665 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004666 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004667 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004668 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004669
machenbach@chromium.org45453142015-09-15 08:45:22 +00004670 # Make sure that all properties are prop=value pairs.
4671 bad_params = [x for x in options.properties if '=' not in x]
4672 if bad_params:
4673 parser.error('Got properties with missing "=": %s' % bad_params)
4674
maruel@chromium.org15192402012-09-06 12:38:29 +00004675 if args:
4676 parser.error('Unknown arguments: %s' % args)
4677
Edward Lemur934836a2019-09-09 20:16:54 +00004678 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004679 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004680 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004681
Edward Lemurf38bc172019-09-03 21:02:13 +00004682 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004683 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004684
tandriie113dfd2016-10-11 10:20:12 -07004685 error_message = cl.CannotTriggerTryJobReason()
4686 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004687 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004688
Quinten Yearsley983111f2019-09-26 17:18:48 +00004689 if options.retry_failed:
4690 if options.bot or options.bucket:
4691 print('ERROR: The option --retry-failed is not compatible with '
4692 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4693 return 1
4694 print('Searching for failed tryjobs...')
4695 builds, patchset = _fetch_latest_builds(
4696 auth_config, cl, options.buildbucket_host)
4697 if options.verbose:
4698 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4699 buckets = _filter_failed(builds)
4700 if not buckets:
4701 print('There are no failed jobs in the latest set of jobs '
4702 '(patchset #%d), doing nothing.' % patchset)
4703 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004704 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004705 if num_builders > 10:
4706 confirm_or_exit('There are %d builders with failed builds.'
4707 % num_builders, action='continue')
4708 else:
4709 buckets = _get_bucket_map(cl, options, parser)
4710 if buckets and any(b.startswith('master.') for b in buckets):
4711 print('ERROR: Buildbot masters are not supported.')
4712 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004713
qyearsleydd49f942016-10-28 11:57:22 -07004714 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4715 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004716 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004717 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004718 print('git cl try with no bots now defaults to CQ dry run.')
4719 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4720 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004721
borenet6c0efe62016-10-19 08:13:29 -07004722 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004723 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004724 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004725 'of bot requires an initial job from a parent (usually a builder). '
4726 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004727 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004728 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004729
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004730 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004731 try:
4732 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4733 except BuildbucketResponseException as ex:
4734 print('ERROR: %s' % ex)
4735 return 1
4736 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004737
4738
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004739@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004740def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004741 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004742 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004743 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004744 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004746 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004747 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004748 '--color', action='store_true', default=setup_color.IS_TTY,
4749 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +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.')
qyearsley53f48a12016-09-01 10:45:13 -07004753 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004754 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004755 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004756 parser.add_option_group(group)
4757 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004758 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004759 options, args = parser.parse_args(args)
4760 if args:
4761 parser.error('Unrecognized args: %s' % ' '.join(args))
4762
4763 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004764 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004765 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004766 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004767
tandrii221ab252016-10-06 08:12:04 -07004768 patchset = options.patchset
4769 if not patchset:
4770 patchset = cl.GetMostRecentPatchset()
4771 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004772 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004773 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004774 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004775 cl.GetIssue())
4776
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777 try:
tandrii221ab252016-10-06 08:12:04 -07004778 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004779 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004780 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004781 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004782 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004783 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004784 else:
4785 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 return 0
4787
4788
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004789@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004790@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004792 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004793 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004794 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004795 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004798 if args:
4799 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004800 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004801 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004802 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004803 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004804
4805 # Clear configured merge-base, if there is one.
4806 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004807 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004808 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004809 return 0
4810
4811
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004812@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004813def CMDweb(parser, args):
4814 """Opens the current CL in the web browser."""
4815 _, args = parser.parse_args(args)
4816 if args:
4817 parser.error('Unrecognized args: %s' % ' '.join(args))
4818
4819 issue_url = Changelist().GetIssueURL()
4820 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004821 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004822 return 1
4823
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004824 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004825 # allows us to hide the "Created new window in existing browser session."
4826 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004827 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004828 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004829 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004830 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004831 os.open(os.devnull, os.O_RDWR)
4832 try:
4833 webbrowser.open(issue_url)
4834 finally:
4835 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004836 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004837 return 0
4838
4839
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004840@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004841def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004842 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004843 parser.add_option('-d', '--dry-run', action='store_true',
4844 help='trigger in dry run mode')
4845 parser.add_option('-c', '--clear', action='store_true',
4846 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004847 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004848 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004849 if args:
4850 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004851 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004852 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004853
Edward Lemur934836a2019-09-09 20:16:54 +00004854 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004855 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004856 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004857 elif options.dry_run:
4858 state = _CQState.DRY_RUN
4859 else:
4860 state = _CQState.COMMIT
4861 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004862 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004863 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004864 return 0
4865
4866
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004867@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004868def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004869 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004870 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004871 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004872 if args:
4873 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004874 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004875 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004876 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004877 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004878 cl.CloseIssue()
4879 return 0
4880
4881
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004882@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004883def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004884 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004885 parser.add_option(
4886 '--stat',
4887 action='store_true',
4888 dest='stat',
4889 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004890 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004891 if args:
4892 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004893
Edward Lemur934836a2019-09-09 20:16:54 +00004894 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004895 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004896 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004897 if not issue:
4898 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004899
Aaron Gablea718c3e2017-08-28 17:47:28 -07004900 base = cl._GitGetBranchConfigValue('last-upload-hash')
4901 if not base:
4902 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4903 if not base:
4904 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4905 revision_info = detail['revisions'][detail['current_revision']]
4906 fetch_info = revision_info['fetch']['http']
4907 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4908 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004909
Aaron Gablea718c3e2017-08-28 17:47:28 -07004910 cmd = ['git', 'diff']
4911 if options.stat:
4912 cmd.append('--stat')
4913 cmd.append(base)
4914 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004915
4916 return 0
4917
4918
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004919@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004920def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004921 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004922 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004923 '--ignore-current',
4924 action='store_true',
4925 help='Ignore the CL\'s current reviewers and start from scratch.')
4926 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004927 '--ignore-self',
4928 action='store_true',
4929 help='Do not consider CL\'s author as an owners.')
4930 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004931 '--no-color',
4932 action='store_true',
4933 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004934 parser.add_option(
4935 '--batch',
4936 action='store_true',
4937 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004938 # TODO: Consider moving this to another command, since other
4939 # git-cl owners commands deal with owners for a given CL.
4940 parser.add_option(
4941 '--show-all',
4942 action='store_true',
4943 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004944 options, args = parser.parse_args(args)
4945
4946 author = RunGit(['config', 'user.email']).strip() or None
4947
Edward Lemur934836a2019-09-09 20:16:54 +00004948 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004949
Yang Guo6e269a02019-06-26 11:17:02 +00004950 if options.show_all:
4951 for arg in args:
4952 base_branch = cl.GetCommonAncestorWithUpstream()
4953 change = cl.GetChange(base_branch, None)
4954 database = owners.Database(change.RepositoryRoot(), file, os.path)
4955 database.load_data_needed_for([arg])
4956 print('Owners for %s:' % arg)
4957 for owner in sorted(database.all_possible_owners([arg], None)):
4958 print(' - %s' % owner)
4959 return 0
4960
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004961 if args:
4962 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004963 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004964 base_branch = args[0]
4965 else:
4966 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004967 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004968
4969 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004970 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4971
4972 if options.batch:
4973 db = owners.Database(change.RepositoryRoot(), file, os.path)
4974 print('\n'.join(db.reviewers_for(affected_files, author)))
4975 return 0
4976
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004977 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004978 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004979 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004980 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004981 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004982 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004983 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004984 override_files=change.OriginalOwnersFiles(),
4985 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004986
4987
Aiden Bennerc08566e2018-10-03 17:52:42 +00004988def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004989 """Generates a diff command."""
4990 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004991 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4992
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004993 if allow_prefix:
4994 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4995 # case that diff.noprefix is set in the user's git config.
4996 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4997 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004998 diff_cmd += ['--no-prefix']
4999
5000 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005001
5002 if args:
5003 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005004 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005005 diff_cmd.append(arg)
5006 else:
5007 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005008
5009 return diff_cmd
5010
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005011
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005012def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005013 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005014 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005015
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005016
enne@chromium.org555cfe42014-01-29 18:21:39 +00005017@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005018@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005019def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005020 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005021 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005022 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005023 parser.add_option('--full', action='store_true',
5024 help='Reformat the full content of all touched files')
5025 parser.add_option('--dry-run', action='store_true',
5026 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005027 parser.add_option(
5028 '--python',
5029 action='store_true',
5030 default=None,
5031 help='Enables python formatting on all python files.')
5032 parser.add_option(
5033 '--no-python',
5034 action='store_true',
5035 dest='python',
5036 help='Disables python formatting on all python files. '
5037 'Takes precedence over --python. '
5038 'If neither --python or --no-python are set, python '
5039 'files that have a .style.yapf file in an ancestor '
5040 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005041 parser.add_option('--js', action='store_true',
5042 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005043 parser.add_option('--diff', action='store_true',
5044 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005045 parser.add_option('--presubmit', action='store_true',
5046 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005047 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005048
Daniel Chengc55eecf2016-12-30 03:11:02 -08005049 # Normalize any remaining args against the current path, so paths relative to
5050 # the current directory are still resolved as expected.
5051 args = [os.path.join(os.getcwd(), arg) for arg in args]
5052
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005053 # git diff generates paths against the root of the repository. Change
5054 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005055 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005056 if rel_base_path:
5057 os.chdir(rel_base_path)
5058
digit@chromium.org29e47272013-05-17 17:01:46 +00005059 # Grab the merge-base commit, i.e. the upstream commit of the current
5060 # branch when it was created or the last time it was rebased. This is
5061 # to cover the case where the user may have called "git fetch origin",
5062 # moving the origin branch to a newer commit, but hasn't rebased yet.
5063 upstream_commit = None
5064 cl = Changelist()
5065 upstream_branch = cl.GetUpstreamBranch()
5066 if upstream_branch:
5067 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5068 upstream_commit = upstream_commit.strip()
5069
5070 if not upstream_commit:
5071 DieWithError('Could not find base commit for this branch. '
5072 'Are you in detached state?')
5073
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005074 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5075 diff_output = RunGit(changed_files_cmd)
5076 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005077 # Filter out files deleted by this CL
5078 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005079
Christopher Lamc5ba6922017-01-24 11:19:14 +11005080 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005081 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005082
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005083 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5084 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5085 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005086 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005087
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005088 top_dir = os.path.normpath(
5089 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5090
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005091 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5092 # formatted. This is used to block during the presubmit.
5093 return_value = 0
5094
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005095 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005096 # Locate the clang-format binary in the checkout
5097 try:
5098 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005099 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005100 DieWithError(e)
5101
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005102 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005103 cmd = [clang_format_tool]
5104 if not opts.dry_run and not opts.diff:
5105 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005106 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005107 if opts.diff:
5108 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005109 else:
5110 env = os.environ.copy()
5111 env['PATH'] = str(os.path.dirname(clang_format_tool))
5112 try:
5113 script = clang_format.FindClangFormatScriptInChromiumTree(
5114 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005115 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005116 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005117
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005118 cmd = [sys.executable, script, '-p0']
5119 if not opts.dry_run and not opts.diff:
5120 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005121
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005122 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5123 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005124
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005125 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5126 if opts.diff:
5127 sys.stdout.write(stdout)
5128 if opts.dry_run and len(stdout) > 0:
5129 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005130
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005131 # Similar code to above, but using yapf on .py files rather than clang-format
5132 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005133 py_explicitly_disabled = opts.python is not None and not opts.python
5134 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005135 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5136 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5137 if sys.platform.startswith('win'):
5138 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005139
Aiden Bennerc08566e2018-10-03 17:52:42 +00005140 # If we couldn't find a yapf file we'll default to the chromium style
5141 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005142 chromium_default_yapf_style = os.path.join(depot_tools_path,
5143 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005144 # Used for caching.
5145 yapf_configs = {}
5146 for f in python_diff_files:
5147 # Find the yapf style config for the current file, defaults to depot
5148 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005149 _FindYapfConfigFile(f, yapf_configs, top_dir)
5150
5151 # Turn on python formatting by default if a yapf config is specified.
5152 # This breaks in the case of this repo though since the specified
5153 # style file is also the global default.
5154 if opts.python is None:
5155 filtered_py_files = []
5156 for f in python_diff_files:
5157 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5158 filtered_py_files.append(f)
5159 else:
5160 filtered_py_files = python_diff_files
5161
5162 # Note: yapf still seems to fix indentation of the entire file
5163 # even if line ranges are specified.
5164 # See https://github.com/google/yapf/issues/499
5165 if not opts.full and filtered_py_files:
5166 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5167
5168 for f in filtered_py_files:
5169 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5170 if yapf_config is None:
5171 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005172
5173 cmd = [yapf_tool, '--style', yapf_config, f]
5174
5175 has_formattable_lines = False
5176 if not opts.full:
5177 # Only run yapf over changed line ranges.
5178 for diff_start, diff_len in py_line_diffs[f]:
5179 diff_end = diff_start + diff_len - 1
5180 # Yapf errors out if diff_end < diff_start but this
5181 # is a valid line range diff for a removal.
5182 if diff_end >= diff_start:
5183 has_formattable_lines = True
5184 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5185 # If all line diffs were removals we have nothing to format.
5186 if not has_formattable_lines:
5187 continue
5188
5189 if opts.diff or opts.dry_run:
5190 cmd += ['--diff']
5191 # Will return non-zero exit code if non-empty diff.
5192 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5193 if opts.diff:
5194 sys.stdout.write(stdout)
5195 elif len(stdout) > 0:
5196 return_value = 2
5197 else:
5198 cmd += ['-i']
5199 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005200
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005201 # Dart's formatter does not have the nice property of only operating on
5202 # modified chunks, so hard code full.
5203 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005204 try:
5205 command = [dart_format.FindDartFmtToolInChromiumTree()]
5206 if not opts.dry_run and not opts.diff:
5207 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005208 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005209
ppi@chromium.org6593d932016-03-03 15:41:15 +00005210 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005211 if opts.dry_run and stdout:
5212 return_value = 2
5213 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005214 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5215 'found in this checkout. Files in other languages are still '
5216 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005217
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005218 # Format GN build files. Always run on full build files for canonical form.
5219 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005220 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005221 if opts.dry_run or opts.diff:
5222 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005223 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005224 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5225 shell=sys.platform == 'win32',
5226 cwd=top_dir)
5227 if opts.dry_run and gn_ret == 2:
5228 return_value = 2 # Not formatted.
5229 elif opts.diff and gn_ret == 2:
5230 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005231 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005232 elif gn_ret != 0:
5233 # For non-dry run cases (and non-2 return values for dry-run), a
5234 # nonzero error code indicates a failure, probably because the file
5235 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005236 DieWithError('gn format failed on ' + gn_diff_file +
5237 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005238
Ilya Shermane081cbe2017-08-15 17:51:04 -07005239 # Skip the metrics formatting from the global presubmit hook. These files have
5240 # a separate presubmit hook that issues an error if the files need formatting,
5241 # whereas the top-level presubmit script merely issues a warning. Formatting
5242 # these files is somewhat slow, so it's important not to duplicate the work.
5243 if not opts.presubmit:
5244 for xml_dir in GetDirtyMetricsDirs(diff_files):
5245 tool_dir = os.path.join(top_dir, xml_dir)
5246 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5247 if opts.dry_run or opts.diff:
5248 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005249 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005250 if opts.diff:
5251 sys.stdout.write(stdout)
5252 if opts.dry_run and stdout:
5253 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005254
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005255 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005256
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005257
Steven Holte2e664bf2017-04-21 13:10:47 -07005258def GetDirtyMetricsDirs(diff_files):
5259 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5260 metrics_xml_dirs = [
5261 os.path.join('tools', 'metrics', 'actions'),
5262 os.path.join('tools', 'metrics', 'histograms'),
5263 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005264 os.path.join('tools', 'metrics', 'ukm'),
5265 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005266 for xml_dir in metrics_xml_dirs:
5267 if any(file.startswith(xml_dir) for file in xml_diff_files):
5268 yield xml_dir
5269
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005270
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005271@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005272@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005273def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005274 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005275 _, args = parser.parse_args(args)
5276
5277 if len(args) != 1:
5278 parser.print_help()
5279 return 1
5280
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005281 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005282 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005283 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005284
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005285 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005286
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005287 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005288 output = RunGit(['config', '--local', '--get-regexp',
5289 r'branch\..*\.%s' % issueprefix],
5290 error_ok=True)
5291 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005292 if issue == target_issue:
5293 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005294
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005295 branches = []
5296 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005297 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005298 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005299 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005300 return 1
5301 if len(branches) == 1:
5302 RunGit(['checkout', branches[0]])
5303 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005304 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005305 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005306 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307 which = raw_input('Choose by index: ')
5308 try:
5309 RunGit(['checkout', branches[int(which)]])
5310 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005311 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312 return 1
5313
5314 return 0
5315
5316
maruel@chromium.org29404b52014-09-08 22:58:00 +00005317def CMDlol(parser, args):
5318 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005319 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005320 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5321 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5322 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005323 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005324 return 0
5325
5326
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005327class OptionParser(optparse.OptionParser):
5328 """Creates the option parse and add --verbose support."""
5329 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005330 optparse.OptionParser.__init__(
5331 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005332 self.add_option(
5333 '-v', '--verbose', action='count', default=0,
5334 help='Use 2 times for more debugging info')
5335
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005336 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005337 try:
5338 return self._parse_args(args)
5339 finally:
5340 # Regardless of success or failure of args parsing, we want to report
5341 # metrics, but only after logging has been initialized (if parsing
5342 # succeeded).
5343 global settings
5344 settings = Settings()
5345
5346 if not metrics.DISABLE_METRICS_COLLECTION:
5347 # GetViewVCUrl ultimately calls logging method.
5348 project_url = settings.GetViewVCUrl().strip('/+')
5349 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5350 metrics.collector.add('project_urls', [project_url])
5351
5352 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005353 # Create an optparse.Values object that will store only the actual passed
5354 # options, without the defaults.
5355 actual_options = optparse.Values()
5356 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5357 # Create an optparse.Values object with the default options.
5358 options = optparse.Values(self.get_default_values().__dict__)
5359 # Update it with the options passed by the user.
5360 options._update_careful(actual_options.__dict__)
5361 # Store the options passed by the user in an _actual_options attribute.
5362 # We store only the keys, and not the values, since the values can contain
5363 # arbitrary information, which might be PII.
5364 metrics.collector.add('arguments', actual_options.__dict__.keys())
5365
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005366 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005367 logging.basicConfig(
5368 level=levels[min(options.verbose, len(levels) - 1)],
5369 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5370 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005371
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005372 return options, args
5373
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005374
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005375def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005376 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005377 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005378 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005379 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005380
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005381 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005382 dispatcher = subcommand.CommandDispatcher(__name__)
5383 try:
5384 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005385 except auth.AuthenticationError as e:
5386 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005387 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005388 if e.code != 500:
5389 raise
5390 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005391 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005392 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005393 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005394
5395
5396if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005397 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5398 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005399 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005400 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005401 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005402 sys.exit(main(sys.argv[1:]))