blob: ff6d5b324b151c8d1254aa81544a702191aa0a25 [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010016import datetime
sheyang@google.com6ebaf782015-05-12 19:17:54 +000017import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010018import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000019import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000021import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import optparse
23import os
24import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010025import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000026import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000027import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070028import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000030import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000038from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000039from third_party import httplib2
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000040import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000041import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000042import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000043import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000044import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000045import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000047import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000048import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000049import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000050import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000051import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000052import presubmit_support
53import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000054import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040055import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000056import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000057import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import watchlists
59
tandrii7400cf02016-06-21 08:48:07 -070060__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061
Edward Lemur0f58ae42019-04-30 17:24:12 +000062# Traces for git push will be stored in a traces directory inside the
63# depot_tools checkout.
64DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
65TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
66
67# When collecting traces, Git hashes will be reduced to 6 characters to reduce
68# the size after compression.
69GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
70# Used to redact the cookies from the gitcookies file.
71GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
72
Edward Lemurd4d1ba42019-09-20 21:46:37 +000073MAX_ATTEMPTS = 3
74
Edward Lemur1b52d872019-05-09 21:12:12 +000075# The maximum number of traces we will keep. Multiplied by 3 since we store
76# 3 files per trace.
77MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000078# Message to be displayed to the user to inform where to find the traces for a
79# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000080TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000081'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000082'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000083' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000084'Copies of your gitcookies file and git config have been recorded at:\n'
85' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000086# Format of the message to be stored as part of the traces to give developers a
87# better context when they go through traces.
88TRACES_README_FORMAT = (
89'Date: %(now)s\n'
90'\n'
91'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
92'Title: %(title)s\n'
93'\n'
94'%(description)s\n'
95'\n'
96'Execution time: %(execution_time)s\n'
97'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000098
tandrii9d2c7a32016-06-22 03:42:45 -070099COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800100POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000101DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000102REFS_THAT_ALIAS_TO_OTHER_REFS = {
103 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
104 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
105}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000106
thestig@chromium.org44202a22014-03-11 19:22:18 +0000107# Valid extensions for files we want to lint.
108DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
109DEFAULT_LINT_IGNORE_REGEX = r"$^"
110
Aiden Bennerc08566e2018-10-03 17:52:42 +0000111# File name for yapf style config files.
112YAPF_CONFIG_FILENAME = '.style.yapf'
113
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000114# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000115Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000116
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000117# Initialized in main()
118settings = None
119
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100120# Used by tests/git_cl_test.py to add extra logging.
121# Inside the weirdly failing test, add this:
122# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700123# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100124_IS_BEING_TESTED = False
125
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000126
Christopher Lamf732cd52017-01-24 12:40:11 +1100127def DieWithError(message, change_desc=None):
128 if change_desc:
129 SaveDescriptionBackup(change_desc)
130
vapiera7fbd5a2016-06-16 09:17:49 -0700131 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132 sys.exit(1)
133
134
Christopher Lamf732cd52017-01-24 12:40:11 +1100135def SaveDescriptionBackup(change_desc):
136 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000137 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100138 backup_file = open(backup_path, 'w')
139 backup_file.write(change_desc.description)
140 backup_file.close()
141
142
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000143def GetNoGitPagerEnv():
144 env = os.environ.copy()
145 # 'cat' is a magical git string that disables pagers on all platforms.
146 env['GIT_PAGER'] = 'cat'
147 return env
148
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000149
bsep@chromium.org627d9002016-04-29 00:00:52 +0000150def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000151 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000152 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000153 except subprocess2.CalledProcessError as e:
154 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000155 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000156 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000157 'Command "%s" failed.\n%s' % (
158 ' '.join(args), error_message or e.stdout or ''))
159 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000160
161
162def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000163 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000164 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000165
166
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000167def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000168 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700169 if suppress_stderr:
170 stderr = subprocess2.VOID
171 else:
172 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000173 try:
tandrii5d48c322016-08-18 16:19:37 -0700174 (out, _), code = subprocess2.communicate(['git'] + args,
175 env=GetNoGitPagerEnv(),
176 stdout=subprocess2.PIPE,
177 stderr=stderr)
178 return code, out
179 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900180 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700181 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000182
183
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000184def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000185 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000186 return RunGitWithCode(args, suppress_stderr=True)[1]
187
188
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000189def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000190 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000191 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000192 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000193 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000194
195
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000196def BranchExists(branch):
197 """Return True if specified branch exists."""
198 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
199 suppress_stderr=True)
200 return not code
201
202
tandrii2a16b952016-10-19 07:09:44 -0700203def time_sleep(seconds):
204 # Use this so that it can be mocked in tests without interfering with python
205 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700206 return time.sleep(seconds)
207
208
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000209def time_time():
210 # Use this so that it can be mocked in tests without interfering with python
211 # system machinery.
212 return time.time()
213
214
Edward Lemur1b52d872019-05-09 21:12:12 +0000215def datetime_now():
216 # Use this so that it can be mocked in tests without interfering with python
217 # system machinery.
218 return datetime.datetime.now()
219
220
maruel@chromium.org90541732011-04-01 17:54:18 +0000221def ask_for_data(prompt):
222 try:
223 return raw_input(prompt)
224 except KeyboardInterrupt:
225 # Hide the exception.
226 sys.exit(1)
227
228
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100229def confirm_or_exit(prefix='', action='confirm'):
230 """Asks user to press enter to continue or press Ctrl+C to abort."""
231 if not prefix or prefix.endswith('\n'):
232 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100233 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100234 mid = ' Press'
235 elif prefix.endswith(' '):
236 mid = 'press'
237 else:
238 mid = ' press'
239 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
240
241
242def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000243 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
245 while True:
246 if 'yes'.startswith(result):
247 return True
248 if 'no'.startswith(result):
249 return False
250 result = ask_for_data('Please, type yes or no: ').lower()
251
252
tandrii5d48c322016-08-18 16:19:37 -0700253def _git_branch_config_key(branch, key):
254 """Helper method to return Git config key for a branch."""
255 assert branch, 'branch name is required to set git config for it'
256 return 'branch.%s.%s' % (branch, key)
257
258
259def _git_get_branch_config_value(key, default=None, value_type=str,
260 branch=False):
261 """Returns git config value of given or current branch if any.
262
263 Returns default in all other cases.
264 """
265 assert value_type in (int, str, bool)
266 if branch is False: # Distinguishing default arg value from None.
267 branch = GetCurrentBranch()
268
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000269 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700270 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000271
tandrii5d48c322016-08-18 16:19:37 -0700272 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700273 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700274 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000275 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 args.append(_git_branch_config_key(branch, key))
278 code, out = RunGitWithCode(args)
279 if code == 0:
280 value = out.strip()
281 if value_type == int:
282 return int(value)
283 if value_type == bool:
284 return bool(value.lower() == 'true')
285 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000286 return default
287
288
tandrii5d48c322016-08-18 16:19:37 -0700289def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000290 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700291
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000292 If value is None, the key will be unset, otherwise it will be set.
293 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700294 """
295 if not branch:
296 branch = GetCurrentBranch()
297 assert branch, 'a branch name OR currently checked out branch is required'
298 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700299 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700300 if value is None:
301 args.append('--unset')
302 elif isinstance(value, bool):
303 args.append('--bool')
304 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700305 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000306 # `git config` also has --int, but apparently git config suffers from
307 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700308 value = str(value)
309 args.append(_git_branch_config_key(branch, key))
310 if value is not None:
311 args.append(value)
312 RunGit(args, **kwargs)
313
314
machenbach@chromium.org45453142015-09-15 08:45:22 +0000315def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000316 prop_list = getattr(options, 'properties', [])
317 properties = dict(x.split('=', 1) for x in prop_list)
machenbach@chromium.org45453142015-09-15 08:45:22 +0000318 for key, val in properties.iteritems():
319 try:
320 properties[key] = json.loads(val)
321 except ValueError:
322 pass # If a value couldn't be evaluated, treat it as a string.
323 return properties
324
325
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000326# TODO(crbug.com/976104): Remove this function once git-cl try-results has
327# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000328def _buildbucket_retry(operation_name, http, *args, **kwargs):
329 """Retries requests to buildbucket service and returns parsed json content."""
330 try_count = 0
331 while True:
332 response, content = http.request(*args, **kwargs)
333 try:
334 content_json = json.loads(content)
335 except ValueError:
336 content_json = None
337
338 # Buildbucket could return an error even if status==200.
339 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000340 error = content_json.get('error')
341 if error.get('code') == 403:
342 raise BuildbucketResponseException(
343 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000344 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000345 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000346 raise BuildbucketResponseException(msg)
347
348 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700349 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000351 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700352 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000353 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000354 content)
355 return content_json
356 if response.status < 500 or try_count >= 2:
357 raise httplib2.HttpLib2Error(content)
358
359 # status >= 500 means transient failures.
360 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000361 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 try_count += 1
363 assert False, 'unreachable'
364
365
Edward Lemur4c707a22019-09-24 21:13:43 +0000366def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000367 """Calls a buildbucket v2 method and returns the parsed json response."""
368 headers = {
369 'Accept': 'application/json',
370 'Content-Type': 'application/json',
371 }
372 request = json.dumps(request)
373 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
374
375 logging.info('POST %s with %s' % (url, request))
376
377 attempts = 1
378 time_to_sleep = 1
379 while True:
380 response, content = http.request(url, 'POST', body=request, headers=headers)
381 if response.status == 200:
382 return json.loads(content[4:])
383 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
384 msg = '%s error when calling POST %s with %s: %s' % (
385 response.status, url, request, content)
386 raise BuildbucketResponseException(msg)
387 logging.debug(
388 '%s error when calling POST %s with %s. '
389 'Sleeping for %d seconds and retrying...' % (
390 response.status, url, request, time_to_sleep))
391 time.sleep(time_to_sleep)
392 time_to_sleep *= 2
393 attempts += 1
394
395 assert False, 'unreachable'
396
397
qyearsley1fdfcb62016-10-24 13:22:03 -0700398def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700399 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000400 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700401 """
qyearsleydd49f942016-10-28 11:57:22 -0700402 # If no bots are listed, we try to get a set of builders and tests based
403 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700404 if not options.bot:
405 change = changelist.GetChange(
406 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700407 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700408 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700409 change=change,
410 changed_files=change.LocalPaths(),
411 repository_root=settings.GetRoot(),
412 default_presubmit=None,
413 project=None,
414 verbose=options.verbose,
415 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700416 if masters is None:
417 return None
Edward Lemurc8b67ed2019-09-12 20:28:58 +0000418 return {m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700419
qyearsley1fdfcb62016-10-24 13:22:03 -0700420 if options.bucket:
421 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000422 option_parser.error(
423 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700424
425
Edward Lemur6215c792019-10-03 21:59:05 +0000426def _parse_bucket(raw_bucket):
427 legacy = True
428 project = bucket = None
429 if '/' in raw_bucket:
430 legacy = False
431 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000433 elif raw_bucket.startswith('luci.'):
434 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000435 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000436 elif '.' in raw_bucket:
437 project = raw_bucket.split('.')[0]
438 bucket = raw_bucket
439 # Legacy buckets.
440 if legacy:
441 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
442 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000443
444
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800445def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000446 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700447
448 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700449 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 buckets: A nested dict mapping bucket names to builders to tests.
452 options: Command-line options.
453 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454 print('Scheduling jobs on:')
455 for bucket, builders_and_tests in sorted(buckets.iteritems()):
456 print('Bucket:', bucket)
457 print('\n'.join(
458 ' %s: %s' % (builder, tests)
459 for builder, tests in sorted(builders_and_tests.iteritems())))
460 print('To see results here, run: git cl try-results')
461 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700462
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000463 requests = _make_try_job_schedule_requests(
464 changelist, buckets, options, patchset)
465 if not requests:
466 return
467
Edward Lemurb4a587d2019-10-09 23:56:38 +0000468 http = auth.get_authenticator(auth_config).authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000469 http.force_exception_to_status_code = True
470
471 batch_request = {'requests': requests}
472 batch_response = _call_buildbucket(
473 http, options.buildbucket_host, 'Batch', batch_request)
474
475 errors = [
476 ' ' + response['error']['message']
477 for response in batch_response.get('responses', [])
478 if 'error' in response
479 ]
480 if errors:
481 raise BuildbucketResponseException(
482 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
483
484
485def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000486 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000487 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000488 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000489 shared_properties['clobber'] = True
490 shared_properties.update(_get_properties_from_options(options) or {})
491
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000492 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
493 if options.retry_failed:
494 shared_tags.append({'key': 'retry_failed',
495 'value': '1'})
496
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000497 requests = []
498 for raw_bucket, builders_and_tests in sorted(buckets.iteritems()):
499 project, bucket = _parse_bucket(raw_bucket)
500 if not project or not bucket:
501 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
502 continue
503
504 for builder, tests in sorted(builders_and_tests.iteritems()):
505 properties = shared_properties.copy()
506 if 'presubmit' in builder.lower():
507 properties['dry_run'] = 'true'
508 if tests:
509 properties['testfilter'] = tests
510
511 requests.append({
512 'scheduleBuild': {
513 'requestId': str(uuid.uuid4()),
514 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000515 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000516 'bucket': bucket,
517 'builder': builder,
518 },
519 'gerritChanges': gerrit_changes,
520 'properties': properties,
521 'tags': [
522 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000523 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000524 }
525 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000526 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000527
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528
tandrii221ab252016-10-06 08:12:04 -0700529def fetch_try_jobs(auth_config, changelist, buildbucket_host,
530 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000531 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000532
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000533 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 """
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 fields = ['id', 'builder', 'status']
536 request = {
537 'predicate': {
538 'gerritChanges': [changelist.GetGerritChange(patchset)],
539 },
540 'fields': ','.join('builds.*.' + field for field in fields),
541 }
tandrii221ab252016-10-06 08:12:04 -0700542
Edward Lemurb4a587d2019-10-09 23:56:38 +0000543 authenticator = auth.get_authenticator(auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 if authenticator.has_cached_credentials():
545 http = authenticator.authorize(httplib2.Http())
546 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700547 print('Warning: Some results might be missing because %s' %
548 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000549 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 http.force_exception_to_status_code = True
552
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000553 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
554 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000556def _fetch_latest_builds(
557 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000558 """Fetches builds from the latest patchset that has builds (within
559 the last few patchsets).
560
561 Args:
562 auth_config (auth.AuthConfig): Auth info for Buildbucket
563 changelist (Changelist): The CL to fetch builds for
564 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000565 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
566 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000568 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
569 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000570 """
571 assert buildbucket_host
572 assert changelist.GetIssue(), 'CL must be uploaded first'
573 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000574 if latest_patchset is None:
575 assert changelist.GetMostRecentPatchset()
576 ps = changelist.GetMostRecentPatchset()
577 else:
578 assert latest_patchset > 0, latest_patchset
579 ps = latest_patchset
580
Quinten Yearsley983111f2019-09-26 17:18:48 +0000581 min_ps = max(1, ps - 5)
582 while ps >= min_ps:
583 builds = fetch_try_jobs(
584 auth_config, changelist, buildbucket_host, patchset=ps)
585 if len(builds):
586 return builds, ps
587 ps -= 1
588 return [], 0
589
590
591def _filter_failed(builds):
592 """Returns a list of buckets/builders that had failed builds.
593
594 Args:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000595 builds (list): Builds, in the format returned by fetch_try_jobs,
596 i.e. a list of buildbucket.v2.Builds which includes status and builder
597 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000598
599 Returns:
600 A dict of bucket to builder to tests (empty list). This is the same format
601 accepted by _trigger_try_jobs and returned by _get_bucket_map.
602 """
603 buckets = collections.defaultdict(dict)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 for build in builds:
605 if build['status'] in ('FAILURE', 'INFRA_FAILURE'):
606 project = build['builder']['project']
607 bucket = build['builder']['bucket']
608 builder = build['builder']['builder']
Quinten Yearsley983111f2019-09-26 17:18:48 +0000609 buckets[project + '/' + bucket][builder] = []
610 return buckets
611
612
qyearsleyeab3c042016-08-24 09:18:28 -0700613def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614 """Prints nicely result of fetch_try_jobs."""
615 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000616 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000617 return
618
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000619 longest_builder = max(len(b['builder']['builder']) for b in builds)
620 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000621 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000622 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
623 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000625 builds_by_status = {}
626 for b in builds:
627 builds_by_status.setdefault(b['status'], []).append({
628 'id': b['id'],
629 'name': name_fmt.format(
630 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
631 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000633 sort_key = lambda b: (b['name'], b['id'])
634
635 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000637 if not builds:
638 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000640 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000641 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000643 else:
644 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
645
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000646 print(colorize(title))
647 for b in sorted(builds, key=sort_key):
648 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
650 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000651 print_builds(
652 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
653 print_builds(
654 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
655 color=Fore.MAGENTA)
656 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
657 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
658 color=Fore.MAGENTA)
659 print_builds('Started:', builds_by_status.pop('STARTED', []))
660 print_builds(
661 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000662 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print_builds(
664 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000665 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666
667
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668def _ComputeDiffLineRanges(files, upstream_commit):
669 """Gets the changed line ranges for each file since upstream_commit.
670
671 Parses a git diff on provided files and returns a dict that maps a file name
672 to an ordered list of range tuples in the form (start_line, count).
673 Ranges are in the same format as a git diff.
674 """
675 # If files is empty then diff_output will be a full diff.
676 if len(files) == 0:
677 return {}
678
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000679 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
681 diff_output = RunGit(diff_cmd)
682
683 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
684 # 2 capture groups
685 # 0 == fname of diff file
686 # 1 == 'diff_start,diff_count' or 'diff_start'
687 # will match each of
688 # diff --git a/foo.foo b/foo.py
689 # @@ -12,2 +14,3 @@
690 # @@ -12,2 +17 @@
691 # running re.findall on the above string with pattern will give
692 # [('foo.py', ''), ('', '14,3'), ('', '17')]
693
694 curr_file = None
695 line_diffs = {}
696 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
697 if match[0] != '':
698 # Will match the second filename in diff --git a/a.py b/b.py.
699 curr_file = match[0]
700 line_diffs[curr_file] = []
701 else:
702 # Matches +14,3
703 if ',' in match[1]:
704 diff_start, diff_count = match[1].split(',')
705 else:
706 # Single line changes are of the form +12 instead of +12,1.
707 diff_start = match[1]
708 diff_count = 1
709
710 diff_start = int(diff_start)
711 diff_count = int(diff_count)
712
713 # If diff_count == 0 this is a removal we can ignore.
714 line_diffs[curr_file].append((diff_start, diff_count))
715
716 return line_diffs
717
718
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000719def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000720 """Checks if a yapf file is in any parent directory of fpath until top_dir.
721
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000722 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000723 is found returns None. Uses yapf_config_cache as a cache for previously found
724 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000725 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000726 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000727 # Return result if we've already computed it.
728 if fpath in yapf_config_cache:
729 return yapf_config_cache[fpath]
730
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000731 parent_dir = os.path.dirname(fpath)
732 if os.path.isfile(fpath):
733 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000734 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000735 # Otherwise fpath is a directory
736 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
737 if os.path.isfile(yapf_file):
738 ret = yapf_file
739 elif fpath == top_dir or parent_dir == fpath:
740 # If we're at the top level directory, or if we're at root
741 # there is no provided style.
742 ret = None
743 else:
744 # Otherwise recurse on the current directory.
745 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000746 yapf_config_cache[fpath] = ret
747 return ret
748
749
Aaron Gable13101a62018-02-09 13:20:41 -0800750def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 """Prints statistics about the change to the user."""
752 # --no-ext-diff is broken in some versions of Git, so try to work around
753 # this by overriding the environment (but there is still a problem if the
754 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000755 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756 if 'GIT_EXTERNAL_DIFF' in env:
757 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000759 try:
760 stdout = sys.stdout.fileno()
761 except AttributeError:
762 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000763 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800764 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000765 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000766
767
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000768class BuildbucketResponseException(Exception):
769 pass
770
771
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000772class Settings(object):
773 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000774 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000775 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000776 self.tree_status_url = None
777 self.viewvc_url = None
778 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000779 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000780 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000781 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000782 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
784 def LazyUpdateIfNeeded(self):
785 """Updates the settings from a codereview.settings file, if available."""
786 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000787 # The only value that actually changes the behavior is
788 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000789 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000790 error_ok=True
791 ).strip().lower()
792
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000794 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 LoadCodereviewSettingsFromFile(cr_settings_file)
796 self.updated = True
797
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 @staticmethod
799 def GetRelativeRoot():
800 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000803 if self.root is None:
804 self.root = os.path.abspath(self.GetRelativeRoot())
805 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 def GetTreeStatusUrl(self, error_ok=False):
808 if not self.tree_status_url:
809 error_message = ('You must configure your tree status URL by running '
810 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000811 self.tree_status_url = self._GetConfig(
812 'rietveld.tree-status-url', error_ok=error_ok,
813 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.tree_status_url
815
816 def GetViewVCUrl(self):
817 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819 return self.viewvc_url
820
rmistry@google.com90752582014-01-14 21:04:50 +0000821 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000822 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000823
rmistry@google.com5626a922015-02-26 14:03:30 +0000824 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000825 run_post_upload_hook = self._GetConfig(
826 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 return run_post_upload_hook == "True"
828
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000829 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000830 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000831
ukai@chromium.orge8077812012-02-03 03:41:46 +0000832 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000833 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700835 self.is_gerrit = (
836 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 return self.is_gerrit
838
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000839 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000840 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000841 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700842 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
843 if self.squash_gerrit_uploads is None:
844 # Default is squash now (http://crbug.com/611892#c23).
845 self.squash_gerrit_uploads = not (
846 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
847 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 return self.squash_gerrit_uploads
849
tandriia60502f2016-06-20 02:01:53 -0700850 def GetSquashGerritUploadsOverride(self):
851 """Return True or False if codereview.settings should be overridden.
852
853 Returns None if no override has been defined.
854 """
855 # See also http://crbug.com/611892#c23
856 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
857 error_ok=True).strip()
858 if result == 'true':
859 return True
860 if result == 'false':
861 return False
862 return None
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
868 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000869 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 error_ok=True).strip() == 'true')
871 return self.gerrit_skip_ensure_authenticated
872
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000874 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000876 # Git requires single quotes for paths with spaces. We need to replace
877 # them with double quotes for Windows to treat such paths as a single
878 # path.
879 self.git_editor = self._GetConfig(
880 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000881 return self.git_editor or None
882
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000884 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000885 DEFAULT_LINT_REGEX)
886
887 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000888 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000889 DEFAULT_LINT_IGNORE_REGEX)
890
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000891 def _GetConfig(self, param, **kwargs):
892 self.LazyUpdateIfNeeded()
893 return RunGit(['config', param], **kwargs).strip()
894
895
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000896def ShortBranchName(branch):
897 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000898 return branch.replace('refs/heads/', '', 1)
899
900
901def GetCurrentBranchRef():
902 """Returns branch ref (e.g., refs/heads/master) or None."""
903 return RunGit(['symbolic-ref', 'HEAD'],
904 stderr=subprocess2.VOID, error_ok=True).strip() or None
905
906
907def GetCurrentBranch():
908 """Returns current branch or None.
909
910 For refs/heads/* branches, returns just last part. For others, full ref.
911 """
912 branchref = GetCurrentBranchRef()
913 if branchref:
914 return ShortBranchName(branchref)
915 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000916
917
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000918class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000919 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000920 NONE = 'none'
921 DRY_RUN = 'dry_run'
922 COMMIT = 'commit'
923
924 ALL_STATES = [NONE, DRY_RUN, COMMIT]
925
926
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000927class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000928 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000929 self.issue = issue
930 self.patchset = patchset
931 self.hostname = hostname
932
933 @property
934 def valid(self):
935 return self.issue is not None
936
937
Edward Lemurf38bc172019-09-03 21:02:13 +0000938def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
940 fail_result = _ParsedIssueNumberArgument()
941
Edward Lemur678a6842019-10-03 22:25:05 +0000942 if isinstance(arg, int):
943 return _ParsedIssueNumberArgument(issue=arg)
944 if not isinstance(arg, basestring):
945 return fail_result
946
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000947 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000948 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000949 if not arg.startswith('http'):
950 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700951
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000952 url = gclient_utils.UpgradeToHttps(arg)
953 try:
954 parsed_url = urlparse.urlparse(url)
955 except ValueError:
956 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200957
Edward Lemur678a6842019-10-03 22:25:05 +0000958 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
959 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
960 # Short urls like https://domain/<issue_number> can be used, but don't allow
961 # specifying the patchset (you'd 404), but we allow that here.
962 if parsed_url.path == '/':
963 part = parsed_url.fragment
964 else:
965 part = parsed_url.path
966
967 match = re.match(
968 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
969 if not match:
970 return fail_result
971
972 issue = int(match.group('issue'))
973 patchset = match.group('patchset')
974 return _ParsedIssueNumberArgument(
975 issue=issue,
976 patchset=int(patchset) if patchset else None,
977 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000978
979
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000980def _create_description_from_log(args):
981 """Pulls out the commit log to use as a base for the CL description."""
982 log_args = []
983 if len(args) == 1 and not args[0].endswith('.'):
984 log_args = [args[0] + '..']
985 elif len(args) == 1 and args[0].endswith('...'):
986 log_args = [args[0][:-1]]
987 elif len(args) == 2:
988 log_args = [args[0] + '..' + args[1]]
989 else:
990 log_args = args[:] # Hope for the best!
991 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
992
993
Aaron Gablea45ee112016-11-22 15:14:38 -0800994class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700995 def __init__(self, issue, url):
996 self.issue = issue
997 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800998 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700999
1000 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001001 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001002 self.issue, self.url)
1003
1004
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001006 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001007 # TODO(tandrii): these two aren't known in Gerrit.
1008 'approval', 'disapproval'])
1009
1010
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """Changelist works with one changelist in local branch.
1013
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001014 Notes:
1015 * Not safe for concurrent multi-{thread,process} use.
1016 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001017 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001018 """
1019
Edward Lemur125d60a2019-09-13 18:25:41 +00001020 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001021 """Create a new ChangeList instance.
1022
Edward Lemurf38bc172019-09-03 21:02:13 +00001023 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001026 global settings
1027 if not settings:
1028 # Happens when git_cl.py is used as a utility library.
1029 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.branchref = branchref
1032 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001033 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.branch = ShortBranchName(self.branchref)
1035 else:
1036 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001038 self.lookedup_issue = False
1039 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.has_description = False
1041 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001042 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001044 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001045 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001047 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001048
Edward Lemur125d60a2019-09-13 18:25:41 +00001049 # Lazily cached values.
1050 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1051 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1052 # Map from change number (issue) to its detail cache.
1053 self._detail_cache = {}
1054
1055 if codereview_host is not None:
1056 assert not codereview_host.startswith('https://'), codereview_host
1057 self._gerrit_host = codereview_host
1058 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001059
1060 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001061 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001062
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001063 The return value is a string suitable for passing to git cl with the --cc
1064 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065 """
1066 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001067 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001068 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1070 return self.cc
1071
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001072 def GetCCListWithoutDefault(self):
1073 """Return the users cc'd on this CL excluding default ones."""
1074 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001075 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001076 return self.cc
1077
Daniel Cheng7227d212017-11-17 08:12:37 -08001078 def ExtendCC(self, more_cc):
1079 """Extends the list of users to cc on this CL based on the changed files."""
1080 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001081
1082 def GetBranch(self):
1083 """Returns the short branch name, e.g. 'master'."""
1084 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001085 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001086 if not branchref:
1087 return None
1088 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 self.branch = ShortBranchName(self.branchref)
1090 return self.branch
1091
1092 def GetBranchRef(self):
1093 """Returns the full branch name, e.g. 'refs/heads/master'."""
1094 self.GetBranch() # Poke the lazy loader.
1095 return self.branchref
1096
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001097 def ClearBranch(self):
1098 """Clears cached branch data of this object."""
1099 self.branch = self.branchref = None
1100
tandrii5d48c322016-08-18 16:19:37 -07001101 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1102 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1103 kwargs['branch'] = self.GetBranch()
1104 return _git_get_branch_config_value(key, default, **kwargs)
1105
1106 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1107 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1108 assert self.GetBranch(), (
1109 'this CL must have an associated branch to %sset %s%s' %
1110 ('un' if value is None else '',
1111 key,
1112 '' if value is None else ' to %r' % value))
1113 kwargs['branch'] = self.GetBranch()
1114 return _git_set_branch_config_value(key, value, **kwargs)
1115
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 @staticmethod
1117 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001118 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001119 e.g. 'origin', 'refs/heads/master'
1120 """
1121 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001122 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1123
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001125 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001127 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1128 error_ok=True).strip()
1129 if upstream_branch:
1130 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001132 # Else, try to guess the origin remote.
1133 remote_branches = RunGit(['branch', '-r']).split()
1134 if 'origin/master' in remote_branches:
1135 # Fall back on origin/master if it exits.
1136 remote = 'origin'
1137 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001139 DieWithError(
1140 'Unable to determine default branch to diff against.\n'
1141 'Either pass complete "git diff"-style arguments, like\n'
1142 ' git cl upload origin/master\n'
1143 'or verify this branch is set up to track another \n'
1144 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145
1146 return remote, upstream_branch
1147
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001149 upstream_branch = self.GetUpstreamBranch()
1150 if not BranchExists(upstream_branch):
1151 DieWithError('The upstream for the current branch (%s) does not exist '
1152 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001153 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001154 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001155
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 def GetUpstreamBranch(self):
1157 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001159 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001160 upstream_branch = upstream_branch.replace('refs/heads/',
1161 'refs/remotes/%s/' % remote)
1162 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1163 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001164 self.upstream_branch = upstream_branch
1165 return self.upstream_branch
1166
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001168 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 remote, branch = None, self.GetBranch()
1170 seen_branches = set()
1171 while branch not in seen_branches:
1172 seen_branches.add(branch)
1173 remote, branch = self.FetchUpstreamTuple(branch)
1174 branch = ShortBranchName(branch)
1175 if remote != '.' or branch.startswith('refs/remotes'):
1176 break
1177 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 remotes = RunGit(['remote'], error_ok=True).split()
1179 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001181 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001183 logging.warn('Could not determine which remote this change is '
1184 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 else:
1186 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001187 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001188 branch = 'HEAD'
1189 if branch.startswith('refs/remotes'):
1190 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001191 elif branch.startswith('refs/branch-heads/'):
1192 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 else:
1194 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001195 return self._remote
1196
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001197 def GitSanityChecks(self, upstream_git_obj):
1198 """Checks git repo status and ensures diff is from local commits."""
1199
sbc@chromium.org79706062015-01-14 21:18:12 +00001200 if upstream_git_obj is None:
1201 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001202 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001203 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001204 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001205 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001206 return False
1207
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001208 # Verify the commit we're diffing against is in our current branch.
1209 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1210 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1211 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001212 print('ERROR: %s is not in the current branch. You may need to rebase '
1213 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001214 return False
1215
1216 # List the commits inside the diff, and verify they are all local.
1217 commits_in_diff = RunGit(
1218 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1219 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1220 remote_branch = remote_branch.strip()
1221 if code != 0:
1222 _, remote_branch = self.GetRemoteBranch()
1223
1224 commits_in_remote = RunGit(
1225 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1226
1227 common_commits = set(commits_in_diff) & set(commits_in_remote)
1228 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001229 print('ERROR: Your diff contains %d commits already in %s.\n'
1230 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1231 'the diff. If you are using a custom git flow, you can override'
1232 ' the reference used for this check with "git config '
1233 'gitcl.remotebranch <git-ref>".' % (
1234 len(common_commits), remote_branch, upstream_git_obj),
1235 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 return False
1237 return True
1238
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001239 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001240 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001241
1242 Returns None if it is not set.
1243 """
tandrii5d48c322016-08-18 16:19:37 -07001244 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 def GetRemoteUrl(self):
1247 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1248
1249 Returns None if there is no remote.
1250 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001251 is_cached, value = self._cached_remote_url
1252 if is_cached:
1253 return value
1254
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001255 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001256 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1257
Edward Lemur298f2cf2019-02-22 21:40:39 +00001258 # Check if the remote url can be parsed as an URL.
1259 host = urlparse.urlparse(url).netloc
1260 if host:
1261 self._cached_remote_url = (True, url)
1262 return url
1263
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001264 # If it cannot be parsed as an url, assume it is a local directory,
1265 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001266 logging.warning('"%s" doesn\'t appear to point to a git host. '
1267 'Interpreting it as a local directory.', url)
1268 if not os.path.isdir(url):
1269 logging.error(
1270 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001271 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001272 return None
1273
1274 cache_path = url
1275 url = RunGit(['config', 'remote.%s.url' % remote],
1276 error_ok=True,
1277 cwd=url).strip()
1278
1279 host = urlparse.urlparse(url).netloc
1280 if not host:
1281 logging.error(
1282 'Remote "%(remote)s" for branch "%(branch)s" points to '
1283 '"%(cache_path)s", but it is misconfigured.\n'
1284 '"%(cache_path)s" must be a git repo and must have a remote named '
1285 '"%(remote)s" pointing to the git host.', {
1286 'remote': remote,
1287 'cache_path': cache_path,
1288 'branch': self.GetBranch()})
1289 return None
1290
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001291 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001292 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001294 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001295 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001296 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001297 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001298 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 return self.issue
1301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def GetIssueURL(self):
1303 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001304 issue = self.GetIssue()
1305 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001306 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001307 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001309 def GetDescription(self, pretty=False, force=False):
1310 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001312 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001313 self.has_description = True
1314 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001315 # Set width to 72 columns + 2 space indent.
1316 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001317 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001318 lines = self.description.splitlines()
1319 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001320 return self.description
1321
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001322 def GetDescriptionFooters(self):
1323 """Returns (non_footer_lines, footers) for the commit message.
1324
1325 Returns:
1326 non_footer_lines (list(str)) - Simple list of description lines without
1327 any footer. The lines do not contain newlines, nor does the list contain
1328 the empty line between the message and the footers.
1329 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1330 [("Change-Id", "Ideadbeef...."), ...]
1331 """
1332 raw_description = self.GetDescription()
1333 msg_lines, _, footers = git_footers.split_footers(raw_description)
1334 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001335 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001336 return msg_lines, footers
1337
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001338 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001339 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001341 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001342 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001343 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001344 return self.patchset
1345
1346 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001347 """Set this branch's patchset. If patchset=0, clears the patchset."""
1348 assert self.GetBranch()
1349 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001350 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001351 else:
1352 self.patchset = int(patchset)
1353 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001354 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001356 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001357 """Set this branch's issue. If issue isn't given, clears the issue."""
1358 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001359 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001360 issue = int(issue)
1361 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001362 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001363 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001364 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001365 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001366 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001367 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001368 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001369 else:
tandrii5d48c322016-08-18 16:19:37 -07001370 # Reset all of these just to be clean.
1371 reset_suffixes = [
1372 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001373 self.IssueConfigKey(),
1374 self.PatchsetConfigKey(),
1375 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001376 ] + self._PostUnsetIssueProperties()
1377 for prop in reset_suffixes:
1378 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001379 msg = RunGit(['log', '-1', '--format=%B']).strip()
1380 if msg and git_footers.get_footer_change_id(msg):
1381 print('WARNING: The change patched into this branch has a Change-Id. '
1382 'Removing it.')
1383 RunGit(['commit', '--amend', '-m',
1384 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001385 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001386 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001387 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388
dnjba1b0f32016-09-02 12:37:42 -07001389 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001390 if not self.GitSanityChecks(upstream_branch):
1391 DieWithError('\nGit sanity check failure')
1392
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001393 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001394 if not root:
1395 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001396 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001397
1398 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001399 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001400 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001401 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001402 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001403 except subprocess2.CalledProcessError:
1404 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001405 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001406 'This branch probably doesn\'t exist anymore. To reset the\n'
1407 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001408 ' git branch --set-upstream-to origin/master %s\n'
1409 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001410 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001411
maruel@chromium.org52424302012-08-29 15:14:30 +00001412 issue = self.GetIssue()
1413 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001414 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001415 description = self.GetDescription()
1416 else:
1417 # If the change was never uploaded, use the log messages of all commits
1418 # up to the branch point, as git cl upload will prefill the description
1419 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001420 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1421 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001422
1423 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001424 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001425 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001426 name,
1427 description,
1428 absroot,
1429 files,
1430 issue,
1431 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001432 author,
1433 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001434
dsansomee2d6fd92016-09-08 00:10:47 -07001435 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001436 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001437 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001438 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001439
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001440 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1441 """Sets the description for this CL remotely.
1442
1443 You can get description_lines and footers with GetDescriptionFooters.
1444
1445 Args:
1446 description_lines (list(str)) - List of CL description lines without
1447 newline characters.
1448 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1449 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1450 `List-Of-Tokens`). It will be case-normalized so that each token is
1451 title-cased.
1452 """
1453 new_description = '\n'.join(description_lines)
1454 if footers:
1455 new_description += '\n'
1456 for k, v in footers:
1457 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1458 if not git_footers.FOOTER_PATTERN.match(foot):
1459 raise ValueError('Invalid footer %r' % foot)
1460 new_description += foot + '\n'
1461 self.UpdateDescription(new_description, force)
1462
Edward Lesmes8e282792018-04-03 18:50:29 -04001463 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1465 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001466 start = time_time()
1467 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001468 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1469 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001470 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001471 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001472 metrics.collector.add_repeated('sub_commands', {
1473 'command': 'presubmit',
1474 'execution_time': time_time() - start,
1475 'exit_code': 0 if result.should_continue() else 1,
1476 })
1477 return result
vapierfd77ac72016-06-16 08:33:57 -07001478 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001479 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001480
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001481 def CMDUpload(self, options, git_diff_args, orig_args):
1482 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001483 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001484 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001485 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001486 else:
1487 if self.GetBranch() is None:
1488 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1489
1490 # Default to diffing against common ancestor of upstream branch
1491 base_branch = self.GetCommonAncestorWithUpstream()
1492 git_diff_args = [base_branch, 'HEAD']
1493
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001494 # Fast best-effort checks to abort before running potentially expensive
1495 # hooks if uploading is likely to fail anyway. Passing these checks does
1496 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001497 self.EnsureAuthenticated(force=options.force)
1498 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001499
1500 # Apply watchlists on upload.
1501 change = self.GetChange(base_branch, None)
1502 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1503 files = [f.LocalPath() for f in change.AffectedFiles()]
1504 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001505 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001506
1507 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001508 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509 # Set the reviewer list now so that presubmit checks can access it.
1510 change_description = ChangeDescription(change.FullDescriptionText())
1511 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001512 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001513 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001514 change)
1515 change.SetDescriptionText(change_description.description)
1516 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001517 may_prompt=not options.force,
1518 verbose=options.verbose,
1519 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 if not hook_results.should_continue():
1521 return 1
1522 if not options.reviewers and hook_results.reviewers:
1523 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001524 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525
Aaron Gable13101a62018-02-09 13:20:41 -08001526 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001527 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001529 _git_set_branch_config_value('last-upload-hash',
1530 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531 # Run post upload hooks, if specified.
1532 if settings.GetRunPostUploadHook():
1533 presubmit_support.DoPostUploadExecuter(
1534 change,
1535 self,
1536 settings.GetRoot(),
1537 options.verbose,
1538 sys.stdout)
1539
1540 # Upload all dependencies if specified.
1541 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001542 print()
1543 print('--dependencies has been specified.')
1544 print('All dependent local branches will be re-uploaded.')
1545 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001546 # Remove the dependencies flag from args so that we do not end up in a
1547 # loop.
1548 orig_args.remove('--dependencies')
1549 ret = upload_branch_deps(self, orig_args)
1550 return ret
1551
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001552 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001553 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001554
1555 Issue must have been already uploaded and known.
1556 """
1557 assert new_state in _CQState.ALL_STATES
1558 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001559 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001560 vote_map = {
1561 _CQState.NONE: 0,
1562 _CQState.DRY_RUN: 1,
1563 _CQState.COMMIT: 2,
1564 }
1565 labels = {'Commit-Queue': vote_map[new_state]}
1566 notify = False if new_state == _CQState.DRY_RUN else None
1567 gerrit_util.SetReview(
1568 self._GetGerritHost(), self._GerritChangeIdentifier(),
1569 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 return 0
1571 except KeyboardInterrupt:
1572 raise
1573 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001574 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001575 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001576 ' * Your project has no CQ,\n'
1577 ' * You don\'t have permission to change the CQ state,\n'
1578 ' * There\'s a bug in this code (see stack trace below).\n'
1579 'Consider specifying which bots to trigger manually or asking your '
1580 'project owners for permissions or contacting Chrome Infra at:\n'
1581 'https://www.chromium.org/infra\n\n' %
1582 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001583 # Still raise exception so that stack trace is printed.
1584 raise
1585
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001586 def _GetGerritHost(self):
1587 # Lazy load of configs.
1588 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001589 if self._gerrit_host and '.' not in self._gerrit_host:
1590 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1591 # This happens for internal stuff http://crbug.com/614312.
1592 parsed = urlparse.urlparse(self.GetRemoteUrl())
1593 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001594 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001595 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001596 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1597 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001598 return self._gerrit_host
1599
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 def _GetGitHost(self):
1601 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001602 remote_url = self.GetRemoteUrl()
1603 if not remote_url:
1604 return None
1605 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001606
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607 def GetCodereviewServer(self):
1608 if not self._gerrit_server:
1609 # If we're on a branch then get the server potentially associated
1610 # with that branch.
1611 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001612 self._gerrit_server = self._GitGetBranchConfigValue(
1613 self.CodereviewServerConfigKey())
1614 if self._gerrit_server:
1615 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001616 if not self._gerrit_server:
1617 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1618 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001620 parts[0] = parts[0] + '-review'
1621 self._gerrit_host = '.'.join(parts)
1622 self._gerrit_server = 'https://%s' % self._gerrit_host
1623 return self._gerrit_server
1624
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001625 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001626 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001627 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001628 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001629 logging.warn('can\'t detect Gerrit project.')
1630 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001631 project = urlparse.urlparse(remote_url).path.strip('/')
1632 if project.endswith('.git'):
1633 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001634 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1635 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1636 # gitiles/git-over-https protocol. E.g.,
1637 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1638 # as
1639 # https://chromium.googlesource.com/v8/v8
1640 if project.startswith('a/'):
1641 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001642 return project
1643
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001644 def _GerritChangeIdentifier(self):
1645 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1646
1647 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001648 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001649 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001650 project = self._GetGerritProject()
1651 if project:
1652 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1653 # Fall back on still unique, but less efficient change number.
1654 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001655
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001656 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001657 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001658 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659
tandrii5d48c322016-08-18 16:19:37 -07001660 @classmethod
1661 def PatchsetConfigKey(cls):
1662 return 'gerritpatchset'
1663
1664 @classmethod
1665 def CodereviewServerConfigKey(cls):
1666 return 'gerritserver'
1667
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001668 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001669 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001670 if settings.GetGerritSkipEnsureAuthenticated():
1671 # For projects with unusual authentication schemes.
1672 # See http://crbug.com/603378.
1673 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001674
1675 # Check presence of cookies only if using cookies-based auth method.
1676 cookie_auth = gerrit_util.Authenticator.get()
1677 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001679
Daniel Chengcf6269b2019-05-18 01:02:12 +00001680 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1681 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001682 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001683 return
1684
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001685 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001686 self.GetCodereviewServer()
1687 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001688 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001689
1690 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1691 git_auth = cookie_auth.get_auth_header(git_host)
1692 if gerrit_auth and git_auth:
1693 if gerrit_auth == git_auth:
1694 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001695 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001696 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001697 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698 ' %s\n'
1699 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001700 ' Consider running the following command:\n'
1701 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001702 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001703 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001704 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001705 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001706 cookie_auth.get_new_password_message(git_host)))
1707 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001708 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001709 return
1710 else:
1711 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001712 ([] if gerrit_auth else [self._gerrit_host]) +
1713 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 DieWithError('Credentials for the following hosts are required:\n'
1715 ' %s\n'
1716 'These are read from %s (or legacy %s)\n'
1717 '%s' % (
1718 '\n '.join(missing),
1719 cookie_auth.get_gitcookies_path(),
1720 cookie_auth.get_netrc_path(),
1721 cookie_auth.get_new_password_message(git_host)))
1722
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001723 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001724 if not self.GetIssue():
1725 return
1726
1727 # Warm change details cache now to avoid RPCs later, reducing latency for
1728 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001729 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001730 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001731
1732 status = self._GetChangeDetail()['status']
1733 if status in ('MERGED', 'ABANDONED'):
1734 DieWithError('Change %s has been %s, new uploads are not allowed' %
1735 (self.GetIssueURL(),
1736 'submitted' if status == 'MERGED' else 'abandoned'))
1737
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001738 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1739 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1740 # Apparently this check is not very important? Otherwise get_auth_email
1741 # could have been added to other implementations of Authenticator.
1742 cookies_auth = gerrit_util.Authenticator.get()
1743 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001744 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001745
1746 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001747 if self.GetIssueOwner() == cookies_user:
1748 return
1749 logging.debug('change %s owner is %s, cookies user is %s',
1750 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001751 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001752 # so ask what Gerrit thinks of this user.
1753 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1754 if details['email'] == self.GetIssueOwner():
1755 return
1756 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001757 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001758 'as %s.\n'
1759 'Uploading may fail due to lack of permissions.' %
1760 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1761 confirm_or_exit(action='upload')
1762
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001763 def _PostUnsetIssueProperties(self):
1764 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001765 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001766
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001767 def GetGerritObjForPresubmit(self):
1768 return presubmit_support.GerritAccessor(self._GetGerritHost())
1769
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001770 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001771 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001772 or CQ status, assuming adherence to a common workflow.
1773
1774 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001775 * 'error' - error from review tool (including deleted issues)
1776 * 'unsent' - no reviewers added
1777 * 'waiting' - waiting for review
1778 * 'reply' - waiting for uploader to reply to review
1779 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001780 * 'dry-run' - dry-running in the CQ
1781 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001782 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 """
1784 if not self.GetIssue():
1785 return None
1786
1787 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001788 data = self._GetChangeDetail([
1789 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001790 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001791 return 'error'
1792
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001793 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001794 return 'closed'
1795
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001796 cq_label = data['labels'].get('Commit-Queue', {})
1797 max_cq_vote = 0
1798 for vote in cq_label.get('all', []):
1799 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1800 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001801 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001802 if max_cq_vote == 1:
1803 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001804
Aaron Gable9ab38c62017-04-06 14:36:33 -07001805 if data['labels'].get('Code-Review', {}).get('approved'):
1806 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807
1808 if not data.get('reviewers', {}).get('REVIEWER', []):
1809 return 'unsent'
1810
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001811 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1813 last_message_author = messages.pop().get('author', {})
1814 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001815 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1816 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001818 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 if last_message_author.get('_account_id') == owner:
1820 # Most recent message was by owner.
1821 return 'waiting'
1822 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001823 # Some reply from non-owner.
1824 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001825
1826 # Somehow there are no messages even though there are reviewers.
1827 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001828
1829 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001830 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001831 patchset = data['revisions'][data['current_revision']]['_number']
1832 self.SetPatchset(patchset)
1833 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001834
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001835 def FetchDescription(self, force=False):
1836 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1837 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001838 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001839 return data['revisions'][current_rev]['commit']['message'].encode(
1840 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841
dsansomee2d6fd92016-09-08 00:10:47 -07001842 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001843 if gerrit_util.HasPendingChangeEdit(
1844 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001845 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001846 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001847 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001848 'unpublished edit. Either publish the edit in the Gerrit web UI '
1849 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001850
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001851 gerrit_util.DeletePendingChangeEdit(
1852 self._GetGerritHost(), self._GerritChangeIdentifier())
1853 gerrit_util.SetCommitMessage(
1854 self._GetGerritHost(), self._GerritChangeIdentifier(),
1855 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001856
Aaron Gable636b13f2017-07-14 10:42:48 -07001857 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001858 gerrit_util.SetReview(
1859 self._GetGerritHost(), self._GerritChangeIdentifier(),
1860 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001861
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001862 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001863 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001864 # CURRENT_REVISION is included to get the latest patchset so that
1865 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001866 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001867 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1868 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001869 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001870 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001871 robot_file_comments = gerrit_util.GetChangeRobotComments(
1872 self._GetGerritHost(), self._GerritChangeIdentifier())
1873
1874 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001875 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001876 latest_patch_set = self.GetMostRecentPatchset()
1877 for path, robot_comments in robot_file_comments.iteritems():
1878 line_comments = file_comments.setdefault(path, [])
1879 line_comments.extend(
1880 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001881
1882 # Build dictionary of file comments for easy access and sorting later.
1883 # {author+date: {path: {patchset: {line: url+message}}}}
1884 comments = collections.defaultdict(
1885 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
1886 for path, line_comments in file_comments.iteritems():
1887 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001888 tag = comment.get('tag', '')
1889 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001890 continue
1891 key = (comment['author']['email'], comment['updated'])
1892 if comment.get('side', 'REVISION') == 'PARENT':
1893 patchset = 'Base'
1894 else:
1895 patchset = 'PS%d' % comment['patch_set']
1896 line = comment.get('line', 0)
1897 url = ('https://%s/c/%s/%s/%s#%s%s' %
1898 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1899 'b' if comment.get('side') == 'PARENT' else '',
1900 str(line) if line else ''))
1901 comments[key][path][patchset][line] = (url, comment['message'])
1902
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001904 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001905 summary = self._BuildCommentSummary(msg, comments, readable)
1906 if summary:
1907 summaries.append(summary)
1908 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001909
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001910 @staticmethod
1911 def _BuildCommentSummary(msg, comments, readable):
1912 key = (msg['author']['email'], msg['date'])
1913 # Don't bother showing autogenerated messages that don't have associated
1914 # file or line comments. this will filter out most autogenerated
1915 # messages, but will keep robot comments like those from Tricium.
1916 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1917 if is_autogenerated and not comments.get(key):
1918 return None
1919 message = msg['message']
1920 # Gerrit spits out nanoseconds.
1921 assert len(msg['date'].split('.')[-1]) == 9
1922 date = datetime.datetime.strptime(msg['date'][:-3],
1923 '%Y-%m-%d %H:%M:%S.%f')
1924 if key in comments:
1925 message += '\n'
1926 for path, patchsets in sorted(comments.get(key, {}).items()):
1927 if readable:
1928 message += '\n%s' % path
1929 for patchset, lines in sorted(patchsets.items()):
1930 for line, (url, content) in sorted(lines.items()):
1931 if line:
1932 line_str = 'Line %d' % line
1933 path_str = '%s:%d:' % (path, line)
1934 else:
1935 line_str = 'File comment'
1936 path_str = '%s:0:' % path
1937 if readable:
1938 message += '\n %s, %s: %s' % (patchset, line_str, url)
1939 message += '\n %s\n' % content
1940 else:
1941 message += '\n%s ' % path_str
1942 message += '\n%s\n' % content
1943
1944 return _CommentSummary(
1945 date=date,
1946 message=message,
1947 sender=msg['author']['email'],
1948 autogenerated=is_autogenerated,
1949 # These could be inferred from the text messages and correlated with
1950 # Code-Review label maximum, however this is not reliable.
1951 # Leaving as is until the need arises.
1952 approval=False,
1953 disapproval=False,
1954 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001955
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001956 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001957 gerrit_util.AbandonChange(
1958 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001960 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001961 gerrit_util.SubmitChange(
1962 self._GetGerritHost(), self._GerritChangeIdentifier(),
1963 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001964
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001965 def _GetChangeDetail(self, options=None, no_cache=False):
1966 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001967
1968 If fresh data is needed, set no_cache=True which will clear cache and
1969 thus new data will be fetched from Gerrit.
1970 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001971 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001972 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001973
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001974 # Optimization to avoid multiple RPCs:
1975 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1976 'CURRENT_COMMIT' not in options):
1977 options.append('CURRENT_COMMIT')
1978
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001979 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001980 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001981 options = [o.upper() for o in options]
1982
1983 # Check in cache first unless no_cache is True.
1984 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001985 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001986 else:
1987 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001988 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001989 # Assumption: data fetched before with extra options is suitable
1990 # for return for a smaller set of options.
1991 # For example, if we cached data for
1992 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1993 # and request is for options=[CURRENT_REVISION],
1994 # THEN we can return prior cached data.
1995 if options_set.issubset(cached_options_set):
1996 return data
1997
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001998 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001999 data = gerrit_util.GetChangeDetail(
2000 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002001 except gerrit_util.GerritError as e:
2002 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002003 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002004 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002005
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002006 self._detail_cache.setdefault(cache_key, []).append(
2007 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002008 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002009
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002010 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002011 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002012 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002013 data = gerrit_util.GetChangeCommit(
2014 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002015 except gerrit_util.GerritError as e:
2016 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002017 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002018 raise
agable32978d92016-11-01 12:55:02 -07002019 return data
2020
Karen Qian40c19422019-03-13 21:28:29 +00002021 def _IsCqConfigured(self):
2022 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002023 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002024 return False
2025 # TODO(crbug/753213): Remove temporary hack
2026 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002027 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002028 detail['branch'].startswith('refs/branch-heads/')):
2029 return False
2030 return True
2031
Olivier Robin75ee7252018-04-13 10:02:56 +02002032 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033 if git_common.is_dirty_git_tree('land'):
2034 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002035
tandriid60367b2016-06-22 05:25:12 -07002036 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002037 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002038 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002039 'which can test and land changes for you. '
2040 'Are you sure you wish to bypass it?\n',
2041 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002042 differs = True
tandriic4344b52016-08-29 06:04:54 -07002043 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 # Note: git diff outputs nothing if there is no diff.
2045 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002046 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002047 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002048 if detail['current_revision'] == last_upload:
2049 differs = False
2050 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002051 print('WARNING: Local branch contents differ from latest uploaded '
2052 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002053 if differs:
2054 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002055 confirm_or_exit(
2056 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2057 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002058 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 elif not bypass_hooks:
2060 hook_results = self.RunHook(
2061 committing=True,
2062 may_prompt=not force,
2063 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002064 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2065 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 if not hook_results.should_continue():
2067 return 1
2068
2069 self.SubmitIssue(wait_for_merge=True)
2070 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002071 links = self._GetChangeCommit().get('web_links', [])
2072 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002073 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002074 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002075 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002076 return 0
2077
Edward Lemurf38bc172019-09-03 21:02:13 +00002078 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002079 assert parsed_issue_arg.valid
2080
Edward Lemur125d60a2019-09-13 18:25:41 +00002081 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002082
2083 if parsed_issue_arg.hostname:
2084 self._gerrit_host = parsed_issue_arg.hostname
2085 self._gerrit_server = 'https://%s' % self._gerrit_host
2086
tandriic2405f52016-10-10 08:13:15 -07002087 try:
2088 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002089 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002090 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091
2092 if not parsed_issue_arg.patchset:
2093 # Use current revision by default.
2094 revision_info = detail['revisions'][detail['current_revision']]
2095 patchset = int(revision_info['_number'])
2096 else:
2097 patchset = parsed_issue_arg.patchset
2098 for revision_info in detail['revisions'].itervalues():
2099 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2100 break
2101 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002102 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 (parsed_issue_arg.patchset, self.GetIssue()))
2104
Edward Lemur125d60a2019-09-13 18:25:41 +00002105 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002106 if remote_url.endswith('.git'):
2107 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002108 remote_url = remote_url.rstrip('/')
2109
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002110 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002111 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002112
2113 if remote_url != fetch_info['url']:
2114 DieWithError('Trying to patch a change from %s but this repo appears '
2115 'to be %s.' % (fetch_info['url'], remote_url))
2116
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002118
Aaron Gable62619a32017-06-16 08:22:09 -07002119 if force:
2120 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2121 print('Checked out commit for change %i patchset %i locally' %
2122 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002123 elif nocommit:
2124 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2125 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002126 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002127 RunGit(['cherry-pick', 'FETCH_HEAD'])
2128 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002129 (parsed_issue_arg.issue, patchset))
2130 print('Note: this created a local commit which does not have '
2131 'the same hash as the one uploaded for review. This will make '
2132 'uploading changes based on top of this branch difficult.\n'
2133 'If you want to do that, use "git cl patch --force" instead.')
2134
Stefan Zagerd08043c2017-10-12 12:07:02 -07002135 if self.GetBranch():
2136 self.SetIssue(parsed_issue_arg.issue)
2137 self.SetPatchset(patchset)
2138 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2139 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2140 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2141 else:
2142 print('WARNING: You are in detached HEAD state.\n'
2143 'The patch has been applied to your checkout, but you will not be '
2144 'able to upload a new patch set to the gerrit issue.\n'
2145 'Try using the \'-b\' option if you would like to work on a '
2146 'branch and/or upload a new patch set.')
2147
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002148 return 0
2149
tandrii16e0b4e2016-06-07 10:34:28 -07002150 def _GerritCommitMsgHookCheck(self, offer_removal):
2151 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2152 if not os.path.exists(hook):
2153 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002154 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2155 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002156 data = gclient_utils.FileRead(hook)
2157 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2158 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002159 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002160 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002161 'and may interfere with it in subtle ways.\n'
2162 'We recommend you remove the commit-msg hook.')
2163 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002164 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002165 gclient_utils.rm_file_or_tree(hook)
2166 print('Gerrit commit-msg hook removed.')
2167 else:
2168 print('OK, will keep Gerrit commit-msg hook in place.')
2169
Edward Lemur1b52d872019-05-09 21:12:12 +00002170 def _CleanUpOldTraces(self):
2171 """Keep only the last |MAX_TRACES| traces."""
2172 try:
2173 traces = sorted([
2174 os.path.join(TRACES_DIR, f)
2175 for f in os.listdir(TRACES_DIR)
2176 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2177 and not f.startswith('tmp'))
2178 ])
2179 traces_to_delete = traces[:-MAX_TRACES]
2180 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002181 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002182 except OSError:
2183 print('WARNING: Failed to remove old git traces from\n'
2184 ' %s'
2185 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002186
Edward Lemur5737f022019-05-17 01:24:00 +00002187 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002188 """Zip and write the git push traces stored in traces_dir."""
2189 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002190 traces_zip = trace_name + '-traces'
2191 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002192 # Create a temporary dir to store git config and gitcookies in. It will be
2193 # compressed and stored next to the traces.
2194 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002195 git_info_zip = trace_name + '-git-info'
2196
Edward Lemur5737f022019-05-17 01:24:00 +00002197 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002198 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002199 git_push_metadata['now'] = git_push_metadata['now'].decode(
2200 sys.stdin.encoding)
2201
Edward Lemur1b52d872019-05-09 21:12:12 +00002202 git_push_metadata['trace_name'] = trace_name
2203 gclient_utils.FileWrite(
2204 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2205
2206 # Keep only the first 6 characters of the git hashes on the packet
2207 # trace. This greatly decreases size after compression.
2208 packet_traces = os.path.join(traces_dir, 'trace-packet')
2209 if os.path.isfile(packet_traces):
2210 contents = gclient_utils.FileRead(packet_traces)
2211 gclient_utils.FileWrite(
2212 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2213 shutil.make_archive(traces_zip, 'zip', traces_dir)
2214
2215 # Collect and compress the git config and gitcookies.
2216 git_config = RunGit(['config', '-l'])
2217 gclient_utils.FileWrite(
2218 os.path.join(git_info_dir, 'git-config'),
2219 git_config)
2220
2221 cookie_auth = gerrit_util.Authenticator.get()
2222 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2223 gitcookies_path = cookie_auth.get_gitcookies_path()
2224 if os.path.isfile(gitcookies_path):
2225 gitcookies = gclient_utils.FileRead(gitcookies_path)
2226 gclient_utils.FileWrite(
2227 os.path.join(git_info_dir, 'gitcookies'),
2228 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2229 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2230
Edward Lemur1b52d872019-05-09 21:12:12 +00002231 gclient_utils.rmtree(git_info_dir)
2232
2233 def _RunGitPushWithTraces(
2234 self, change_desc, refspec, refspec_opts, git_push_metadata):
2235 """Run git push and collect the traces resulting from the execution."""
2236 # Create a temporary directory to store traces in. Traces will be compressed
2237 # and stored in a 'traces' dir inside depot_tools.
2238 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002239 trace_name = os.path.join(
2240 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002241
2242 env = os.environ.copy()
2243 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2244 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002245 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002246 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2247 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2248 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2249
2250 try:
2251 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002252 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002253 before_push = time_time()
2254 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002255 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002256 env=env,
2257 print_stdout=True,
2258 # Flush after every line: useful for seeing progress when running as
2259 # recipe.
2260 filter_fn=lambda _: sys.stdout.flush())
2261 except subprocess2.CalledProcessError as e:
2262 push_returncode = e.returncode
2263 DieWithError('Failed to create a change. Please examine output above '
2264 'for the reason of the failure.\n'
2265 'Hint: run command below to diagnose common Git/Gerrit '
2266 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002267 ' git cl creds-check\n'
2268 '\n'
2269 'If git-cl is not working correctly, file a bug under the '
2270 'Infra>SDK component including the files below.\n'
2271 'Review the files before upload, since they might contain '
2272 'sensitive information.\n'
2273 'Set the Restrict-View-Google label so that they are not '
2274 'publicly accessible.\n'
2275 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002276 change_desc)
2277 finally:
2278 execution_time = time_time() - before_push
2279 metrics.collector.add_repeated('sub_commands', {
2280 'command': 'git push',
2281 'execution_time': execution_time,
2282 'exit_code': push_returncode,
2283 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2284 })
2285
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 git_push_metadata['execution_time'] = execution_time
2287 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002288 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289
Edward Lemur1b52d872019-05-09 21:12:12 +00002290 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002291 gclient_utils.rmtree(traces_dir)
2292
2293 return push_stdout
2294
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002295 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002296 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002297 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002298 # Load default for user, repo, squash=true, in this order.
2299 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002300
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002302 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002303 # This may be None; default fallback value is determined in logic below.
2304 title = options.title
2305
Dominic Battre7d1c4842017-10-27 09:17:28 +02002306 # Extract bug number from branch name.
2307 bug = options.bug
2308 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2309 if not bug and match:
2310 bug = match.group(1)
2311
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002313 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002314 if self.GetIssue():
2315 # Try to get the message from a previous upload.
2316 message = self.GetDescription()
2317 if not message:
2318 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002319 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002320 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002321 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002322 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002323 # When uploading a subsequent patchset, -m|--message is taken
2324 # as the patchset title if --title was not provided.
2325 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002326 else:
2327 default_title = RunGit(
2328 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002329 if options.force:
2330 title = default_title
2331 else:
2332 title = ask_for_data(
2333 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002334 change_id = self._GetChangeDetail()['change_id']
2335 while True:
2336 footer_change_ids = git_footers.get_footer_change_id(message)
2337 if footer_change_ids == [change_id]:
2338 break
2339 if not footer_change_ids:
2340 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002341 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 continue
2343 # There is already a valid footer but with different or several ids.
2344 # Doing this automatically is non-trivial as we don't want to lose
2345 # existing other footers, yet we want to append just 1 desired
2346 # Change-Id. Thus, just create a new footer, but let user verify the
2347 # new description.
2348 message = '%s\n\nChange-Id: %s' % (message, change_id)
Anthony Polito8b955342019-09-24 19:01:36 +00002349 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002351 print(
2352 'WARNING: change %s has Change-Id footer(s):\n'
2353 ' %s\n'
2354 'but change has Change-Id %s, according to Gerrit.\n'
2355 'Please, check the proposed correction to the description, '
2356 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2357 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2358 change_id))
2359 confirm_or_exit(action='edit')
2360 change_desc.prompt()
2361
2362 message = change_desc.description
2363 if not message:
2364 DieWithError("Description is empty. Aborting...")
2365
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002366 # Continue the while loop.
2367 # Sanity check of this code - we should end up with proper message
2368 # footer.
2369 assert [change_id] == git_footers.get_footer_change_id(message)
Anthony Polito8b955342019-09-24 19:01:36 +00002370 change_desc = ChangeDescription(message, bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002371 else: # if not self.GetIssue()
2372 if options.message:
2373 message = options.message
2374 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002375 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002376 if options.title:
2377 message = options.title + '\n\n' + message
Anthony Polito8b955342019-09-24 19:01:36 +00002378 change_desc = ChangeDescription(message, bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002380 change_desc.prompt()
2381
Aaron Gableb56ad332017-01-06 15:24:31 -08002382 # On first upload, patchset title is always this string, while
2383 # --title flag gets converted to first line of message.
2384 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002385 if not change_desc.description:
2386 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002387 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 if len(change_ids) > 1:
2389 DieWithError('too many Change-Id footers, at most 1 allowed.')
2390 if not change_ids:
2391 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002392 change_desc.set_description(git_footers.add_footer_change_id(
2393 change_desc.description,
2394 GenerateGerritChangeId(change_desc.description)))
2395 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 assert len(change_ids) == 1
2397 change_id = change_ids[0]
2398
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002399 if options.reviewers or options.tbrs or options.add_owners_to:
2400 change_desc.update_reviewers(options.reviewers, options.tbrs,
2401 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002402 if options.preserve_tryjobs:
2403 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002404
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002405 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002406 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2407 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002408 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002409 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2410 desc_tempfile.write(change_desc.description)
2411 desc_tempfile.close()
2412 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2413 '-F', desc_tempfile.name]).strip()
2414 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002415 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002417 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002418 if not change_desc.description:
2419 DieWithError("Description is empty. Aborting...")
2420
2421 if not git_footers.get_footer_change_id(change_desc.description):
2422 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002423 change_desc.set_description(
2424 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002425 if options.reviewers or options.tbrs or options.add_owners_to:
2426 change_desc.update_reviewers(options.reviewers, options.tbrs,
2427 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002428 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002429 # For no-squash mode, we assume the remote called "origin" is the one we
2430 # want. It is not worthwhile to support different workflows for
2431 # no-squash mode.
2432 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2434
2435 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002436 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002437 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2438 ref_to_push)]).splitlines()
2439 if len(commits) > 1:
2440 print('WARNING: This will upload %d commits. Run the following command '
2441 'to see which commits will be uploaded: ' % len(commits))
2442 print('git log %s..%s' % (parent, ref_to_push))
2443 print('You can also use `git squash-branch` to squash these into a '
2444 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002445 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002446
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002447 if options.reviewers or options.tbrs or options.add_owners_to:
2448 change_desc.update_reviewers(options.reviewers, options.tbrs,
2449 options.add_owners_to, change)
2450
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002451 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002452 cc = []
2453 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2454 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2455 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002456 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002457 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002458 if options.cc:
2459 cc.extend(options.cc)
2460 cc = filter(None, [email.strip() for email in cc])
2461 if change_desc.get_cced():
2462 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002463 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2464 valid_accounts = set(reviewers + cc)
2465 # TODO(crbug/877717): relax this for all hosts.
2466 else:
2467 valid_accounts = gerrit_util.ValidAccounts(
2468 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002469 logging.info('accounts %s are recognized, %s invalid',
2470 sorted(valid_accounts),
2471 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002472
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002473 # Extra options that can be specified at push time. Doc:
2474 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002475 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002476
Aaron Gable844cf292017-06-28 11:32:59 -07002477 # By default, new changes are started in WIP mode, and subsequent patchsets
2478 # don't send email. At any time, passing --send-mail will mark the change
2479 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002480 if options.send_mail:
2481 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002482 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002483 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002484 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002485 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002486 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002487
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002488 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002489 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002490
Aaron Gable9b713dd2016-12-14 16:04:21 -08002491 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002492 # Punctuation and whitespace in |title| must be percent-encoded.
2493 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002494
agablec6787972016-09-09 16:13:34 -07002495 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002496 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002497
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002498 for r in sorted(reviewers):
2499 if r in valid_accounts:
2500 refspec_opts.append('r=%s' % r)
2501 reviewers.remove(r)
2502 else:
2503 # TODO(tandrii): this should probably be a hard failure.
2504 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2505 % r)
2506 for c in sorted(cc):
2507 # refspec option will be rejected if cc doesn't correspond to an
2508 # account, even though REST call to add such arbitrary cc may succeed.
2509 if c in valid_accounts:
2510 refspec_opts.append('cc=%s' % c)
2511 cc.remove(c)
2512
rmistry9eadede2016-09-19 11:22:43 -07002513 if options.topic:
2514 # Documentation on Gerrit topics is here:
2515 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002516 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002517
Edward Lemur687ca902018-12-05 02:30:30 +00002518 if options.enable_auto_submit:
2519 refspec_opts.append('l=Auto-Submit+1')
2520 if options.use_commit_queue:
2521 refspec_opts.append('l=Commit-Queue+2')
2522 elif options.cq_dry_run:
2523 refspec_opts.append('l=Commit-Queue+1')
2524
2525 if change_desc.get_reviewers(tbr_only=True):
2526 score = gerrit_util.GetCodeReviewTbrScore(
2527 self._GetGerritHost(),
2528 self._GetGerritProject())
2529 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002530
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002531 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002532 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002533 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002534 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002535 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2536
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002537 refspec_suffix = ''
2538 if refspec_opts:
2539 refspec_suffix = '%' + ','.join(refspec_opts)
2540 assert ' ' not in refspec_suffix, (
2541 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2542 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2543
Edward Lemur1b52d872019-05-09 21:12:12 +00002544 git_push_metadata = {
2545 'gerrit_host': self._GetGerritHost(),
2546 'title': title or '<untitled>',
2547 'change_id': change_id,
2548 'description': change_desc.description,
2549 }
2550 push_stdout = self._RunGitPushWithTraces(
2551 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002552
2553 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002554 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002555 change_numbers = [m.group(1)
2556 for m in map(regex.match, push_stdout.splitlines())
2557 if m]
2558 if len(change_numbers) != 1:
2559 DieWithError(
2560 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002561 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002562 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002563 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002564
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002565 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002566 # GetIssue() is not set in case of non-squash uploads according to tests.
2567 # TODO(agable): non-squash uploads in git cl should be removed.
2568 gerrit_util.AddReviewers(
2569 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002570 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002571 reviewers, cc,
2572 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002573
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002574 return 0
2575
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002576 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2577 change_desc):
2578 """Computes parent of the generated commit to be uploaded to Gerrit.
2579
2580 Returns revision or a ref name.
2581 """
2582 if custom_cl_base:
2583 # Try to avoid creating additional unintended CLs when uploading, unless
2584 # user wants to take this risk.
2585 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2586 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2587 local_ref_of_target_remote])
2588 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002589 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002590 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2591 'If you proceed with upload, more than 1 CL may be created by '
2592 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2593 'If you are certain that specified base `%s` has already been '
2594 'uploaded to Gerrit as another CL, you may proceed.\n' %
2595 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2596 if not force:
2597 confirm_or_exit(
2598 'Do you take responsibility for cleaning up potential mess '
2599 'resulting from proceeding with upload?',
2600 action='upload')
2601 return custom_cl_base
2602
Aaron Gablef97e33d2017-03-30 15:44:27 -07002603 if remote != '.':
2604 return self.GetCommonAncestorWithUpstream()
2605
2606 # If our upstream branch is local, we base our squashed commit on its
2607 # squashed version.
2608 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2609
Aaron Gablef97e33d2017-03-30 15:44:27 -07002610 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002611 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002612
2613 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002614 # TODO(tandrii): consider checking parent change in Gerrit and using its
2615 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2616 # the tree hash of the parent branch. The upside is less likely bogus
2617 # requests to reupload parent change just because it's uploadhash is
2618 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002619 parent = RunGit(['config',
2620 'branch.%s.gerritsquashhash' % upstream_branch_name],
2621 error_ok=True).strip()
2622 # Verify that the upstream branch has been uploaded too, otherwise
2623 # Gerrit will create additional CLs when uploading.
2624 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2625 RunGitSilent(['rev-parse', parent + ':'])):
2626 DieWithError(
2627 '\nUpload upstream branch %s first.\n'
2628 'It is likely that this branch has been rebased since its last '
2629 'upload, so you just need to upload it again.\n'
2630 '(If you uploaded it with --no-squash, then branch dependencies '
2631 'are not supported, and you should reupload with --squash.)'
2632 % upstream_branch_name,
2633 change_desc)
2634 return parent
2635
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002636 def _AddChangeIdToCommitMessage(self, options, args):
2637 """Re-commits using the current message, assumes the commit hook is in
2638 place.
2639 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002640 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002641 git_command = ['commit', '--amend', '-m', log_desc]
2642 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002643 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002644 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002645 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002646 return new_log_desc
2647 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002648 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002649
tandriie113dfd2016-10-11 10:20:12 -07002650 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002651 try:
2652 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002653 except GerritChangeNotExists:
2654 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002655
2656 if data['status'] in ('ABANDONED', 'MERGED'):
2657 return 'CL %s is closed' % self.GetIssue()
2658
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002659 def GetGerritChange(self, patchset=None):
2660 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2661 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2662 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002663 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002664 data = self._GetChangeDetail(['ALL_REVISIONS'])
2665
2666 assert host and issue and patchset, 'CL must be uploaded first'
2667
2668 has_patchset = any(
2669 int(revision_data['_number']) == patchset
2670 for revision_data in data['revisions'].itervalues())
2671 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002672 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002673 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002674
tandrii8c5a3532016-11-04 07:52:02 -07002675 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002676 'host': host,
2677 'change': issue,
2678 'project': data['project'],
2679 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002680 }
tandriie113dfd2016-10-11 10:20:12 -07002681
tandriide281ae2016-10-12 06:02:30 -07002682 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002683 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002684
Edward Lemur707d70b2018-02-07 00:50:14 +01002685 def GetReviewers(self):
2686 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002687 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002688
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002689
2690_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002691 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002692}
2693
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002694
iannuccie53c9352016-08-17 14:40:40 -07002695def _add_codereview_issue_select_options(parser, extra=""):
2696 _add_codereview_select_options(parser)
2697
2698 text = ('Operate on this issue number instead of the current branch\'s '
2699 'implicit issue.')
2700 if extra:
2701 text += ' '+extra
2702 parser.add_option('-i', '--issue', type=int, help=text)
2703
2704
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002705def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002706 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002707 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002708 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002709 parser.add_option_group(parser.codereview_group)
2710 parser.codereview_group.add_option(
2711 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002712 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002713
2714
tandriif9aefb72016-07-01 09:06:51 -07002715def _get_bug_line_values(default_project, bugs):
2716 """Given default_project and comma separated list of bugs, yields bug line
2717 values.
2718
2719 Each bug can be either:
2720 * a number, which is combined with default_project
2721 * string, which is left as is.
2722
2723 This function may produce more than one line, because bugdroid expects one
2724 project per line.
2725
2726 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2727 ['v8:123', 'chromium:789']
2728 """
2729 default_bugs = []
2730 others = []
2731 for bug in bugs.split(','):
2732 bug = bug.strip()
2733 if bug:
2734 try:
2735 default_bugs.append(int(bug))
2736 except ValueError:
2737 others.append(bug)
2738
2739 if default_bugs:
2740 default_bugs = ','.join(map(str, default_bugs))
2741 if default_project:
2742 yield '%s:%s' % (default_project, default_bugs)
2743 else:
2744 yield default_bugs
2745 for other in sorted(others):
2746 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2747 yield other
2748
2749
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002750class ChangeDescription(object):
2751 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002752 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002753 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002754 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002755 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002756 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2757 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2758 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2759 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002760
Anthony Polito8b955342019-09-24 19:01:36 +00002761 def __init__(self, description, bug=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002762 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002763 if bug:
2764 regexp = re.compile(self.BUG_LINE)
2765 prefix = settings.GetBugPrefix()
2766 if not any((regexp.match(line) for line in self._description_lines)):
2767 values = list(_get_bug_line_values(prefix, bug))
2768 self.append_footer('Bug: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769
agable@chromium.org42c20792013-09-12 17:34:49 +00002770 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002771 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002772 return '\n'.join(self._description_lines)
2773
2774 def set_description(self, desc):
2775 if isinstance(desc, basestring):
2776 lines = desc.splitlines()
2777 else:
2778 lines = [line.rstrip() for line in desc]
2779 while lines and not lines[0]:
2780 lines.pop(0)
2781 while lines and not lines[-1]:
2782 lines.pop(-1)
2783 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002784
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002785 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2786 """Rewrites the R=/TBR= line(s) as a single line each.
2787
2788 Args:
2789 reviewers (list(str)) - list of additional emails to use for reviewers.
2790 tbrs (list(str)) - list of additional emails to use for TBRs.
2791 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2792 the change that are missing OWNER coverage. If this is not None, you
2793 must also pass a value for `change`.
2794 change (Change) - The Change that should be used for OWNERS lookups.
2795 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002796 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 assert isinstance(tbrs, list), tbrs
2798
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002799 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002800 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002801
2802 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002803 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002804
2805 reviewers = set(reviewers)
2806 tbrs = set(tbrs)
2807 LOOKUP = {
2808 'TBR': tbrs,
2809 'R': reviewers,
2810 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002811
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002812 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002813 regexp = re.compile(self.R_LINE)
2814 matches = [regexp.match(line) for line in self._description_lines]
2815 new_desc = [l for i, l in enumerate(self._description_lines)
2816 if not matches[i]]
2817 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002818
agable@chromium.org42c20792013-09-12 17:34:49 +00002819 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002820
2821 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002822 for match in matches:
2823 if not match:
2824 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002825 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2826
2827 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002828 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002829 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002830 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002831 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002832 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002833 LOOKUP[add_owners_to].update(
2834 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002835
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002836 # If any folks ended up in both groups, remove them from tbrs.
2837 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002838
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002839 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2840 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002841
2842 # Put the new lines in the description where the old first R= line was.
2843 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2844 if 0 <= line_loc < len(self._description_lines):
2845 if new_tbr_line:
2846 self._description_lines.insert(line_loc, new_tbr_line)
2847 if new_r_line:
2848 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002849 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 if new_r_line:
2851 self.append_footer(new_r_line)
2852 if new_tbr_line:
2853 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002854
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002855 def set_preserve_tryjobs(self):
2856 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2857 footers = git_footers.parse_footers(self.description)
2858 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2859 if v.lower() == 'true':
2860 return
2861 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2862
Anthony Polito8b955342019-09-24 19:01:36 +00002863 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002864 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002865 self.set_description([
2866 '# Enter a description of the change.',
2867 '# This will be displayed on the codereview site.',
2868 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002869 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002870 '--------------------',
2871 ] + self._description_lines)
agable@chromium.org42c20792013-09-12 17:34:49 +00002872 regexp = re.compile(self.BUG_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002873 prefix = settings.GetBugPrefix()
agable@chromium.org42c20792013-09-12 17:34:49 +00002874 if not any((regexp.match(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002875 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002876
agable@chromium.org42c20792013-09-12 17:34:49 +00002877 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002878 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002879 if not content:
2880 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002881 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002882
Bruce Dawson2377b012018-01-11 16:46:49 -08002883 # Strip off comments and default inserted "Bug:" line.
2884 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002885 (line.startswith('#') or
2886 line.rstrip() == "Bug:" or
2887 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002888 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002889 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002890 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002891
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002893 """Adds a footer line to the description.
2894
2895 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2896 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2897 that Gerrit footers are always at the end.
2898 """
2899 parsed_footer_line = git_footers.parse_footer(line)
2900 if parsed_footer_line:
2901 # Line is a gerrit footer in the form: Footer-Key: any value.
2902 # Thus, must be appended observing Gerrit footer rules.
2903 self.set_description(
2904 git_footers.add_footer(self.description,
2905 key=parsed_footer_line[0],
2906 value=parsed_footer_line[1]))
2907 return
2908
2909 if not self._description_lines:
2910 self._description_lines.append(line)
2911 return
2912
2913 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2914 if gerrit_footers:
2915 # git_footers.split_footers ensures that there is an empty line before
2916 # actual (gerrit) footers, if any. We have to keep it that way.
2917 assert top_lines and top_lines[-1] == ''
2918 top_lines, separator = top_lines[:-1], top_lines[-1:]
2919 else:
2920 separator = [] # No need for separator if there are no gerrit_footers.
2921
2922 prev_line = top_lines[-1] if top_lines else ''
2923 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2924 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2925 top_lines.append('')
2926 top_lines.append(line)
2927 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002928
tandrii99a72f22016-08-17 14:33:24 -07002929 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002930 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002931 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002932 reviewers = [match.group(2).strip()
2933 for match in matches
2934 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002935 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002936
bradnelsond975b302016-10-23 12:20:23 -07002937 def get_cced(self):
2938 """Retrieves the list of reviewers."""
2939 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2940 cced = [match.group(2).strip() for match in matches if match]
2941 return cleanup_list(cced)
2942
Nodir Turakulov23b82142017-11-16 11:04:25 -08002943 def get_hash_tags(self):
2944 """Extracts and sanitizes a list of Gerrit hashtags."""
2945 subject = (self._description_lines or ('',))[0]
2946 subject = re.sub(
2947 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2948
2949 tags = []
2950 start = 0
2951 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2952 while True:
2953 m = bracket_exp.match(subject, start)
2954 if not m:
2955 break
2956 tags.append(self.sanitize_hash_tag(m.group(1)))
2957 start = m.end()
2958
2959 if not tags:
2960 # Try "Tag: " prefix.
2961 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2962 if m:
2963 tags.append(self.sanitize_hash_tag(m.group(1)))
2964 return tags
2965
2966 @classmethod
2967 def sanitize_hash_tag(cls, tag):
2968 """Returns a sanitized Gerrit hash tag.
2969
2970 A sanitized hashtag can be used as a git push refspec parameter value.
2971 """
2972 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2973
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002974 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
2975 """Updates this commit description given the parent.
2976
2977 This is essentially what Gnumbd used to do.
2978 Consult https://goo.gl/WMmpDe for more details.
2979 """
2980 assert parent_msg # No, orphan branch creation isn't supported.
2981 assert parent_hash
2982 assert dest_ref
2983 parent_footer_map = git_footers.parse_footers(parent_msg)
2984 # This will also happily parse svn-position, which GnumbD is no longer
2985 # supporting. While we'd generate correct footers, the verifier plugin
2986 # installed in Gerrit will block such commit (ie git push below will fail).
2987 parent_position = git_footers.get_position(parent_footer_map)
2988
2989 # Cherry-picks may have last line obscuring their prior footers,
2990 # from git_footers perspective. This is also what Gnumbd did.
2991 cp_line = None
2992 if (self._description_lines and
2993 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
2994 cp_line = self._description_lines.pop()
2995
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02002996 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002997
2998 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
2999 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003000 for i, line in enumerate(footer_lines):
3001 k, v = git_footers.parse_footer(line) or (None, None)
3002 if k and k.startswith('Cr-'):
3003 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003004
3005 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003006 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003007 if parent_position[0] == dest_ref:
3008 # Same branch as parent.
3009 number = int(parent_position[1]) + 1
3010 else:
3011 number = 1 # New branch, and extra lineage.
3012 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3013 int(parent_position[1])))
3014
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003015 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3016 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003017
3018 self._description_lines = top_lines
3019 if cp_line:
3020 self._description_lines.append(cp_line)
3021 if self._description_lines[-1] != '':
3022 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003023 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003024
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003025
Aaron Gablea1bab272017-04-11 16:38:18 -07003026def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003027 """Retrieves the reviewers that approved a CL from the issue properties with
3028 messages.
3029
3030 Note that the list may contain reviewers that are not committer, thus are not
3031 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003032
3033 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003034 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003035 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003036 return sorted(
3037 set(
3038 message['sender']
3039 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003040 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003041 )
3042 )
3043
3044
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003045def FindCodereviewSettingsFile(filename='codereview.settings'):
3046 """Finds the given file starting in the cwd and going up.
3047
3048 Only looks up to the top of the repository unless an
3049 'inherit-review-settings-ok' file exists in the root of the repository.
3050 """
3051 inherit_ok_file = 'inherit-review-settings-ok'
3052 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003053 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003054 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3055 root = '/'
3056 while True:
3057 if filename in os.listdir(cwd):
3058 if os.path.isfile(os.path.join(cwd, filename)):
3059 return open(os.path.join(cwd, filename))
3060 if cwd == root:
3061 break
3062 cwd = os.path.dirname(cwd)
3063
3064
3065def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003066 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003067 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003068
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003069 def SetProperty(name, setting, unset_error_ok=False):
3070 fullname = 'rietveld.' + name
3071 if setting in keyvals:
3072 RunGit(['config', fullname, keyvals[setting]])
3073 else:
3074 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3075
tandrii48df5812016-10-17 03:55:37 -07003076 if not keyvals.get('GERRIT_HOST', False):
3077 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003078 # Only server setting is required. Other settings can be absent.
3079 # In that case, we ignore errors raised during option deletion attempt.
3080 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3081 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3082 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003083 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003084 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3085 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003086 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3087 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003088
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003089 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003090 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003091
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003092 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003093 RunGit(['config', 'gerrit.squash-uploads',
3094 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003095
tandrii@chromium.org28253532016-04-14 13:46:56 +00003096 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003097 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003098 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3099
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003100 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003101 # should be of the form
3102 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3103 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003104 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3105 keyvals['ORIGIN_URL_CONFIG']])
3106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003107
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003108def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003109 """Downloads a network object to a local file, like urllib.urlretrieve.
3110
3111 This is necessary because urllib is broken for SSL connections via a proxy.
3112 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003113 with open(destination, 'w') as f:
3114 f.write(urllib2.urlopen(source).read())
3115
3116
ukai@chromium.org712d6102013-11-27 00:52:58 +00003117def hasSheBang(fname):
3118 """Checks fname is a #! script."""
3119 with open(fname) as f:
3120 return f.read(2).startswith('#!')
3121
3122
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003123# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3124def DownloadHooks(*args, **kwargs):
3125 pass
3126
3127
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003128def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003129 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003130
3131 Args:
3132 force: True to update hooks. False to install hooks if not present.
3133 """
3134 if not settings.GetIsGerrit():
3135 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003136 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003137 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3138 if not os.access(dst, os.X_OK):
3139 if os.path.exists(dst):
3140 if not force:
3141 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003142 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003143 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003144 if not hasSheBang(dst):
3145 DieWithError('Not a script: %s\n'
3146 'You need to download from\n%s\n'
3147 'into .git/hooks/commit-msg and '
3148 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003149 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3150 except Exception:
3151 if os.path.exists(dst):
3152 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003153 DieWithError('\nFailed to download hooks.\n'
3154 'You need to download from\n%s\n'
3155 'into .git/hooks/commit-msg and '
3156 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003157
3158
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003159class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003160 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003161
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003162 _GOOGLESOURCE = 'googlesource.com'
3163
3164 def __init__(self):
3165 # Cached list of [host, identity, source], where source is either
3166 # .gitcookies or .netrc.
3167 self._all_hosts = None
3168
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003169 def ensure_configured_gitcookies(self):
3170 """Runs checks and suggests fixes to make git use .gitcookies from default
3171 path."""
3172 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3173 configured_path = RunGitSilent(
3174 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003175 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003176 if configured_path:
3177 self._ensure_default_gitcookies_path(configured_path, default)
3178 else:
3179 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003180
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003181 @staticmethod
3182 def _ensure_default_gitcookies_path(configured_path, default_path):
3183 assert configured_path
3184 if configured_path == default_path:
3185 print('git is already configured to use your .gitcookies from %s' %
3186 configured_path)
3187 return
3188
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003189 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003190 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3191 (configured_path, default_path))
3192
3193 if not os.path.exists(configured_path):
3194 print('However, your configured .gitcookies file is missing.')
3195 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3196 action='reconfigure')
3197 RunGit(['config', '--global', 'http.cookiefile', default_path])
3198 return
3199
3200 if os.path.exists(default_path):
3201 print('WARNING: default .gitcookies file already exists %s' %
3202 default_path)
3203 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3204 default_path)
3205
3206 confirm_or_exit('Move existing .gitcookies to default location?',
3207 action='move')
3208 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003209 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003210 print('Moved and reconfigured git to use .gitcookies from %s' %
3211 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003212
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003213 @staticmethod
3214 def _configure_gitcookies_path(default_path):
3215 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3216 if os.path.exists(netrc_path):
3217 print('You seem to be using outdated .netrc for git credentials: %s' %
3218 netrc_path)
3219 print('This tool will guide you through setting up recommended '
3220 '.gitcookies store for git credentials.\n'
3221 '\n'
3222 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3223 ' git config --global --unset http.cookiefile\n'
3224 ' mv %s %s.backup\n\n' % (default_path, default_path))
3225 confirm_or_exit(action='setup .gitcookies')
3226 RunGit(['config', '--global', 'http.cookiefile', default_path])
3227 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003228
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003229 def get_hosts_with_creds(self, include_netrc=False):
3230 if self._all_hosts is None:
3231 a = gerrit_util.CookiesAuthenticator()
3232 self._all_hosts = [
3233 (h, u, s)
3234 for h, u, s in itertools.chain(
3235 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3236 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3237 )
3238 if h.endswith(self._GOOGLESOURCE)
3239 ]
3240
3241 if include_netrc:
3242 return self._all_hosts
3243 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3244
3245 def print_current_creds(self, include_netrc=False):
3246 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3247 if not hosts:
3248 print('No Git/Gerrit credentials found')
3249 return
3250 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3251 header = [('Host', 'User', 'Which file'),
3252 ['=' * l for l in lengths]]
3253 for row in (header + hosts):
3254 print('\t'.join((('%%+%ds' % l) % s)
3255 for l, s in zip(lengths, row)))
3256
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003257 @staticmethod
3258 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003259 """Parses identity "git-<username>.domain" into <username> and domain."""
3260 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003261 # distinguishable from sub-domains. But we do know typical domains:
3262 if identity.endswith('.chromium.org'):
3263 domain = 'chromium.org'
3264 username = identity[:-len('.chromium.org')]
3265 else:
3266 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003267 if username.startswith('git-'):
3268 username = username[len('git-'):]
3269 return username, domain
3270
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003271 def _canonical_git_googlesource_host(self, host):
3272 """Normalizes Gerrit hosts (with '-review') to Git host."""
3273 assert host.endswith(self._GOOGLESOURCE)
3274 # Prefix doesn't include '.' at the end.
3275 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3276 if prefix.endswith('-review'):
3277 prefix = prefix[:-len('-review')]
3278 return prefix + '.' + self._GOOGLESOURCE
3279
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003280 def _canonical_gerrit_googlesource_host(self, host):
3281 git_host = self._canonical_git_googlesource_host(host)
3282 prefix = git_host.split('.', 1)[0]
3283 return prefix + '-review.' + self._GOOGLESOURCE
3284
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003285 def _get_counterpart_host(self, host):
3286 assert host.endswith(self._GOOGLESOURCE)
3287 git = self._canonical_git_googlesource_host(host)
3288 gerrit = self._canonical_gerrit_googlesource_host(git)
3289 return git if gerrit == host else gerrit
3290
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003291 def has_generic_host(self):
3292 """Returns whether generic .googlesource.com has been configured.
3293
3294 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3295 """
3296 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3297 if host == '.' + self._GOOGLESOURCE:
3298 return True
3299 return False
3300
3301 def _get_git_gerrit_identity_pairs(self):
3302 """Returns map from canonic host to pair of identities (Git, Gerrit).
3303
3304 One of identities might be None, meaning not configured.
3305 """
3306 host_to_identity_pairs = {}
3307 for host, identity, _ in self.get_hosts_with_creds():
3308 canonical = self._canonical_git_googlesource_host(host)
3309 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3310 idx = 0 if canonical == host else 1
3311 pair[idx] = identity
3312 return host_to_identity_pairs
3313
3314 def get_partially_configured_hosts(self):
3315 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003316 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3317 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3318 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003319
3320 def get_conflicting_hosts(self):
3321 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003322 host
3323 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003324 if None not in (i1, i2) and i1 != i2)
3325
3326 def get_duplicated_hosts(self):
3327 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3328 return set(host for host, count in counters.iteritems() if count > 1)
3329
3330 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3331 'chromium.googlesource.com': 'chromium.org',
3332 'chrome-internal.googlesource.com': 'google.com',
3333 }
3334
3335 def get_hosts_with_wrong_identities(self):
3336 """Finds hosts which **likely** reference wrong identities.
3337
3338 Note: skips hosts which have conflicting identities for Git and Gerrit.
3339 """
3340 hosts = set()
3341 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3342 pair = self._get_git_gerrit_identity_pairs().get(host)
3343 if pair and pair[0] == pair[1]:
3344 _, domain = self._parse_identity(pair[0])
3345 if domain != expected:
3346 hosts.add(host)
3347 return hosts
3348
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003349 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003350 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003351 hosts = sorted(hosts)
3352 assert hosts
3353 if extra_column_func is None:
3354 extras = [''] * len(hosts)
3355 else:
3356 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003357 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3358 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003359 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003360 lines.append(tmpl % he)
3361 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003362
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003363 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003364 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003365 yield ('.googlesource.com wildcard record detected',
3366 ['Chrome Infrastructure team recommends to list full host names '
3367 'explicitly.'],
3368 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003369
3370 dups = self.get_duplicated_hosts()
3371 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003372 yield ('The following hosts were defined twice',
3373 self._format_hosts(dups),
3374 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003375
3376 partial = self.get_partially_configured_hosts()
3377 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003378 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3379 'These hosts are missing',
3380 self._format_hosts(partial, lambda host: 'but %s defined' %
3381 self._get_counterpart_host(host)),
3382 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003383
3384 conflicting = self.get_conflicting_hosts()
3385 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003386 yield ('The following Git hosts have differing credentials from their '
3387 'Gerrit counterparts',
3388 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3389 tuple(self._get_git_gerrit_identity_pairs()[host])),
3390 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003391
3392 wrong = self.get_hosts_with_wrong_identities()
3393 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003394 yield ('These hosts likely use wrong identity',
3395 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3396 (self._get_git_gerrit_identity_pairs()[host][0],
3397 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3398 wrong)
3399
3400 def find_and_report_problems(self):
3401 """Returns True if there was at least one problem, else False."""
3402 found = False
3403 bad_hosts = set()
3404 for title, sublines, hosts in self._find_problems():
3405 if not found:
3406 found = True
3407 print('\n\n.gitcookies problem report:\n')
3408 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003409 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003410 if sublines:
3411 print()
3412 print(' %s' % '\n '.join(sublines))
3413 print()
3414
3415 if bad_hosts:
3416 assert found
3417 print(' You can manually remove corresponding lines in your %s file and '
3418 'visit the following URLs with correct account to generate '
3419 'correct credential lines:\n' %
3420 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3421 print(' %s' % '\n '.join(sorted(set(
3422 gerrit_util.CookiesAuthenticator().get_new_password_url(
3423 self._canonical_git_googlesource_host(host))
3424 for host in bad_hosts
3425 ))))
3426 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003427
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003428
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003429@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003430def CMDcreds_check(parser, args):
3431 """Checks credentials and suggests changes."""
3432 _, _ = parser.parse_args(args)
3433
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003434 # Code below checks .gitcookies. Abort if using something else.
3435 authn = gerrit_util.Authenticator.get()
3436 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3437 if isinstance(authn, gerrit_util.GceAuthenticator):
3438 DieWithError(
3439 'This command is not designed for GCE, are you on a bot?\n'
3440 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3441 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003442 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003443 'This command is not designed for bot environment. It checks '
3444 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003445
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003446 checker = _GitCookiesChecker()
3447 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003448
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003449 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003450 checker.print_current_creds(include_netrc=True)
3451
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003452 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003453 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003454 return 0
3455 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003456
3457
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003458@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003459def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003460 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003461 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3462 branch = ShortBranchName(branchref)
3463 _, args = parser.parse_args(args)
3464 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003465 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003466 return RunGit(['config', 'branch.%s.base-url' % branch],
3467 error_ok=False).strip()
3468 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003469 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003470 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3471 error_ok=False).strip()
3472
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003473
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003474def color_for_status(status):
3475 """Maps a Changelist status to color, for CMDstatus and other tools."""
3476 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003477 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003478 'waiting': Fore.BLUE,
3479 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003480 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003481 'lgtm': Fore.GREEN,
3482 'commit': Fore.MAGENTA,
3483 'closed': Fore.CYAN,
3484 'error': Fore.WHITE,
3485 }.get(status, Fore.WHITE)
3486
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003487
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003488def get_cl_statuses(changes, fine_grained, max_processes=None):
3489 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003490
3491 If fine_grained is true, this will fetch CL statuses from the server.
3492 Otherwise, simply indicate if there's a matching url for the given branches.
3493
3494 If max_processes is specified, it is used as the maximum number of processes
3495 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3496 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003497
3498 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003499 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003500 if not changes:
3501 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003502
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003503 if not fine_grained:
3504 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003505 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003506 for cl in changes:
3507 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003508 return
3509
3510 # First, sort out authentication issues.
3511 logging.debug('ensuring credentials exist')
3512 for cl in changes:
3513 cl.EnsureAuthenticated(force=False, refresh=True)
3514
3515 def fetch(cl):
3516 try:
3517 return (cl, cl.GetStatus())
3518 except:
3519 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003520 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003521 raise
3522
3523 threads_count = len(changes)
3524 if max_processes:
3525 threads_count = max(1, min(threads_count, max_processes))
3526 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3527
3528 pool = ThreadPool(threads_count)
3529 fetched_cls = set()
3530 try:
3531 it = pool.imap_unordered(fetch, changes).__iter__()
3532 while True:
3533 try:
3534 cl, status = it.next(timeout=5)
3535 except multiprocessing.TimeoutError:
3536 break
3537 fetched_cls.add(cl)
3538 yield cl, status
3539 finally:
3540 pool.close()
3541
3542 # Add any branches that failed to fetch.
3543 for cl in set(changes) - fetched_cls:
3544 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003545
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546
3547def upload_branch_deps(cl, args):
3548 """Uploads CLs of local branches that are dependents of the current branch.
3549
3550 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003551
3552 test1 -> test2.1 -> test3.1
3553 -> test3.2
3554 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003555
3556 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3557 run on the dependent branches in this order:
3558 test2.1, test3.1, test3.2, test2.2, test3.3
3559
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003560 Note: This function does not rebase your local dependent branches. Use it
3561 when you make a change to the parent branch that will not conflict
3562 with its dependent branches, and you would like their dependencies
3563 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564 """
3565 if git_common.is_dirty_git_tree('upload-branch-deps'):
3566 return 1
3567
3568 root_branch = cl.GetBranch()
3569 if root_branch is None:
3570 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3571 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003572 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3574 'patchset dependencies without an uploaded CL.')
3575
3576 branches = RunGit(['for-each-ref',
3577 '--format=%(refname:short) %(upstream:short)',
3578 'refs/heads'])
3579 if not branches:
3580 print('No local branches found.')
3581 return 0
3582
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003583 # Create a dictionary of all local branches to the branches that are
3584 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003585 tracked_to_dependents = collections.defaultdict(list)
3586 for b in branches.splitlines():
3587 tokens = b.split()
3588 if len(tokens) == 2:
3589 branch_name, tracked = tokens
3590 tracked_to_dependents[tracked].append(branch_name)
3591
vapiera7fbd5a2016-06-16 09:17:49 -07003592 print()
3593 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003594 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003595
rmistry@google.com2dd99862015-06-22 12:22:18 +00003596 def traverse_dependents_preorder(branch, padding=''):
3597 dependents_to_process = tracked_to_dependents.get(branch, [])
3598 padding += ' '
3599 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003600 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601 dependents.append(dependent)
3602 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003603
rmistry@google.com2dd99862015-06-22 12:22:18 +00003604 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003605 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003606
3607 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003608 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003609 return 0
3610
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003611 confirm_or_exit('This command will checkout all dependent branches and run '
3612 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003613
rmistry@google.com2dd99862015-06-22 12:22:18 +00003614 # Record all dependents that failed to upload.
3615 failures = {}
3616 # Go through all dependents, checkout the branch and upload.
3617 try:
3618 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print()
3620 print('--------------------------------------')
3621 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003622 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003623 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624 try:
3625 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003626 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003627 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003628 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003629 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631 finally:
3632 # Swap back to the original root branch.
3633 RunGit(['checkout', '-q', root_branch])
3634
vapiera7fbd5a2016-06-16 09:17:49 -07003635 print()
3636 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003637 for dependent_branch in dependents:
3638 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003639 print(' %s : %s' % (dependent_branch, upload_status))
3640 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003641
3642 return 0
3643
3644
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003645@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003646def CMDarchive(parser, args):
3647 """Archives and deletes branches associated with closed changelists."""
3648 parser.add_option(
3649 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003650 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003651 parser.add_option(
3652 '-f', '--force', action='store_true',
3653 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003654 parser.add_option(
3655 '-d', '--dry-run', action='store_true',
3656 help='Skip the branch tagging and removal steps.')
3657 parser.add_option(
3658 '-t', '--notags', action='store_true',
3659 help='Do not tag archived branches. '
3660 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003661
kmarshall3bff56b2016-06-06 18:31:47 -07003662 options, args = parser.parse_args(args)
3663 if args:
3664 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003665
3666 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3667 if not branches:
3668 return 0
3669
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003671 changes = [Changelist(branchref=b)
3672 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003673 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3674 statuses = get_cl_statuses(changes,
3675 fine_grained=True,
3676 max_processes=options.maxjobs)
3677 proposal = [(cl.GetBranch(),
3678 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3679 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003680 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003681 proposal.sort()
3682
3683 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003684 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003685 return 0
3686
3687 current_branch = GetCurrentBranch()
3688
vapiera7fbd5a2016-06-16 09:17:49 -07003689 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003690 if options.notags:
3691 for next_item in proposal:
3692 print(' ' + next_item[0])
3693 else:
3694 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3695 for next_item in proposal:
3696 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003697
kmarshall9249e012016-08-23 12:02:16 -07003698 # Quit now on precondition failure or if instructed by the user, either
3699 # via an interactive prompt or by command line flags.
3700 if options.dry_run:
3701 print('\nNo changes were made (dry run).\n')
3702 return 0
3703 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003704 print('You are currently on a branch \'%s\' which is associated with a '
3705 'closed codereview issue, so archive cannot proceed. Please '
3706 'checkout another branch and run this command again.' %
3707 current_branch)
3708 return 1
kmarshall9249e012016-08-23 12:02:16 -07003709 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003710 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3711 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003712 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003713 return 1
3714
3715 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003716 if not options.notags:
3717 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003718 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003719
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003721
3722 return 0
3723
3724
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003725@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003726def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003727 """Show status of changelists.
3728
3729 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003730 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003731 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003732 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003733 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003734 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003735 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003736 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003737
3738 Also see 'git cl comments'.
3739 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003740 parser.add_option(
3741 '--no-branch-color',
3742 action='store_true',
3743 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003744 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003745 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003746 parser.add_option('-f', '--fast', action='store_true',
3747 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003748 parser.add_option(
3749 '-j', '--maxjobs', action='store', type=int,
3750 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003751
iannuccie53c9352016-08-17 14:40:40 -07003752 _add_codereview_issue_select_options(
3753 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003754 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003755 if args:
3756 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003757
iannuccie53c9352016-08-17 14:40:40 -07003758 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003759 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003760
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003761 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003762 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003763 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003765 elif options.field == 'id':
3766 issueid = cl.GetIssue()
3767 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003768 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003769 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003770 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003771 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003772 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003773 elif options.field == 'status':
3774 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003775 elif options.field == 'url':
3776 url = cl.GetIssueURL()
3777 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003778 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003779 return 0
3780
3781 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3782 if not branches:
3783 print('No local branch found.')
3784 return 0
3785
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003787 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003788 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003789 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003790 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003791 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003792 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003793
Daniel McArdlea23bf592019-02-12 00:25:12 +00003794 current_branch = GetCurrentBranch()
3795
3796 def FormatBranchName(branch, colorize=False):
3797 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3798 an asterisk when it is the current branch."""
3799
3800 asterisk = ""
3801 color = Fore.RESET
3802 if branch == current_branch:
3803 asterisk = "* "
3804 color = Fore.GREEN
3805 branch_name = ShortBranchName(branch)
3806
3807 if colorize:
3808 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003809 return asterisk + branch_name
3810
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003811 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003812
3813 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003814 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3815 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003816 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003817 c, status = output.next()
3818 branch_statuses[c.GetBranch()] = status
3819 status = branch_statuses.pop(branch)
3820 url = cl.GetIssueURL()
3821 if url and (not status or status == 'error'):
3822 # The issue probably doesn't exist anymore.
3823 url += ' (broken)'
3824
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003825 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003826 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003827 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003828 color = ''
3829 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003830 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003831
Alan Cuttera3be9a52019-03-04 18:50:33 +00003832 branch_display = FormatBranchName(branch)
3833 padding = ' ' * (alignment - len(branch_display))
3834 if not options.no_branch_color:
3835 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003836
Alan Cuttera3be9a52019-03-04 18:50:33 +00003837 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3838 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003839
vapiera7fbd5a2016-06-16 09:17:49 -07003840 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003841 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003842 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003843 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003844 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003845 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003847 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003848 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003849 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003850 print('Issue description:')
3851 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852 return 0
3853
3854
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003855def colorize_CMDstatus_doc():
3856 """To be called once in main() to add colors to git cl status help."""
3857 colors = [i for i in dir(Fore) if i[0].isupper()]
3858
3859 def colorize_line(line):
3860 for color in colors:
3861 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003862 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003863 indent = len(line) - len(line.lstrip(' ')) + 1
3864 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3865 return line
3866
3867 lines = CMDstatus.__doc__.splitlines()
3868 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3869
3870
phajdan.jre328cf92016-08-22 04:12:17 -07003871def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003872 if path == '-':
3873 json.dump(contents, sys.stdout)
3874 else:
3875 with open(path, 'w') as f:
3876 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003877
3878
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003879@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003880@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003881def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003882 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003883
3884 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003885 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003886 parser.add_option('-r', '--reverse', action='store_true',
3887 help='Lookup the branch(es) for the specified issues. If '
3888 'no issues are specified, all branches with mapped '
3889 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003890 parser.add_option('--json',
3891 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003892 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003893 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003894
dnj@chromium.org406c4402015-03-03 17:22:28 +00003895 if options.reverse:
3896 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003897 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003898 # Reverse issue lookup.
3899 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003900
3901 git_config = {}
3902 for config in RunGit(['config', '--get-regexp',
3903 r'branch\..*issue']).splitlines():
3904 name, _space, val = config.partition(' ')
3905 git_config[name] = val
3906
dnj@chromium.org406c4402015-03-03 17:22:28 +00003907 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003908 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3909 config_key = _git_branch_config_key(ShortBranchName(branch),
3910 cls.IssueConfigKey())
3911 issue = git_config.get(config_key)
3912 if issue:
3913 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003914 if not args:
3915 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003916 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003917 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003918 try:
3919 issue_num = int(issue)
3920 except ValueError:
3921 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003922 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003923 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003924 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003925 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003926 if options.json:
3927 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003928 return 0
3929
3930 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003931 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003932 if not issue.valid:
3933 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3934 'or no argument to list it.\n'
3935 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003936 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003937 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003938 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003939 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003940 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3941 if options.json:
3942 write_json(options.json, {
3943 'issue': cl.GetIssue(),
3944 'issue_url': cl.GetIssueURL(),
3945 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003946 return 0
3947
3948
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003949@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003950def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 """Shows or posts review comments for any changelist."""
3952 parser.add_option('-a', '--add-comment', dest='comment',
3953 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003954 parser.add_option('-p', '--publish', action='store_true',
3955 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003956 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003957 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003958 parser.add_option('-m', '--machine-readable', dest='readable',
3959 action='store_false', default=True,
3960 help='output comments in a format compatible with '
3961 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003962 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003963 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003964 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003966
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003967 issue = None
3968 if options.issue:
3969 try:
3970 issue = int(options.issue)
3971 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003972 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003973
Edward Lemur934836a2019-09-09 20:16:54 +00003974 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003975
3976 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003977 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003978 return 0
3979
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003980 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3981 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003982 for comment in summary:
3983 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003984 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003985 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003986 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003987 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003988 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003989 elif comment.autogenerated:
3990 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003991 else:
3992 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003993 print('\n%s%s %s%s\n%s' % (
3994 color,
3995 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3996 comment.sender,
3997 Fore.RESET,
3998 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3999
smut@google.comc85ac942015-09-15 16:34:43 +00004000 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004001 def pre_serialize(c):
4002 dct = c.__dict__.copy()
4003 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4004 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004005 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004006 return 0
4007
4008
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004009@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004010@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004011def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004012 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004013 parser.add_option('-d', '--display', action='store_true',
4014 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004015 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004016 help='New description to set for this issue (- for stdin, '
4017 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004018 parser.add_option('-f', '--force', action='store_true',
4019 help='Delete any unpublished Gerrit edits for this issue '
4020 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004021
4022 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004023 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004024
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004025 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004026 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004027 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004028 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004029 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004030
Edward Lemur934836a2019-09-09 20:16:54 +00004031 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004032 if target_issue_arg:
4033 kwargs['issue'] = target_issue_arg.issue
4034 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004035
4036 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004037 if not cl.GetIssue():
4038 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004039
Edward Lemur678a6842019-10-03 22:25:05 +00004040 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004041 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004042
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004043 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004044
smut@google.com34fb6b12015-07-13 20:03:26 +00004045 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004046 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004047 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004048
4049 if options.new_description:
4050 text = options.new_description
4051 if text == '-':
4052 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004053 elif text == '+':
4054 base_branch = cl.GetCommonAncestorWithUpstream()
4055 change = cl.GetChange(base_branch, None, local_description=True)
4056 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004057
4058 description.set_description(text)
4059 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004060 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004061 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004062 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004063 return 0
4064
4065
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004066@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004067def CMDlint(parser, args):
4068 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004069 parser.add_option('--filter', action='append', metavar='-x,+y',
4070 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004071 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004072
4073 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004074 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004075 try:
4076 import cpplint
4077 import cpplint_chromium
4078 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004080 return 1
4081
4082 # Change the current working directory before calling lint so that it
4083 # shows the correct base.
4084 previous_cwd = os.getcwd()
4085 os.chdir(settings.GetRoot())
4086 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004087 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004088 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4089 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004090 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004092 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004093
4094 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004095 command = args + files
4096 if options.filter:
4097 command = ['--filter=' + ','.join(options.filter)] + command
4098 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004099
4100 white_regex = re.compile(settings.GetLintRegex())
4101 black_regex = re.compile(settings.GetLintIgnoreRegex())
4102 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4103 for filename in filenames:
4104 if white_regex.match(filename):
4105 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004106 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004107 else:
4108 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4109 extra_check_functions)
4110 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004111 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004112 finally:
4113 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004114 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004115 if cpplint._cpplint_state.error_count != 0:
4116 return 1
4117 return 0
4118
4119
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004120@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004122 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004123 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004124 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004125 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004126 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004127 parser.add_option('--all', action='store_true',
4128 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004129 parser.add_option('--parallel', action='store_true',
4130 help='Run all tests specified by input_api.RunTests in all '
4131 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004132 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004133
sbc@chromium.org71437c02015-04-09 19:29:40 +00004134 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004135 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004136 return 1
4137
Edward Lemur934836a2019-09-09 20:16:54 +00004138 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004139 if args:
4140 base_branch = args[0]
4141 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004142 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004143 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144
Aaron Gable8076c282017-11-29 14:39:41 -08004145 if options.all:
4146 base_change = cl.GetChange(base_branch, None)
4147 files = [('M', f) for f in base_change.AllFiles()]
4148 change = presubmit_support.GitChange(
4149 base_change.Name(),
4150 base_change.FullDescriptionText(),
4151 base_change.RepositoryRoot(),
4152 files,
4153 base_change.issue,
4154 base_change.patchset,
4155 base_change.author_email,
4156 base_change._upstream)
4157 else:
4158 change = cl.GetChange(base_branch, None)
4159
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004160 cl.RunHook(
4161 committing=not options.upload,
4162 may_prompt=False,
4163 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004164 change=change,
4165 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004166 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004167
4168
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004169def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004170 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004171
4172 Works the same way as
4173 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4174 but can be called on demand on all platforms.
4175
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004176 The basic idea is to generate git hash of a state of the tree, original
4177 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004178 """
4179 lines = []
4180 tree_hash = RunGitSilent(['write-tree'])
4181 lines.append('tree %s' % tree_hash.strip())
4182 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4183 if code == 0:
4184 lines.append('parent %s' % parent.strip())
4185 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4186 lines.append('author %s' % author.strip())
4187 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4188 lines.append('committer %s' % committer.strip())
4189 lines.append('')
4190 # Note: Gerrit's commit-hook actually cleans message of some lines and
4191 # whitespace. This code is not doing this, but it clearly won't decrease
4192 # entropy.
4193 lines.append(message)
4194 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004195 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004196 return 'I%s' % change_hash.strip()
4197
4198
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004199def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004200 """Computes the remote branch ref to use for the CL.
4201
4202 Args:
4203 remote (str): The git remote for the CL.
4204 remote_branch (str): The git remote branch for the CL.
4205 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004206 """
4207 if not (remote and remote_branch):
4208 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004209
wittman@chromium.org455dc922015-01-26 20:15:50 +00004210 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004211 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004212 # refs, which are then translated into the remote full symbolic refs
4213 # below.
4214 if '/' not in target_branch:
4215 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4216 else:
4217 prefix_replacements = (
4218 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4219 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4220 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4221 )
4222 match = None
4223 for regex, replacement in prefix_replacements:
4224 match = re.search(regex, target_branch)
4225 if match:
4226 remote_branch = target_branch.replace(match.group(0), replacement)
4227 break
4228 if not match:
4229 # This is a branch path but not one we recognize; use as-is.
4230 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004231 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4232 # Handle the refs that need to land in different refs.
4233 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004234
wittman@chromium.org455dc922015-01-26 20:15:50 +00004235 # Create the true path to the remote branch.
4236 # Does the following translation:
4237 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4238 # * refs/remotes/origin/master -> refs/heads/master
4239 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4240 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4241 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4242 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4243 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4244 'refs/heads/')
4245 elif remote_branch.startswith('refs/remotes/branch-heads'):
4246 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004247
wittman@chromium.org455dc922015-01-26 20:15:50 +00004248 return remote_branch
4249
4250
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004251def cleanup_list(l):
4252 """Fixes a list so that comma separated items are put as individual items.
4253
4254 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4255 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4256 """
4257 items = sum((i.split(',') for i in l), [])
4258 stripped_items = (i.strip() for i in items)
4259 return sorted(filter(None, stripped_items))
4260
4261
Aaron Gable4db38df2017-11-03 14:59:07 -07004262@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004263@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004264def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004265 """Uploads the current changelist to codereview.
4266
4267 Can skip dependency patchset uploads for a branch by running:
4268 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004269 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004270 git config --unset branch.branch_name.skip-deps-uploads
4271 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004272
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004273 If the name of the checked out branch starts with "bug-" or "fix-" followed
4274 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004275 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004276
4277 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004278 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004279 [git-cl] add support for hashtags
4280 Foo bar: implement foo
4281 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004282 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004283 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4284 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004285 parser.add_option('--bypass-watchlists', action='store_true',
4286 dest='bypass_watchlists',
4287 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004288 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004289 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004290 parser.add_option('--message', '-m', dest='message',
4291 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004292 parser.add_option('-b', '--bug',
4293 help='pre-populate the bug number(s) for this issue. '
4294 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004295 parser.add_option('--message-file', dest='message_file',
4296 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004297 parser.add_option('--title', '-t', dest='title',
4298 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004299 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004300 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004301 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004302 parser.add_option('--tbrs',
4303 action='append', default=[],
4304 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004305 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004306 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004307 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004308 parser.add_option('--hashtag', dest='hashtags',
4309 action='append', default=[],
4310 help=('Gerrit hashtag for new CL; '
4311 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004312 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004313 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004314 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004315 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004316 metavar='TARGET',
4317 help='Apply CL to remote ref TARGET. ' +
4318 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004319 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004320 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004321 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004322 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004323 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004324 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004325 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4326 const='TBR', help='add a set of OWNERS to TBR')
4327 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4328 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004329 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004330 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004331 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004332 'implies --send-mail')
4333 parser.add_option('-d', '--cq-dry-run',
4334 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004335 help='Send the patchset to do a CQ dry run right after '
4336 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004337 parser.add_option('--preserve-tryjobs', action='store_true',
4338 help='instruct the CQ to let tryjobs running even after '
4339 'new patchsets are uploaded instead of canceling '
4340 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004341 parser.add_option('--dependencies', action='store_true',
4342 help='Uploads CLs of all the local branches that depend on '
4343 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004344 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4345 help='Sends your change to the CQ after an approval. Only '
4346 'works on repos that have the Auto-Submit label '
4347 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004348 parser.add_option('--parallel', action='store_true',
4349 help='Run all tests specified by input_api.RunTests in all '
4350 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004351 parser.add_option('--no-autocc', action='store_true',
4352 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004353 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004354 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004355 parser.add_option('-R', '--retry-failed', action='store_true',
4356 help='Retry failed tryjobs from old patchset immediately '
4357 'after uploading new patchset. Cannot be used with '
4358 '--use-commit-queue or --cq-dry-run.')
4359 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4360 help='Host of buildbucket. The default host is %default.')
4361 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004362
rmistry@google.com2dd99862015-06-22 12:22:18 +00004363 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004364 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004365 (options, args) = parser.parse_args(args)
4366
sbc@chromium.org71437c02015-04-09 19:29:40 +00004367 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004368 return 1
4369
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004370 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004371 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004372 options.cc = cleanup_list(options.cc)
4373
tandriib80458a2016-06-23 12:20:07 -07004374 if options.message_file:
4375 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004376 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004377 options.message = gclient_utils.FileRead(options.message_file)
4378 options.message_file = None
4379
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004380 if ([options.cq_dry_run,
4381 options.use_commit_queue,
4382 options.retry_failed].count(True) > 1):
4383 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4384 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004385
Aaron Gableedbc4132017-09-11 13:22:28 -07004386 if options.use_commit_queue:
4387 options.send_mail = True
4388
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004389 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4390 settings.GetIsGerrit()
4391
Edward Lemur934836a2019-09-09 20:16:54 +00004392 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004393 if options.retry_failed and not cl.GetIssue():
4394 print('No previous patchsets, so --retry-failed has no effect.')
4395 options.retry_failed = False
4396 # cl.GetMostRecentPatchset uses cached information, and can return the last
4397 # patchset before upload. Calling it here makes it clear that it's the
4398 # last patchset before upload. Note that GetMostRecentPatchset will fail
4399 # if no CL has been uploaded yet.
4400 if options.retry_failed:
4401 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004402
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004403 ret = cl.CMDUpload(options, args, orig_args)
4404
4405 if options.retry_failed:
4406 if ret != 0:
4407 print('Upload failed, so --retry-failed has no effect.')
4408 return ret
4409 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004410 builds, _ = _fetch_latest_builds(
4411 auth_config, cl, options.buildbucket_host,
4412 latest_patchset=patchset)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004413 buckets = _filter_failed(builds)
4414 if len(buckets) == 0:
4415 print('No failed tryjobs, so --retry-failed has no effect.')
4416 return ret
4417 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4418
4419 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004420
4421
Francois Dorayd42c6812017-05-30 15:10:20 -04004422@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004423@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004424def CMDsplit(parser, args):
4425 """Splits a branch into smaller branches and uploads CLs.
4426
4427 Creates a branch and uploads a CL for each group of files modified in the
4428 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004429 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004430 the shared OWNERS file.
4431 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004432 parser.add_option('-d', '--description', dest='description_file',
4433 help='A text file containing a CL description in which '
4434 '$directory will be replaced by each CL\'s directory.')
4435 parser.add_option('-c', '--comment', dest='comment_file',
4436 help='A text file containing a CL comment.')
4437 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004438 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004439 help='List the files and reviewers for each CL that would '
4440 'be created, but don\'t create branches or CLs.')
4441 parser.add_option('--cq-dry-run', action='store_true',
4442 help='If set, will do a cq dry run for each uploaded CL. '
4443 'Please be careful when doing this; more than ~10 CLs '
4444 'has the potential to overload our build '
4445 'infrastructure. Try to upload these not during high '
4446 'load times (usually 11-3 Mountain View time). Email '
4447 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004448 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4449 default=True,
4450 help='Sends your change to the CQ after an approval. Only '
4451 'works on repos that have the Auto-Submit label '
4452 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004453 options, _ = parser.parse_args(args)
4454
4455 if not options.description_file:
4456 parser.error('No --description flag specified.')
4457
4458 def WrappedCMDupload(args):
4459 return CMDupload(OptionParser(), args)
4460
4461 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004462 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004463 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004464
4465
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004466@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004467@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004469 """DEPRECATED: Used to commit the current changelist via git-svn."""
4470 message = ('git-cl no longer supports committing to SVN repositories via '
4471 'git-svn. You probably want to use `git cl land` instead.')
4472 print(message)
4473 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004474
4475
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004476@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004477@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004478def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004479 """Commits the current changelist via git.
4480
4481 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4482 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004483 """
4484 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4485 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004486 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004487 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004488 parser.add_option('--parallel', action='store_true',
4489 help='Run all tests specified by input_api.RunTests in all '
4490 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004491 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004492
Edward Lemur934836a2019-09-09 20:16:54 +00004493 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004494
Robert Iannucci2e73d432018-03-14 01:10:47 -07004495 if not cl.GetIssue():
4496 DieWithError('You must upload the change first to Gerrit.\n'
4497 ' If you would rather have `git cl land` upload '
4498 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004499 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004500 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501
4502
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004503@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004504@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004505def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004506 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004507 parser.add_option('-b', dest='newbranch',
4508 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004509 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004510 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004511 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004512 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004513
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004514 group = optparse.OptionGroup(
4515 parser,
4516 'Options for continuing work on the current issue uploaded from a '
4517 'different clone (e.g. different machine). Must be used independently '
4518 'from the other options. No issue number should be specified, and the '
4519 'branch must have an issue number associated with it')
4520 group.add_option('--reapply', action='store_true', dest='reapply',
4521 help='Reset the branch and reapply the issue.\n'
4522 'CAUTION: This will undo any local changes in this '
4523 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004524
4525 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004526 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004527 parser.add_option_group(group)
4528
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004529 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004530 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004531
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004532 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004533 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004535 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004536 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004537
Edward Lemur934836a2019-09-09 20:16:54 +00004538 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004539 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004540 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004541
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004542 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004543 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004544 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004545
4546 RunGit(['reset', '--hard', upstream])
4547 if options.pull:
4548 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004549
Edward Lemur678a6842019-10-03 22:25:05 +00004550 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4551 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004552
4553 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004554 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004555
Edward Lemurf38bc172019-09-03 21:02:13 +00004556 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004557 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004558 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004559
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004560 # We don't want uncommitted changes mixed up with the patch.
4561 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004562 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004564 if options.newbranch:
4565 if options.force:
4566 RunGit(['branch', '-D', options.newbranch],
4567 stderr=subprocess2.PIPE, error_ok=True)
4568 RunGit(['new-branch', options.newbranch])
4569
Edward Lemur678a6842019-10-03 22:25:05 +00004570 cl = Changelist(
4571 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004572
Edward Lemur678a6842019-10-03 22:25:05 +00004573 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004574 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004575
Edward Lemurf38bc172019-09-03 21:02:13 +00004576 return cl.CMDPatchWithParsedIssue(
4577 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578
4579
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004580def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 """Fetches the tree status and returns either 'open', 'closed',
4582 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004583 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584 if url:
4585 status = urllib2.urlopen(url).read().lower()
4586 if status.find('closed') != -1 or status == '0':
4587 return 'closed'
4588 elif status.find('open') != -1 or status == '1':
4589 return 'open'
4590 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591 return 'unset'
4592
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004593
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004594def GetTreeStatusReason():
4595 """Fetches the tree status from a json url and returns the message
4596 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004597 url = settings.GetTreeStatusUrl()
4598 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599 connection = urllib2.urlopen(json_url)
4600 status = json.loads(connection.read())
4601 connection.close()
4602 return status['message']
4603
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004604
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004605@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004607 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004608 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004609 status = GetTreeStatus()
4610 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004611 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004612 return 2
4613
vapiera7fbd5a2016-06-16 09:17:49 -07004614 print('The tree is %s' % status)
4615 print()
4616 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004617 if status != 'open':
4618 return 1
4619 return 0
4620
4621
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004622@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004623def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004624 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4625 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004626 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004627 '-b', '--bot', action='append',
4628 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4629 'times to specify multiple builders. ex: '
4630 '"-b win_rel -b win_layout". See '
4631 'the try server waterfall for the builders name and the tests '
4632 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004633 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004634 '-B', '--bucket', default='',
4635 help=('Buildbucket bucket to send the try requests.'))
4636 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004637 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004638 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004639 'be determined by the try recipe that builder runs, which usually '
4640 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004641 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004642 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004643 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004644 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004645 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004646 '--category', default='git_cl_try', help='Specify custom build category.')
4647 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004648 '--project',
4649 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004650 'in recipe to determine to which repository or directory to '
4651 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004652 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004653 '-p', '--property', dest='properties', action='append', default=[],
4654 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004655 'key2=value2 etc. The value will be treated as '
4656 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004657 'NOTE: using this may make your tryjob not usable for CQ, '
4658 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004659 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004660 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4661 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004662 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004663 parser.add_option(
4664 '-R', '--retry-failed', action='store_true', default=False,
4665 help='Retry failed jobs from the latest set of tryjobs. '
4666 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004667 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004668 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004669 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004670 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004671
machenbach@chromium.org45453142015-09-15 08:45:22 +00004672 # Make sure that all properties are prop=value pairs.
4673 bad_params = [x for x in options.properties if '=' not in x]
4674 if bad_params:
4675 parser.error('Got properties with missing "=": %s' % bad_params)
4676
maruel@chromium.org15192402012-09-06 12:38:29 +00004677 if args:
4678 parser.error('Unknown arguments: %s' % args)
4679
Edward Lemur934836a2019-09-09 20:16:54 +00004680 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004681 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004682 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004683
Edward Lemurf38bc172019-09-03 21:02:13 +00004684 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004685 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004686
tandriie113dfd2016-10-11 10:20:12 -07004687 error_message = cl.CannotTriggerTryJobReason()
4688 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004689 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004690
Quinten Yearsley983111f2019-09-26 17:18:48 +00004691 if options.retry_failed:
4692 if options.bot or options.bucket:
4693 print('ERROR: The option --retry-failed is not compatible with '
4694 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4695 return 1
4696 print('Searching for failed tryjobs...')
4697 builds, patchset = _fetch_latest_builds(
4698 auth_config, cl, options.buildbucket_host)
4699 if options.verbose:
4700 print('Got %d builds in patchset #%d' % (len(builds), patchset))
4701 buckets = _filter_failed(builds)
4702 if not buckets:
4703 print('There are no failed jobs in the latest set of jobs '
4704 '(patchset #%d), doing nothing.' % patchset)
4705 return 0
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004706 num_builders = sum(map(len, buckets.itervalues()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004707 if num_builders > 10:
4708 confirm_or_exit('There are %d builders with failed builds.'
4709 % num_builders, action='continue')
4710 else:
4711 buckets = _get_bucket_map(cl, options, parser)
4712 if buckets and any(b.startswith('master.') for b in buckets):
4713 print('ERROR: Buildbot masters are not supported.')
4714 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004715
qyearsleydd49f942016-10-28 11:57:22 -07004716 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4717 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004718 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004719 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004720 print('git cl try with no bots now defaults to CQ dry run.')
4721 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4722 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004723
borenet6c0efe62016-10-19 08:13:29 -07004724 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004725 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004726 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004727 'of bot requires an initial job from a parent (usually a builder). '
4728 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004729 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004730 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004731
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004732 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004733 try:
4734 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4735 except BuildbucketResponseException as ex:
4736 print('ERROR: %s' % ex)
4737 return 1
4738 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004739
4740
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004741@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004742def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004743 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004744 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004746 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004747 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004748 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004749 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004750 '--color', action='store_true', default=setup_color.IS_TTY,
4751 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004753 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4754 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004755 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004756 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004757 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004758 parser.add_option_group(group)
4759 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004760 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004761 options, args = parser.parse_args(args)
4762 if args:
4763 parser.error('Unrecognized args: %s' % ' '.join(args))
4764
4765 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004766 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004767 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004768 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004769
tandrii221ab252016-10-06 08:12:04 -07004770 patchset = options.patchset
4771 if not patchset:
4772 patchset = cl.GetMostRecentPatchset()
4773 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004774 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004775 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004776 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004777 cl.GetIssue())
4778
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004779 try:
tandrii221ab252016-10-06 08:12:04 -07004780 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004781 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004782 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004783 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004784 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004785 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004786 else:
4787 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004788 return 0
4789
4790
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004791@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004792@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004793def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004794 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004795 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004796 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004797 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004798
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004799 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004800 if args:
4801 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004802 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004803 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004804 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004805 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004806
4807 # Clear configured merge-base, if there is one.
4808 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004809 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004810 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004811 return 0
4812
4813
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004814@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004815def CMDweb(parser, args):
4816 """Opens the current CL in the web browser."""
4817 _, args = parser.parse_args(args)
4818 if args:
4819 parser.error('Unrecognized args: %s' % ' '.join(args))
4820
4821 issue_url = Changelist().GetIssueURL()
4822 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004823 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004824 return 1
4825
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004826 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004827 # allows us to hide the "Created new window in existing browser session."
4828 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004829 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004830 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004831 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004832 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004833 os.open(os.devnull, os.O_RDWR)
4834 try:
4835 webbrowser.open(issue_url)
4836 finally:
4837 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004838 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004839 return 0
4840
4841
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004842@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004843def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004844 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004845 parser.add_option('-d', '--dry-run', action='store_true',
4846 help='trigger in dry run mode')
4847 parser.add_option('-c', '--clear', action='store_true',
4848 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004849 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004850 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004851 if args:
4852 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004853 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004854 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004855
Edward Lemur934836a2019-09-09 20:16:54 +00004856 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004857 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004858 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004859 elif options.dry_run:
4860 state = _CQState.DRY_RUN
4861 else:
4862 state = _CQState.COMMIT
4863 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004864 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004865 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004866 return 0
4867
4868
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004869@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004870def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004871 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004872 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004873 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004874 if args:
4875 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004876 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004877 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004878 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004879 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004880 cl.CloseIssue()
4881 return 0
4882
4883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004884@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004885def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004886 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004887 parser.add_option(
4888 '--stat',
4889 action='store_true',
4890 dest='stat',
4891 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004892 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004893 if args:
4894 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004895
Edward Lemur934836a2019-09-09 20:16:54 +00004896 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004897 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004898 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004899 if not issue:
4900 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004901
Aaron Gablea718c3e2017-08-28 17:47:28 -07004902 base = cl._GitGetBranchConfigValue('last-upload-hash')
4903 if not base:
4904 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4905 if not base:
4906 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4907 revision_info = detail['revisions'][detail['current_revision']]
4908 fetch_info = revision_info['fetch']['http']
4909 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4910 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004911
Aaron Gablea718c3e2017-08-28 17:47:28 -07004912 cmd = ['git', 'diff']
4913 if options.stat:
4914 cmd.append('--stat')
4915 cmd.append(base)
4916 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004917
4918 return 0
4919
4920
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004921@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004922def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004923 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004924 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004925 '--ignore-current',
4926 action='store_true',
4927 help='Ignore the CL\'s current reviewers and start from scratch.')
4928 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004929 '--ignore-self',
4930 action='store_true',
4931 help='Do not consider CL\'s author as an owners.')
4932 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004933 '--no-color',
4934 action='store_true',
4935 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004936 parser.add_option(
4937 '--batch',
4938 action='store_true',
4939 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004940 # TODO: Consider moving this to another command, since other
4941 # git-cl owners commands deal with owners for a given CL.
4942 parser.add_option(
4943 '--show-all',
4944 action='store_true',
4945 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004946 options, args = parser.parse_args(args)
4947
4948 author = RunGit(['config', 'user.email']).strip() or None
4949
Edward Lemur934836a2019-09-09 20:16:54 +00004950 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004951
Yang Guo6e269a02019-06-26 11:17:02 +00004952 if options.show_all:
4953 for arg in args:
4954 base_branch = cl.GetCommonAncestorWithUpstream()
4955 change = cl.GetChange(base_branch, None)
4956 database = owners.Database(change.RepositoryRoot(), file, os.path)
4957 database.load_data_needed_for([arg])
4958 print('Owners for %s:' % arg)
4959 for owner in sorted(database.all_possible_owners([arg], None)):
4960 print(' - %s' % owner)
4961 return 0
4962
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004963 if args:
4964 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004965 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004966 base_branch = args[0]
4967 else:
4968 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004969 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004970
4971 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07004972 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
4973
4974 if options.batch:
4975 db = owners.Database(change.RepositoryRoot(), file, os.path)
4976 print('\n'.join(db.reviewers_for(affected_files, author)))
4977 return 0
4978
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004979 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004980 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02004981 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004982 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004983 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01004984 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004985 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004986 override_files=change.OriginalOwnersFiles(),
4987 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004988
4989
Aiden Bennerc08566e2018-10-03 17:52:42 +00004990def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004991 """Generates a diff command."""
4992 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004993 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4994
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004995 if allow_prefix:
4996 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4997 # case that diff.noprefix is set in the user's git config.
4998 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4999 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005000 diff_cmd += ['--no-prefix']
5001
5002 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005003
5004 if args:
5005 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005006 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005007 diff_cmd.append(arg)
5008 else:
5009 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010
5011 return diff_cmd
5012
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005013
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005014def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005015 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005016 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005017
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005018
enne@chromium.org555cfe42014-01-29 18:21:39 +00005019@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005020@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005021def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005022 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005023 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005024 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005025 parser.add_option('--full', action='store_true',
5026 help='Reformat the full content of all touched files')
5027 parser.add_option('--dry-run', action='store_true',
5028 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005029 parser.add_option(
5030 '--python',
5031 action='store_true',
5032 default=None,
5033 help='Enables python formatting on all python files.')
5034 parser.add_option(
5035 '--no-python',
5036 action='store_true',
5037 dest='python',
5038 help='Disables python formatting on all python files. '
5039 'Takes precedence over --python. '
5040 'If neither --python or --no-python are set, python '
5041 'files that have a .style.yapf file in an ancestor '
5042 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005043 parser.add_option('--js', action='store_true',
5044 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005045 parser.add_option('--diff', action='store_true',
5046 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005047 parser.add_option('--presubmit', action='store_true',
5048 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005049 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005050
Daniel Chengc55eecf2016-12-30 03:11:02 -08005051 # Normalize any remaining args against the current path, so paths relative to
5052 # the current directory are still resolved as expected.
5053 args = [os.path.join(os.getcwd(), arg) for arg in args]
5054
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005055 # git diff generates paths against the root of the repository. Change
5056 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005057 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005058 if rel_base_path:
5059 os.chdir(rel_base_path)
5060
digit@chromium.org29e47272013-05-17 17:01:46 +00005061 # Grab the merge-base commit, i.e. the upstream commit of the current
5062 # branch when it was created or the last time it was rebased. This is
5063 # to cover the case where the user may have called "git fetch origin",
5064 # moving the origin branch to a newer commit, but hasn't rebased yet.
5065 upstream_commit = None
5066 cl = Changelist()
5067 upstream_branch = cl.GetUpstreamBranch()
5068 if upstream_branch:
5069 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5070 upstream_commit = upstream_commit.strip()
5071
5072 if not upstream_commit:
5073 DieWithError('Could not find base commit for this branch. '
5074 'Are you in detached state?')
5075
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005076 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5077 diff_output = RunGit(changed_files_cmd)
5078 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005079 # Filter out files deleted by this CL
5080 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005081
Christopher Lamc5ba6922017-01-24 11:19:14 +11005082 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005083 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005084
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005085 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5086 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5087 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005088 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005089
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005090 top_dir = os.path.normpath(
5091 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5092
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005093 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5094 # formatted. This is used to block during the presubmit.
5095 return_value = 0
5096
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005097 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005098 # Locate the clang-format binary in the checkout
5099 try:
5100 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005101 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005102 DieWithError(e)
5103
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005104 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005105 cmd = [clang_format_tool]
5106 if not opts.dry_run and not opts.diff:
5107 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005108 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005109 if opts.diff:
5110 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005111 else:
5112 env = os.environ.copy()
5113 env['PATH'] = str(os.path.dirname(clang_format_tool))
5114 try:
5115 script = clang_format.FindClangFormatScriptInChromiumTree(
5116 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005117 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005118 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005119
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005120 cmd = [sys.executable, script, '-p0']
5121 if not opts.dry_run and not opts.diff:
5122 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005123
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005124 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5125 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005126
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005127 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5128 if opts.diff:
5129 sys.stdout.write(stdout)
5130 if opts.dry_run and len(stdout) > 0:
5131 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005132
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005133 # Similar code to above, but using yapf on .py files rather than clang-format
5134 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005135 py_explicitly_disabled = opts.python is not None and not opts.python
5136 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005137 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5138 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5139 if sys.platform.startswith('win'):
5140 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005141
Aiden Bennerc08566e2018-10-03 17:52:42 +00005142 # If we couldn't find a yapf file we'll default to the chromium style
5143 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005144 chromium_default_yapf_style = os.path.join(depot_tools_path,
5145 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005146 # Used for caching.
5147 yapf_configs = {}
5148 for f in python_diff_files:
5149 # Find the yapf style config for the current file, defaults to depot
5150 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005151 _FindYapfConfigFile(f, yapf_configs, top_dir)
5152
5153 # Turn on python formatting by default if a yapf config is specified.
5154 # This breaks in the case of this repo though since the specified
5155 # style file is also the global default.
5156 if opts.python is None:
5157 filtered_py_files = []
5158 for f in python_diff_files:
5159 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5160 filtered_py_files.append(f)
5161 else:
5162 filtered_py_files = python_diff_files
5163
5164 # Note: yapf still seems to fix indentation of the entire file
5165 # even if line ranges are specified.
5166 # See https://github.com/google/yapf/issues/499
5167 if not opts.full and filtered_py_files:
5168 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5169
5170 for f in filtered_py_files:
5171 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5172 if yapf_config is None:
5173 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005174
5175 cmd = [yapf_tool, '--style', yapf_config, f]
5176
5177 has_formattable_lines = False
5178 if not opts.full:
5179 # Only run yapf over changed line ranges.
5180 for diff_start, diff_len in py_line_diffs[f]:
5181 diff_end = diff_start + diff_len - 1
5182 # Yapf errors out if diff_end < diff_start but this
5183 # is a valid line range diff for a removal.
5184 if diff_end >= diff_start:
5185 has_formattable_lines = True
5186 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5187 # If all line diffs were removals we have nothing to format.
5188 if not has_formattable_lines:
5189 continue
5190
5191 if opts.diff or opts.dry_run:
5192 cmd += ['--diff']
5193 # Will return non-zero exit code if non-empty diff.
5194 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5195 if opts.diff:
5196 sys.stdout.write(stdout)
5197 elif len(stdout) > 0:
5198 return_value = 2
5199 else:
5200 cmd += ['-i']
5201 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005202
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005203 # Dart's formatter does not have the nice property of only operating on
5204 # modified chunks, so hard code full.
5205 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005206 try:
5207 command = [dart_format.FindDartFmtToolInChromiumTree()]
5208 if not opts.dry_run and not opts.diff:
5209 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005210 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005211
ppi@chromium.org6593d932016-03-03 15:41:15 +00005212 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005213 if opts.dry_run and stdout:
5214 return_value = 2
5215 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005216 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5217 'found in this checkout. Files in other languages are still '
5218 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005219
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005220 # Format GN build files. Always run on full build files for canonical form.
5221 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005222 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005223 if opts.dry_run or opts.diff:
5224 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005225 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005226 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5227 shell=sys.platform == 'win32',
5228 cwd=top_dir)
5229 if opts.dry_run and gn_ret == 2:
5230 return_value = 2 # Not formatted.
5231 elif opts.diff and gn_ret == 2:
5232 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005233 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005234 elif gn_ret != 0:
5235 # For non-dry run cases (and non-2 return values for dry-run), a
5236 # nonzero error code indicates a failure, probably because the file
5237 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005238 DieWithError('gn format failed on ' + gn_diff_file +
5239 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005240
Ilya Shermane081cbe2017-08-15 17:51:04 -07005241 # Skip the metrics formatting from the global presubmit hook. These files have
5242 # a separate presubmit hook that issues an error if the files need formatting,
5243 # whereas the top-level presubmit script merely issues a warning. Formatting
5244 # these files is somewhat slow, so it's important not to duplicate the work.
5245 if not opts.presubmit:
5246 for xml_dir in GetDirtyMetricsDirs(diff_files):
5247 tool_dir = os.path.join(top_dir, xml_dir)
5248 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5249 if opts.dry_run or opts.diff:
5250 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005251 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005252 if opts.diff:
5253 sys.stdout.write(stdout)
5254 if opts.dry_run and stdout:
5255 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005256
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005257 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005258
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005259
Steven Holte2e664bf2017-04-21 13:10:47 -07005260def GetDirtyMetricsDirs(diff_files):
5261 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5262 metrics_xml_dirs = [
5263 os.path.join('tools', 'metrics', 'actions'),
5264 os.path.join('tools', 'metrics', 'histograms'),
5265 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005266 os.path.join('tools', 'metrics', 'ukm'),
5267 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005268 for xml_dir in metrics_xml_dirs:
5269 if any(file.startswith(xml_dir) for file in xml_diff_files):
5270 yield xml_dir
5271
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005272
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005273@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005274@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005275def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005276 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005277 _, args = parser.parse_args(args)
5278
5279 if len(args) != 1:
5280 parser.print_help()
5281 return 1
5282
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005283 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005284 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005285 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005286
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005287 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005288
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005289 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005290 output = RunGit(['config', '--local', '--get-regexp',
5291 r'branch\..*\.%s' % issueprefix],
5292 error_ok=True)
5293 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005294 if issue == target_issue:
5295 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005296
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005297 branches = []
5298 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005299 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005300 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005301 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005302 return 1
5303 if len(branches) == 1:
5304 RunGit(['checkout', branches[0]])
5305 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005306 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005307 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005308 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309 which = raw_input('Choose by index: ')
5310 try:
5311 RunGit(['checkout', branches[int(which)]])
5312 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005314 return 1
5315
5316 return 0
5317
5318
maruel@chromium.org29404b52014-09-08 22:58:00 +00005319def CMDlol(parser, args):
5320 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005321 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005322 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5323 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5324 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005325 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005326 return 0
5327
5328
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005329class OptionParser(optparse.OptionParser):
5330 """Creates the option parse and add --verbose support."""
5331 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005332 optparse.OptionParser.__init__(
5333 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005334 self.add_option(
5335 '-v', '--verbose', action='count', default=0,
5336 help='Use 2 times for more debugging info')
5337
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005338 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005339 try:
5340 return self._parse_args(args)
5341 finally:
5342 # Regardless of success or failure of args parsing, we want to report
5343 # metrics, but only after logging has been initialized (if parsing
5344 # succeeded).
5345 global settings
5346 settings = Settings()
5347
5348 if not metrics.DISABLE_METRICS_COLLECTION:
5349 # GetViewVCUrl ultimately calls logging method.
5350 project_url = settings.GetViewVCUrl().strip('/+')
5351 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5352 metrics.collector.add('project_urls', [project_url])
5353
5354 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005355 # Create an optparse.Values object that will store only the actual passed
5356 # options, without the defaults.
5357 actual_options = optparse.Values()
5358 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5359 # Create an optparse.Values object with the default options.
5360 options = optparse.Values(self.get_default_values().__dict__)
5361 # Update it with the options passed by the user.
5362 options._update_careful(actual_options.__dict__)
5363 # Store the options passed by the user in an _actual_options attribute.
5364 # We store only the keys, and not the values, since the values can contain
5365 # arbitrary information, which might be PII.
5366 metrics.collector.add('arguments', actual_options.__dict__.keys())
5367
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005368 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005369 logging.basicConfig(
5370 level=levels[min(options.verbose, len(levels) - 1)],
5371 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5372 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005373
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005374 return options, args
5375
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005376
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005377def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005378 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005379 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005380 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005381 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005382
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005383 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005384 dispatcher = subcommand.CommandDispatcher(__name__)
5385 try:
5386 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005387 except auth.AuthenticationError as e:
5388 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005389 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005390 if e.code != 500:
5391 raise
5392 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005393 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005394 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005395 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005396
5397
5398if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005399 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5400 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005401 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005402 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005403 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005404 sys.exit(main(sys.argv[1:]))