blob: 3837d4dd7af33221a5e248ab0d4b35ed9bf537d2 [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)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000318 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000319 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
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000418 return {m: b for m, b in masters.items()}
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:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000455 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000456 print('Bucket:', bucket)
457 print('\n'.join(
458 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000459 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000460 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 = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000498 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000499 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
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000504 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000505 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 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000535 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000536 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
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000591def _filter_failed_for_retry(all_builds):
592 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000593
594 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000595 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 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 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000603
604 def _builder_of(build):
605 builder = build['builder']
606 return (builder['project'], builder['bucket'], builder['builder'])
607
608 res = collections.defaultdict(dict)
609 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
610 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
611 # If builder had several builds, retry only if the last one failed.
612 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
613 # build, but in case of retrying failed jobs retrying a flaky one makes
614 # sense.
615 builds = list(builds)
616 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
617 continue
618 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
619 for t in builds[-1]['tags']):
620 # Don't retry experimental build previously triggered by CQ.
621 continue
622 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
623 # Don't retry if any are running.
624 continue
625 res[proj + '/' + buck][bldr] = []
626 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000627
628
qyearsleyeab3c042016-08-24 09:18:28 -0700629def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000630 """Prints nicely result of fetch_try_jobs."""
631 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000632 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633 return
634
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000635 longest_builder = max(len(b['builder']['builder']) for b in builds)
636 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000638 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
639 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000640
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000641 builds_by_status = {}
642 for b in builds:
643 builds_by_status.setdefault(b['status'], []).append({
644 'id': b['id'],
645 'name': name_fmt.format(
646 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
647 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000648
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000649 sort_key = lambda b: (b['name'], b['id'])
650
651 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000652 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000653 if not builds:
654 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000655
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000656 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000657 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000658 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000659 else:
660 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
661
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000662 print(colorize(title))
663 for b in sorted(builds, key=sort_key):
664 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000665
666 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000667 print_builds(
668 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
669 print_builds(
670 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
671 color=Fore.MAGENTA)
672 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
673 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
674 color=Fore.MAGENTA)
675 print_builds('Started:', builds_by_status.pop('STARTED', []))
676 print_builds(
677 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000678 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000679 print_builds(
680 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000681 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000682
683
Aiden Bennerc08566e2018-10-03 17:52:42 +0000684def _ComputeDiffLineRanges(files, upstream_commit):
685 """Gets the changed line ranges for each file since upstream_commit.
686
687 Parses a git diff on provided files and returns a dict that maps a file name
688 to an ordered list of range tuples in the form (start_line, count).
689 Ranges are in the same format as a git diff.
690 """
691 # If files is empty then diff_output will be a full diff.
692 if len(files) == 0:
693 return {}
694
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000695 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000696 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
697 diff_output = RunGit(diff_cmd)
698
699 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
700 # 2 capture groups
701 # 0 == fname of diff file
702 # 1 == 'diff_start,diff_count' or 'diff_start'
703 # will match each of
704 # diff --git a/foo.foo b/foo.py
705 # @@ -12,2 +14,3 @@
706 # @@ -12,2 +17 @@
707 # running re.findall on the above string with pattern will give
708 # [('foo.py', ''), ('', '14,3'), ('', '17')]
709
710 curr_file = None
711 line_diffs = {}
712 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
713 if match[0] != '':
714 # Will match the second filename in diff --git a/a.py b/b.py.
715 curr_file = match[0]
716 line_diffs[curr_file] = []
717 else:
718 # Matches +14,3
719 if ',' in match[1]:
720 diff_start, diff_count = match[1].split(',')
721 else:
722 # Single line changes are of the form +12 instead of +12,1.
723 diff_start = match[1]
724 diff_count = 1
725
726 diff_start = int(diff_start)
727 diff_count = int(diff_count)
728
729 # If diff_count == 0 this is a removal we can ignore.
730 line_diffs[curr_file].append((diff_start, diff_count))
731
732 return line_diffs
733
734
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000735def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000736 """Checks if a yapf file is in any parent directory of fpath until top_dir.
737
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000738 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000739 is found returns None. Uses yapf_config_cache as a cache for previously found
740 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000741 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000742 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000743 # Return result if we've already computed it.
744 if fpath in yapf_config_cache:
745 return yapf_config_cache[fpath]
746
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000747 parent_dir = os.path.dirname(fpath)
748 if os.path.isfile(fpath):
749 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000750 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000751 # Otherwise fpath is a directory
752 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
753 if os.path.isfile(yapf_file):
754 ret = yapf_file
755 elif fpath == top_dir or parent_dir == fpath:
756 # If we're at the top level directory, or if we're at root
757 # there is no provided style.
758 ret = None
759 else:
760 # Otherwise recurse on the current directory.
761 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000762 yapf_config_cache[fpath] = ret
763 return ret
764
765
Aaron Gable13101a62018-02-09 13:20:41 -0800766def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000767 """Prints statistics about the change to the user."""
768 # --no-ext-diff is broken in some versions of Git, so try to work around
769 # this by overriding the environment (but there is still a problem if the
770 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000771 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000772 if 'GIT_EXTERNAL_DIFF' in env:
773 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000774
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000775 try:
776 stdout = sys.stdout.fileno()
777 except AttributeError:
778 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000779 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800780 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000781 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000782
783
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000784class BuildbucketResponseException(Exception):
785 pass
786
787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788class Settings(object):
789 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000791 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792 self.tree_status_url = None
793 self.viewvc_url = None
794 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000795 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000796 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000797 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000798 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799
800 def LazyUpdateIfNeeded(self):
801 """Updates the settings from a codereview.settings file, if available."""
802 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000803 # The only value that actually changes the behavior is
804 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000805 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000806 error_ok=True
807 ).strip().lower()
808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000810 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 LoadCodereviewSettingsFromFile(cr_settings_file)
812 self.updated = True
813
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000814 @staticmethod
815 def GetRelativeRoot():
816 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000817
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000818 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000819 if self.root is None:
820 self.root = os.path.abspath(self.GetRelativeRoot())
821 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000823 def GetTreeStatusUrl(self, error_ok=False):
824 if not self.tree_status_url:
825 error_message = ('You must configure your tree status URL by running '
826 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000827 self.tree_status_url = self._GetConfig(
828 'rietveld.tree-status-url', error_ok=error_ok,
829 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000830 return self.tree_status_url
831
832 def GetViewVCUrl(self):
833 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000834 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 return self.viewvc_url
836
rmistry@google.com90752582014-01-14 21:04:50 +0000837 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000838 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000839
rmistry@google.com5626a922015-02-26 14:03:30 +0000840 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000841 run_post_upload_hook = self._GetConfig(
842 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000843 return run_post_upload_hook == "True"
844
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000845 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000846 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000847
ukai@chromium.orge8077812012-02-03 03:41:46 +0000848 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000849 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000850 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700851 self.is_gerrit = (
852 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000853 return self.is_gerrit
854
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000855 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000856 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000857 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700858 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
859 if self.squash_gerrit_uploads is None:
860 # Default is squash now (http://crbug.com/611892#c23).
861 self.squash_gerrit_uploads = not (
862 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
863 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000864 return self.squash_gerrit_uploads
865
tandriia60502f2016-06-20 02:01:53 -0700866 def GetSquashGerritUploadsOverride(self):
867 """Return True or False if codereview.settings should be overridden.
868
869 Returns None if no override has been defined.
870 """
871 # See also http://crbug.com/611892#c23
872 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
873 error_ok=True).strip()
874 if result == 'true':
875 return True
876 if result == 'false':
877 return False
878 return None
879
tandrii@chromium.org28253532016-04-14 13:46:56 +0000880 def GetGerritSkipEnsureAuthenticated(self):
881 """Return True if EnsureAuthenticated should not be done for Gerrit
882 uploads."""
883 if self.gerrit_skip_ensure_authenticated is None:
884 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000885 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000886 error_ok=True).strip() == 'true')
887 return self.gerrit_skip_ensure_authenticated
888
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000889 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000890 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000891 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000892 # Git requires single quotes for paths with spaces. We need to replace
893 # them with double quotes for Windows to treat such paths as a single
894 # path.
895 self.git_editor = self._GetConfig(
896 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000897 return self.git_editor or None
898
thestig@chromium.org44202a22014-03-11 19:22:18 +0000899 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000900 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000901 DEFAULT_LINT_REGEX)
902
903 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000904 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000905 DEFAULT_LINT_IGNORE_REGEX)
906
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000907 def _GetConfig(self, param, **kwargs):
908 self.LazyUpdateIfNeeded()
909 return RunGit(['config', param], **kwargs).strip()
910
911
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000912def ShortBranchName(branch):
913 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000914 return branch.replace('refs/heads/', '', 1)
915
916
917def GetCurrentBranchRef():
918 """Returns branch ref (e.g., refs/heads/master) or None."""
919 return RunGit(['symbolic-ref', 'HEAD'],
920 stderr=subprocess2.VOID, error_ok=True).strip() or None
921
922
923def GetCurrentBranch():
924 """Returns current branch or None.
925
926 For refs/heads/* branches, returns just last part. For others, full ref.
927 """
928 branchref = GetCurrentBranchRef()
929 if branchref:
930 return ShortBranchName(branchref)
931 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000932
933
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000934class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000935 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000936 NONE = 'none'
937 DRY_RUN = 'dry_run'
938 COMMIT = 'commit'
939
940 ALL_STATES = [NONE, DRY_RUN, COMMIT]
941
942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000944 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000945 self.issue = issue
946 self.patchset = patchset
947 self.hostname = hostname
948
949 @property
950 def valid(self):
951 return self.issue is not None
952
953
Edward Lemurf38bc172019-09-03 21:02:13 +0000954def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000955 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
956 fail_result = _ParsedIssueNumberArgument()
957
Edward Lemur678a6842019-10-03 22:25:05 +0000958 if isinstance(arg, int):
959 return _ParsedIssueNumberArgument(issue=arg)
960 if not isinstance(arg, basestring):
961 return fail_result
962
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000963 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000964 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000965 if not arg.startswith('http'):
966 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700967
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000968 url = gclient_utils.UpgradeToHttps(arg)
969 try:
970 parsed_url = urlparse.urlparse(url)
971 except ValueError:
972 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200973
Edward Lemur678a6842019-10-03 22:25:05 +0000974 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
975 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
976 # Short urls like https://domain/<issue_number> can be used, but don't allow
977 # specifying the patchset (you'd 404), but we allow that here.
978 if parsed_url.path == '/':
979 part = parsed_url.fragment
980 else:
981 part = parsed_url.path
982
983 match = re.match(
984 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
985 if not match:
986 return fail_result
987
988 issue = int(match.group('issue'))
989 patchset = match.group('patchset')
990 return _ParsedIssueNumberArgument(
991 issue=issue,
992 patchset=int(patchset) if patchset else None,
993 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000994
995
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000996def _create_description_from_log(args):
997 """Pulls out the commit log to use as a base for the CL description."""
998 log_args = []
999 if len(args) == 1 and not args[0].endswith('.'):
1000 log_args = [args[0] + '..']
1001 elif len(args) == 1 and args[0].endswith('...'):
1002 log_args = [args[0][:-1]]
1003 elif len(args) == 2:
1004 log_args = [args[0] + '..' + args[1]]
1005 else:
1006 log_args = args[:] # Hope for the best!
1007 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1008
1009
Aaron Gablea45ee112016-11-22 15:14:38 -08001010class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001011 def __init__(self, issue, url):
1012 self.issue = issue
1013 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001014 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001015
1016 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001017 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001018 self.issue, self.url)
1019
1020
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001021_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001022 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001023 # TODO(tandrii): these two aren't known in Gerrit.
1024 'approval', 'disapproval'])
1025
1026
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001027class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028 """Changelist works with one changelist in local branch.
1029
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001030 Notes:
1031 * Not safe for concurrent multi-{thread,process} use.
1032 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001033 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001034 """
1035
Edward Lemur125d60a2019-09-13 18:25:41 +00001036 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001037 """Create a new ChangeList instance.
1038
Edward Lemurf38bc172019-09-03 21:02:13 +00001039 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001040 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001042 global settings
1043 if not settings:
1044 # Happens when git_cl.py is used as a utility library.
1045 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.branchref = branchref
1048 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001049 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.branch = ShortBranchName(self.branchref)
1051 else:
1052 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001054 self.lookedup_issue = False
1055 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001056 self.has_description = False
1057 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001058 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001061 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001062 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001063 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001064
Edward Lemur125d60a2019-09-13 18:25:41 +00001065 # Lazily cached values.
1066 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1067 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1068 # Map from change number (issue) to its detail cache.
1069 self._detail_cache = {}
1070
1071 if codereview_host is not None:
1072 assert not codereview_host.startswith('https://'), codereview_host
1073 self._gerrit_host = codereview_host
1074 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001075
1076 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001077 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001078
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001079 The return value is a string suitable for passing to git cl with the --cc
1080 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001081 """
1082 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001083 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001084 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001085 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1086 return self.cc
1087
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001088 def GetCCListWithoutDefault(self):
1089 """Return the users cc'd on this CL excluding default ones."""
1090 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001091 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001092 return self.cc
1093
Daniel Cheng7227d212017-11-17 08:12:37 -08001094 def ExtendCC(self, more_cc):
1095 """Extends the list of users to cc on this CL based on the changed files."""
1096 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097
1098 def GetBranch(self):
1099 """Returns the short branch name, e.g. 'master'."""
1100 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001101 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001102 if not branchref:
1103 return None
1104 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 self.branch = ShortBranchName(self.branchref)
1106 return self.branch
1107
1108 def GetBranchRef(self):
1109 """Returns the full branch name, e.g. 'refs/heads/master'."""
1110 self.GetBranch() # Poke the lazy loader.
1111 return self.branchref
1112
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001113 def ClearBranch(self):
1114 """Clears cached branch data of this object."""
1115 self.branch = self.branchref = None
1116
tandrii5d48c322016-08-18 16:19:37 -07001117 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1118 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1119 kwargs['branch'] = self.GetBranch()
1120 return _git_get_branch_config_value(key, default, **kwargs)
1121
1122 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1123 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1124 assert self.GetBranch(), (
1125 'this CL must have an associated branch to %sset %s%s' %
1126 ('un' if value is None else '',
1127 key,
1128 '' if value is None else ' to %r' % value))
1129 kwargs['branch'] = self.GetBranch()
1130 return _git_set_branch_config_value(key, value, **kwargs)
1131
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001132 @staticmethod
1133 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001134 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 e.g. 'origin', 'refs/heads/master'
1136 """
1137 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001138 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1139
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001141 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001143 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1144 error_ok=True).strip()
1145 if upstream_branch:
1146 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001148 # Else, try to guess the origin remote.
1149 remote_branches = RunGit(['branch', '-r']).split()
1150 if 'origin/master' in remote_branches:
1151 # Fall back on origin/master if it exits.
1152 remote = 'origin'
1153 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001155 DieWithError(
1156 'Unable to determine default branch to diff against.\n'
1157 'Either pass complete "git diff"-style arguments, like\n'
1158 ' git cl upload origin/master\n'
1159 'or verify this branch is set up to track another \n'
1160 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161
1162 return remote, upstream_branch
1163
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001164 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001165 upstream_branch = self.GetUpstreamBranch()
1166 if not BranchExists(upstream_branch):
1167 DieWithError('The upstream for the current branch (%s) does not exist '
1168 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001169 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001170 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001171
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172 def GetUpstreamBranch(self):
1173 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001175 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001176 upstream_branch = upstream_branch.replace('refs/heads/',
1177 'refs/remotes/%s/' % remote)
1178 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1179 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180 self.upstream_branch = upstream_branch
1181 return self.upstream_branch
1182
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001183 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001184 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 remote, branch = None, self.GetBranch()
1186 seen_branches = set()
1187 while branch not in seen_branches:
1188 seen_branches.add(branch)
1189 remote, branch = self.FetchUpstreamTuple(branch)
1190 branch = ShortBranchName(branch)
1191 if remote != '.' or branch.startswith('refs/remotes'):
1192 break
1193 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001194 remotes = RunGit(['remote'], error_ok=True).split()
1195 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001197 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001199 logging.warn('Could not determine which remote this change is '
1200 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001201 else:
1202 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001203 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001204 branch = 'HEAD'
1205 if branch.startswith('refs/remotes'):
1206 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001207 elif branch.startswith('refs/branch-heads/'):
1208 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001209 else:
1210 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001211 return self._remote
1212
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001213 def GitSanityChecks(self, upstream_git_obj):
1214 """Checks git repo status and ensures diff is from local commits."""
1215
sbc@chromium.org79706062015-01-14 21:18:12 +00001216 if upstream_git_obj is None:
1217 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001218 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001219 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001220 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001221 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001222 return False
1223
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001224 # Verify the commit we're diffing against is in our current branch.
1225 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1226 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1227 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001228 print('ERROR: %s is not in the current branch. You may need to rebase '
1229 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001230 return False
1231
1232 # List the commits inside the diff, and verify they are all local.
1233 commits_in_diff = RunGit(
1234 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1235 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1236 remote_branch = remote_branch.strip()
1237 if code != 0:
1238 _, remote_branch = self.GetRemoteBranch()
1239
1240 commits_in_remote = RunGit(
1241 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1242
1243 common_commits = set(commits_in_diff) & set(commits_in_remote)
1244 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001245 print('ERROR: Your diff contains %d commits already in %s.\n'
1246 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1247 'the diff. If you are using a custom git flow, you can override'
1248 ' the reference used for this check with "git config '
1249 'gitcl.remotebranch <git-ref>".' % (
1250 len(common_commits), remote_branch, upstream_git_obj),
1251 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001252 return False
1253 return True
1254
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001255 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001256 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001257
1258 Returns None if it is not set.
1259 """
tandrii5d48c322016-08-18 16:19:37 -07001260 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001261
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262 def GetRemoteUrl(self):
1263 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1264
1265 Returns None if there is no remote.
1266 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001267 is_cached, value = self._cached_remote_url
1268 if is_cached:
1269 return value
1270
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001271 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001272 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1273
Edward Lemur298f2cf2019-02-22 21:40:39 +00001274 # Check if the remote url can be parsed as an URL.
1275 host = urlparse.urlparse(url).netloc
1276 if host:
1277 self._cached_remote_url = (True, url)
1278 return url
1279
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001280 # If it cannot be parsed as an url, assume it is a local directory,
1281 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001282 logging.warning('"%s" doesn\'t appear to point to a git host. '
1283 'Interpreting it as a local directory.', url)
1284 if not os.path.isdir(url):
1285 logging.error(
1286 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001287 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001288 return None
1289
1290 cache_path = url
1291 url = RunGit(['config', 'remote.%s.url' % remote],
1292 error_ok=True,
1293 cwd=url).strip()
1294
1295 host = urlparse.urlparse(url).netloc
1296 if not host:
1297 logging.error(
1298 'Remote "%(remote)s" for branch "%(branch)s" points to '
1299 '"%(cache_path)s", but it is misconfigured.\n'
1300 '"%(cache_path)s" must be a git repo and must have a remote named '
1301 '"%(remote)s" pointing to the git host.', {
1302 'remote': remote,
1303 'cache_path': cache_path,
1304 'branch': self.GetBranch()})
1305 return None
1306
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001307 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001308 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001310 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001311 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001312 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001313 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001314 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001315 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316 return self.issue
1317
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001318 def GetIssueURL(self):
1319 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001320 issue = self.GetIssue()
1321 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001322 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001323 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001324
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001325 def GetDescription(self, pretty=False, force=False):
1326 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001327 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001328 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001329 self.has_description = True
1330 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001331 # Set width to 72 columns + 2 space indent.
1332 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001333 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001334 lines = self.description.splitlines()
1335 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001336 return self.description
1337
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001338 def GetDescriptionFooters(self):
1339 """Returns (non_footer_lines, footers) for the commit message.
1340
1341 Returns:
1342 non_footer_lines (list(str)) - Simple list of description lines without
1343 any footer. The lines do not contain newlines, nor does the list contain
1344 the empty line between the message and the footers.
1345 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1346 [("Change-Id", "Ideadbeef...."), ...]
1347 """
1348 raw_description = self.GetDescription()
1349 msg_lines, _, footers = git_footers.split_footers(raw_description)
1350 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001351 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001352 return msg_lines, footers
1353
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001354 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001355 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001356 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001357 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001358 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001359 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001360 return self.patchset
1361
1362 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001363 """Set this branch's patchset. If patchset=0, clears the patchset."""
1364 assert self.GetBranch()
1365 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001366 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001367 else:
1368 self.patchset = int(patchset)
1369 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001370 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001371
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001372 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001373 """Set this branch's issue. If issue isn't given, clears the issue."""
1374 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001376 issue = int(issue)
1377 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001378 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001379 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001380 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001382 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001383 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001384 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385 else:
tandrii5d48c322016-08-18 16:19:37 -07001386 # Reset all of these just to be clean.
1387 reset_suffixes = [
1388 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001389 self.IssueConfigKey(),
1390 self.PatchsetConfigKey(),
1391 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001392 ] + self._PostUnsetIssueProperties()
1393 for prop in reset_suffixes:
1394 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001395 msg = RunGit(['log', '-1', '--format=%B']).strip()
1396 if msg and git_footers.get_footer_change_id(msg):
1397 print('WARNING: The change patched into this branch has a Change-Id. '
1398 'Removing it.')
1399 RunGit(['commit', '--amend', '-m',
1400 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001401 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001402 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001403 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404
dnjba1b0f32016-09-02 12:37:42 -07001405 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001406 if not self.GitSanityChecks(upstream_branch):
1407 DieWithError('\nGit sanity check failure')
1408
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001409 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001410 if not root:
1411 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001412 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001413
1414 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001415 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001416 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001417 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001418 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001419 except subprocess2.CalledProcessError:
1420 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001421 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001422 'This branch probably doesn\'t exist anymore. To reset the\n'
1423 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001424 ' git branch --set-upstream-to origin/master %s\n'
1425 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001426 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001427
maruel@chromium.org52424302012-08-29 15:14:30 +00001428 issue = self.GetIssue()
1429 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001430 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001431 description = self.GetDescription()
1432 else:
1433 # If the change was never uploaded, use the log messages of all commits
1434 # up to the branch point, as git cl upload will prefill the description
1435 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001436 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1437 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001438
1439 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001440 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001441 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001442 name,
1443 description,
1444 absroot,
1445 files,
1446 issue,
1447 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001448 author,
1449 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001450
dsansomee2d6fd92016-09-08 00:10:47 -07001451 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001452 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001453 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001454 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001455
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001456 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1457 """Sets the description for this CL remotely.
1458
1459 You can get description_lines and footers with GetDescriptionFooters.
1460
1461 Args:
1462 description_lines (list(str)) - List of CL description lines without
1463 newline characters.
1464 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1465 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1466 `List-Of-Tokens`). It will be case-normalized so that each token is
1467 title-cased.
1468 """
1469 new_description = '\n'.join(description_lines)
1470 if footers:
1471 new_description += '\n'
1472 for k, v in footers:
1473 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1474 if not git_footers.FOOTER_PATTERN.match(foot):
1475 raise ValueError('Invalid footer %r' % foot)
1476 new_description += foot + '\n'
1477 self.UpdateDescription(new_description, force)
1478
Edward Lesmes8e282792018-04-03 18:50:29 -04001479 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001480 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1481 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001482 start = time_time()
1483 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001484 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1485 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001486 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001487 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001488 metrics.collector.add_repeated('sub_commands', {
1489 'command': 'presubmit',
1490 'execution_time': time_time() - start,
1491 'exit_code': 0 if result.should_continue() else 1,
1492 })
1493 return result
vapierfd77ac72016-06-16 08:33:57 -07001494 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001495 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001496
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497 def CMDUpload(self, options, git_diff_args, orig_args):
1498 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001499 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001500 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001501 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001502 else:
1503 if self.GetBranch() is None:
1504 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1505
1506 # Default to diffing against common ancestor of upstream branch
1507 base_branch = self.GetCommonAncestorWithUpstream()
1508 git_diff_args = [base_branch, 'HEAD']
1509
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001510 # Fast best-effort checks to abort before running potentially expensive
1511 # hooks if uploading is likely to fail anyway. Passing these checks does
1512 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001513 self.EnsureAuthenticated(force=options.force)
1514 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515
1516 # Apply watchlists on upload.
1517 change = self.GetChange(base_branch, None)
1518 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1519 files = [f.LocalPath() for f in change.AffectedFiles()]
1520 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001521 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522
1523 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001524 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525 # Set the reviewer list now so that presubmit checks can access it.
1526 change_description = ChangeDescription(change.FullDescriptionText())
1527 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001528 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001529 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001530 change)
1531 change.SetDescriptionText(change_description.description)
1532 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001533 may_prompt=not options.force,
1534 verbose=options.verbose,
1535 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536 if not hook_results.should_continue():
1537 return 1
1538 if not options.reviewers and hook_results.reviewers:
1539 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001540 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541
Aaron Gable13101a62018-02-09 13:20:41 -08001542 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001543 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001545 _git_set_branch_config_value('last-upload-hash',
1546 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 # Run post upload hooks, if specified.
1548 if settings.GetRunPostUploadHook():
1549 presubmit_support.DoPostUploadExecuter(
1550 change,
1551 self,
1552 settings.GetRoot(),
1553 options.verbose,
1554 sys.stdout)
1555
1556 # Upload all dependencies if specified.
1557 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001558 print()
1559 print('--dependencies has been specified.')
1560 print('All dependent local branches will be re-uploaded.')
1561 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 # Remove the dependencies flag from args so that we do not end up in a
1563 # loop.
1564 orig_args.remove('--dependencies')
1565 ret = upload_branch_deps(self, orig_args)
1566 return ret
1567
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001568 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001569 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001570
1571 Issue must have been already uploaded and known.
1572 """
1573 assert new_state in _CQState.ALL_STATES
1574 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001575 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001576 vote_map = {
1577 _CQState.NONE: 0,
1578 _CQState.DRY_RUN: 1,
1579 _CQState.COMMIT: 2,
1580 }
1581 labels = {'Commit-Queue': vote_map[new_state]}
1582 notify = False if new_state == _CQState.DRY_RUN else None
1583 gerrit_util.SetReview(
1584 self._GetGerritHost(), self._GerritChangeIdentifier(),
1585 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001586 return 0
1587 except KeyboardInterrupt:
1588 raise
1589 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001590 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001591 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001592 ' * Your project has no CQ,\n'
1593 ' * You don\'t have permission to change the CQ state,\n'
1594 ' * There\'s a bug in this code (see stack trace below).\n'
1595 'Consider specifying which bots to trigger manually or asking your '
1596 'project owners for permissions or contacting Chrome Infra at:\n'
1597 'https://www.chromium.org/infra\n\n' %
1598 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001599 # Still raise exception so that stack trace is printed.
1600 raise
1601
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001602 def _GetGerritHost(self):
1603 # Lazy load of configs.
1604 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001605 if self._gerrit_host and '.' not in self._gerrit_host:
1606 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1607 # This happens for internal stuff http://crbug.com/614312.
1608 parsed = urlparse.urlparse(self.GetRemoteUrl())
1609 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001610 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001611 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001612 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1613 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001614 return self._gerrit_host
1615
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001616 def _GetGitHost(self):
1617 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001618 remote_url = self.GetRemoteUrl()
1619 if not remote_url:
1620 return None
1621 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001622
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001623 def GetCodereviewServer(self):
1624 if not self._gerrit_server:
1625 # If we're on a branch then get the server potentially associated
1626 # with that branch.
1627 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001628 self._gerrit_server = self._GitGetBranchConfigValue(
1629 self.CodereviewServerConfigKey())
1630 if self._gerrit_server:
1631 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001632 if not self._gerrit_server:
1633 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1634 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001635 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001636 parts[0] = parts[0] + '-review'
1637 self._gerrit_host = '.'.join(parts)
1638 self._gerrit_server = 'https://%s' % self._gerrit_host
1639 return self._gerrit_server
1640
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001641 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001642 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001643 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001644 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001645 logging.warn('can\'t detect Gerrit project.')
1646 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001647 project = urlparse.urlparse(remote_url).path.strip('/')
1648 if project.endswith('.git'):
1649 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001650 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1651 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1652 # gitiles/git-over-https protocol. E.g.,
1653 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1654 # as
1655 # https://chromium.googlesource.com/v8/v8
1656 if project.startswith('a/'):
1657 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001658 return project
1659
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001660 def _GerritChangeIdentifier(self):
1661 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1662
1663 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001664 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001665 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001666 project = self._GetGerritProject()
1667 if project:
1668 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1669 # Fall back on still unique, but less efficient change number.
1670 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001671
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001672 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001673 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001674 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675
tandrii5d48c322016-08-18 16:19:37 -07001676 @classmethod
1677 def PatchsetConfigKey(cls):
1678 return 'gerritpatchset'
1679
1680 @classmethod
1681 def CodereviewServerConfigKey(cls):
1682 return 'gerritserver'
1683
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001684 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001685 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001686 if settings.GetGerritSkipEnsureAuthenticated():
1687 # For projects with unusual authentication schemes.
1688 # See http://crbug.com/603378.
1689 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001690
1691 # Check presence of cookies only if using cookies-based auth method.
1692 cookie_auth = gerrit_util.Authenticator.get()
1693 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001694 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001695
Daniel Chengcf6269b2019-05-18 01:02:12 +00001696 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1697 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001698 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001699 return
1700
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001701 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702 self.GetCodereviewServer()
1703 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001704 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001705
1706 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1707 git_auth = cookie_auth.get_auth_header(git_host)
1708 if gerrit_auth and git_auth:
1709 if gerrit_auth == git_auth:
1710 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001711 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001712 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001713 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 ' %s\n'
1715 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001716 ' Consider running the following command:\n'
1717 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001718 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001719 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001720 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001721 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001722 cookie_auth.get_new_password_message(git_host)))
1723 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001724 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001725 return
1726 else:
1727 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001728 ([] if gerrit_auth else [self._gerrit_host]) +
1729 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001730 DieWithError('Credentials for the following hosts are required:\n'
1731 ' %s\n'
1732 'These are read from %s (or legacy %s)\n'
1733 '%s' % (
1734 '\n '.join(missing),
1735 cookie_auth.get_gitcookies_path(),
1736 cookie_auth.get_netrc_path(),
1737 cookie_auth.get_new_password_message(git_host)))
1738
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001739 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001740 if not self.GetIssue():
1741 return
1742
1743 # Warm change details cache now to avoid RPCs later, reducing latency for
1744 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001745 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001746 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001747
1748 status = self._GetChangeDetail()['status']
1749 if status in ('MERGED', 'ABANDONED'):
1750 DieWithError('Change %s has been %s, new uploads are not allowed' %
1751 (self.GetIssueURL(),
1752 'submitted' if status == 'MERGED' else 'abandoned'))
1753
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001754 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1755 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1756 # Apparently this check is not very important? Otherwise get_auth_email
1757 # could have been added to other implementations of Authenticator.
1758 cookies_auth = gerrit_util.Authenticator.get()
1759 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001760 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001761
1762 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001763 if self.GetIssueOwner() == cookies_user:
1764 return
1765 logging.debug('change %s owner is %s, cookies user is %s',
1766 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001768 # so ask what Gerrit thinks of this user.
1769 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1770 if details['email'] == self.GetIssueOwner():
1771 return
1772 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001773 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001774 'as %s.\n'
1775 'Uploading may fail due to lack of permissions.' %
1776 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1777 confirm_or_exit(action='upload')
1778
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001779 def _PostUnsetIssueProperties(self):
1780 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001781 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001782
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001783 def GetGerritObjForPresubmit(self):
1784 return presubmit_support.GerritAccessor(self._GetGerritHost())
1785
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001787 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788 or CQ status, assuming adherence to a common workflow.
1789
1790 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001791 * 'error' - error from review tool (including deleted issues)
1792 * 'unsent' - no reviewers added
1793 * 'waiting' - waiting for review
1794 * 'reply' - waiting for uploader to reply to review
1795 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001796 * 'dry-run' - dry-running in the CQ
1797 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001799 """
1800 if not self.GetIssue():
1801 return None
1802
1803 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001804 data = self._GetChangeDetail([
1805 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001806 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 return 'error'
1808
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001809 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001810 return 'closed'
1811
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001812 cq_label = data['labels'].get('Commit-Queue', {})
1813 max_cq_vote = 0
1814 for vote in cq_label.get('all', []):
1815 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1816 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001818 if max_cq_vote == 1:
1819 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820
Aaron Gable9ab38c62017-04-06 14:36:33 -07001821 if data['labels'].get('Code-Review', {}).get('approved'):
1822 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001823
1824 if not data.get('reviewers', {}).get('REVIEWER', []):
1825 return 'unsent'
1826
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001827 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001828 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1829 last_message_author = messages.pop().get('author', {})
1830 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001831 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1832 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001833 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001834 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001835 if last_message_author.get('_account_id') == owner:
1836 # Most recent message was by owner.
1837 return 'waiting'
1838 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001839 # Some reply from non-owner.
1840 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001841
1842 # Somehow there are no messages even though there are reviewers.
1843 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001844
1845 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001846 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001847 patchset = data['revisions'][data['current_revision']]['_number']
1848 self.SetPatchset(patchset)
1849 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001850
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001851 def FetchDescription(self, force=False):
1852 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1853 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001854 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001855 return data['revisions'][current_rev]['commit']['message'].encode(
1856 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001857
dsansomee2d6fd92016-09-08 00:10:47 -07001858 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001859 if gerrit_util.HasPendingChangeEdit(
1860 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001861 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001862 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001863 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001864 'unpublished edit. Either publish the edit in the Gerrit web UI '
1865 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001866
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001867 gerrit_util.DeletePendingChangeEdit(
1868 self._GetGerritHost(), self._GerritChangeIdentifier())
1869 gerrit_util.SetCommitMessage(
1870 self._GetGerritHost(), self._GerritChangeIdentifier(),
1871 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001872
Aaron Gable636b13f2017-07-14 10:42:48 -07001873 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001874 gerrit_util.SetReview(
1875 self._GetGerritHost(), self._GerritChangeIdentifier(),
1876 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001877
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001878 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001879 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001880 # CURRENT_REVISION is included to get the latest patchset so that
1881 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001882 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001883 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1884 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001885 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001886 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001887 robot_file_comments = gerrit_util.GetChangeRobotComments(
1888 self._GetGerritHost(), self._GerritChangeIdentifier())
1889
1890 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001891 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001892 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001893 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001894 line_comments = file_comments.setdefault(path, [])
1895 line_comments.extend(
1896 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001897
1898 # Build dictionary of file comments for easy access and sorting later.
1899 # {author+date: {path: {patchset: {line: url+message}}}}
1900 comments = collections.defaultdict(
1901 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001902 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001903 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001904 tag = comment.get('tag', '')
1905 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001906 continue
1907 key = (comment['author']['email'], comment['updated'])
1908 if comment.get('side', 'REVISION') == 'PARENT':
1909 patchset = 'Base'
1910 else:
1911 patchset = 'PS%d' % comment['patch_set']
1912 line = comment.get('line', 0)
1913 url = ('https://%s/c/%s/%s/%s#%s%s' %
1914 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1915 'b' if comment.get('side') == 'PARENT' else '',
1916 str(line) if line else ''))
1917 comments[key][path][patchset][line] = (url, comment['message'])
1918
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001919 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001920 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001921 summary = self._BuildCommentSummary(msg, comments, readable)
1922 if summary:
1923 summaries.append(summary)
1924 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001925
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001926 @staticmethod
1927 def _BuildCommentSummary(msg, comments, readable):
1928 key = (msg['author']['email'], msg['date'])
1929 # Don't bother showing autogenerated messages that don't have associated
1930 # file or line comments. this will filter out most autogenerated
1931 # messages, but will keep robot comments like those from Tricium.
1932 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1933 if is_autogenerated and not comments.get(key):
1934 return None
1935 message = msg['message']
1936 # Gerrit spits out nanoseconds.
1937 assert len(msg['date'].split('.')[-1]) == 9
1938 date = datetime.datetime.strptime(msg['date'][:-3],
1939 '%Y-%m-%d %H:%M:%S.%f')
1940 if key in comments:
1941 message += '\n'
1942 for path, patchsets in sorted(comments.get(key, {}).items()):
1943 if readable:
1944 message += '\n%s' % path
1945 for patchset, lines in sorted(patchsets.items()):
1946 for line, (url, content) in sorted(lines.items()):
1947 if line:
1948 line_str = 'Line %d' % line
1949 path_str = '%s:%d:' % (path, line)
1950 else:
1951 line_str = 'File comment'
1952 path_str = '%s:0:' % path
1953 if readable:
1954 message += '\n %s, %s: %s' % (patchset, line_str, url)
1955 message += '\n %s\n' % content
1956 else:
1957 message += '\n%s ' % path_str
1958 message += '\n%s\n' % content
1959
1960 return _CommentSummary(
1961 date=date,
1962 message=message,
1963 sender=msg['author']['email'],
1964 autogenerated=is_autogenerated,
1965 # These could be inferred from the text messages and correlated with
1966 # Code-Review label maximum, however this is not reliable.
1967 # Leaving as is until the need arises.
1968 approval=False,
1969 disapproval=False,
1970 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001971
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001972 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001973 gerrit_util.AbandonChange(
1974 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001975
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001976 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001977 gerrit_util.SubmitChange(
1978 self._GetGerritHost(), self._GerritChangeIdentifier(),
1979 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001980
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00001981 def _GetChangeDetail(self, options=None, no_cache=False):
1982 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001983
1984 If fresh data is needed, set no_cache=True which will clear cache and
1985 thus new data will be fetched from Gerrit.
1986 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001987 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001988 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001989
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001990 # Optimization to avoid multiple RPCs:
1991 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
1992 'CURRENT_COMMIT' not in options):
1993 options.append('CURRENT_COMMIT')
1994
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001995 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001996 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001997 options = [o.upper() for o in options]
1998
1999 # Check in cache first unless no_cache is True.
2000 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002001 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002002 else:
2003 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002004 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002005 # Assumption: data fetched before with extra options is suitable
2006 # for return for a smaller set of options.
2007 # For example, if we cached data for
2008 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2009 # and request is for options=[CURRENT_REVISION],
2010 # THEN we can return prior cached data.
2011 if options_set.issubset(cached_options_set):
2012 return data
2013
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002014 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002015 data = gerrit_util.GetChangeDetail(
2016 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002017 except gerrit_util.GerritError as e:
2018 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002019 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002020 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002021
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002022 self._detail_cache.setdefault(cache_key, []).append(
2023 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002024 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002025
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002026 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002027 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002028 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002029 data = gerrit_util.GetChangeCommit(
2030 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002031 except gerrit_util.GerritError as e:
2032 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002033 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002034 raise
agable32978d92016-11-01 12:55:02 -07002035 return data
2036
Karen Qian40c19422019-03-13 21:28:29 +00002037 def _IsCqConfigured(self):
2038 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002039 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002040 return False
2041 # TODO(crbug/753213): Remove temporary hack
2042 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002043 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002044 detail['branch'].startswith('refs/branch-heads/')):
2045 return False
2046 return True
2047
Olivier Robin75ee7252018-04-13 10:02:56 +02002048 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002049 if git_common.is_dirty_git_tree('land'):
2050 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002051
tandriid60367b2016-06-22 05:25:12 -07002052 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002053 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002054 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002055 'which can test and land changes for you. '
2056 'Are you sure you wish to bypass it?\n',
2057 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002058 differs = True
tandriic4344b52016-08-29 06:04:54 -07002059 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002060 # Note: git diff outputs nothing if there is no diff.
2061 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002062 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002064 if detail['current_revision'] == last_upload:
2065 differs = False
2066 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002067 print('WARNING: Local branch contents differ from latest uploaded '
2068 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002069 if differs:
2070 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002071 confirm_or_exit(
2072 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2073 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002074 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002075 elif not bypass_hooks:
2076 hook_results = self.RunHook(
2077 committing=True,
2078 may_prompt=not force,
2079 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002080 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2081 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002082 if not hook_results.should_continue():
2083 return 1
2084
2085 self.SubmitIssue(wait_for_merge=True)
2086 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002087 links = self._GetChangeCommit().get('web_links', [])
2088 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002089 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002090 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002091 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002092 return 0
2093
Edward Lemurf38bc172019-09-03 21:02:13 +00002094 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002095 assert parsed_issue_arg.valid
2096
Edward Lemur125d60a2019-09-13 18:25:41 +00002097 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002098
2099 if parsed_issue_arg.hostname:
2100 self._gerrit_host = parsed_issue_arg.hostname
2101 self._gerrit_server = 'https://%s' % self._gerrit_host
2102
tandriic2405f52016-10-10 08:13:15 -07002103 try:
2104 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002105 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002106 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002107
2108 if not parsed_issue_arg.patchset:
2109 # Use current revision by default.
2110 revision_info = detail['revisions'][detail['current_revision']]
2111 patchset = int(revision_info['_number'])
2112 else:
2113 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002114 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2116 break
2117 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002118 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 (parsed_issue_arg.patchset, self.GetIssue()))
2120
Edward Lemur125d60a2019-09-13 18:25:41 +00002121 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002122 if remote_url.endswith('.git'):
2123 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002124 remote_url = remote_url.rstrip('/')
2125
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002126 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002127 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002128
2129 if remote_url != fetch_info['url']:
2130 DieWithError('Trying to patch a change from %s but this repo appears '
2131 'to be %s.' % (fetch_info['url'], remote_url))
2132
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002134
Aaron Gable62619a32017-06-16 08:22:09 -07002135 if force:
2136 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2137 print('Checked out commit for change %i patchset %i locally' %
2138 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002139 elif nocommit:
2140 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2141 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002142 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002143 RunGit(['cherry-pick', 'FETCH_HEAD'])
2144 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002145 (parsed_issue_arg.issue, patchset))
2146 print('Note: this created a local commit which does not have '
2147 'the same hash as the one uploaded for review. This will make '
2148 'uploading changes based on top of this branch difficult.\n'
2149 'If you want to do that, use "git cl patch --force" instead.')
2150
Stefan Zagerd08043c2017-10-12 12:07:02 -07002151 if self.GetBranch():
2152 self.SetIssue(parsed_issue_arg.issue)
2153 self.SetPatchset(patchset)
2154 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2155 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2156 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2157 else:
2158 print('WARNING: You are in detached HEAD state.\n'
2159 'The patch has been applied to your checkout, but you will not be '
2160 'able to upload a new patch set to the gerrit issue.\n'
2161 'Try using the \'-b\' option if you would like to work on a '
2162 'branch and/or upload a new patch set.')
2163
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 return 0
2165
tandrii16e0b4e2016-06-07 10:34:28 -07002166 def _GerritCommitMsgHookCheck(self, offer_removal):
2167 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2168 if not os.path.exists(hook):
2169 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002170 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2171 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002172 data = gclient_utils.FileRead(hook)
2173 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2174 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002175 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002176 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002177 'and may interfere with it in subtle ways.\n'
2178 'We recommend you remove the commit-msg hook.')
2179 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002180 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002181 gclient_utils.rm_file_or_tree(hook)
2182 print('Gerrit commit-msg hook removed.')
2183 else:
2184 print('OK, will keep Gerrit commit-msg hook in place.')
2185
Edward Lemur1b52d872019-05-09 21:12:12 +00002186 def _CleanUpOldTraces(self):
2187 """Keep only the last |MAX_TRACES| traces."""
2188 try:
2189 traces = sorted([
2190 os.path.join(TRACES_DIR, f)
2191 for f in os.listdir(TRACES_DIR)
2192 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2193 and not f.startswith('tmp'))
2194 ])
2195 traces_to_delete = traces[:-MAX_TRACES]
2196 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002197 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002198 except OSError:
2199 print('WARNING: Failed to remove old git traces from\n'
2200 ' %s'
2201 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002202
Edward Lemur5737f022019-05-17 01:24:00 +00002203 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002204 """Zip and write the git push traces stored in traces_dir."""
2205 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002206 traces_zip = trace_name + '-traces'
2207 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002208 # Create a temporary dir to store git config and gitcookies in. It will be
2209 # compressed and stored next to the traces.
2210 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002211 git_info_zip = trace_name + '-git-info'
2212
Edward Lemur5737f022019-05-17 01:24:00 +00002213 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002214 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002215 git_push_metadata['now'] = git_push_metadata['now'].decode(
2216 sys.stdin.encoding)
2217
Edward Lemur1b52d872019-05-09 21:12:12 +00002218 git_push_metadata['trace_name'] = trace_name
2219 gclient_utils.FileWrite(
2220 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2221
2222 # Keep only the first 6 characters of the git hashes on the packet
2223 # trace. This greatly decreases size after compression.
2224 packet_traces = os.path.join(traces_dir, 'trace-packet')
2225 if os.path.isfile(packet_traces):
2226 contents = gclient_utils.FileRead(packet_traces)
2227 gclient_utils.FileWrite(
2228 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2229 shutil.make_archive(traces_zip, 'zip', traces_dir)
2230
2231 # Collect and compress the git config and gitcookies.
2232 git_config = RunGit(['config', '-l'])
2233 gclient_utils.FileWrite(
2234 os.path.join(git_info_dir, 'git-config'),
2235 git_config)
2236
2237 cookie_auth = gerrit_util.Authenticator.get()
2238 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2239 gitcookies_path = cookie_auth.get_gitcookies_path()
2240 if os.path.isfile(gitcookies_path):
2241 gitcookies = gclient_utils.FileRead(gitcookies_path)
2242 gclient_utils.FileWrite(
2243 os.path.join(git_info_dir, 'gitcookies'),
2244 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2245 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2246
Edward Lemur1b52d872019-05-09 21:12:12 +00002247 gclient_utils.rmtree(git_info_dir)
2248
2249 def _RunGitPushWithTraces(
2250 self, change_desc, refspec, refspec_opts, git_push_metadata):
2251 """Run git push and collect the traces resulting from the execution."""
2252 # Create a temporary directory to store traces in. Traces will be compressed
2253 # and stored in a 'traces' dir inside depot_tools.
2254 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002255 trace_name = os.path.join(
2256 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002257
2258 env = os.environ.copy()
2259 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2260 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002261 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002262 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2263 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2264 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2265
2266 try:
2267 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002268 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002269 before_push = time_time()
2270 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002271 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002272 env=env,
2273 print_stdout=True,
2274 # Flush after every line: useful for seeing progress when running as
2275 # recipe.
2276 filter_fn=lambda _: sys.stdout.flush())
2277 except subprocess2.CalledProcessError as e:
2278 push_returncode = e.returncode
2279 DieWithError('Failed to create a change. Please examine output above '
2280 'for the reason of the failure.\n'
2281 'Hint: run command below to diagnose common Git/Gerrit '
2282 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002283 ' git cl creds-check\n'
2284 '\n'
2285 'If git-cl is not working correctly, file a bug under the '
2286 'Infra>SDK component including the files below.\n'
2287 'Review the files before upload, since they might contain '
2288 'sensitive information.\n'
2289 'Set the Restrict-View-Google label so that they are not '
2290 'publicly accessible.\n'
2291 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002292 change_desc)
2293 finally:
2294 execution_time = time_time() - before_push
2295 metrics.collector.add_repeated('sub_commands', {
2296 'command': 'git push',
2297 'execution_time': execution_time,
2298 'exit_code': push_returncode,
2299 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2300 })
2301
Edward Lemur1b52d872019-05-09 21:12:12 +00002302 git_push_metadata['execution_time'] = execution_time
2303 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002304 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002305
Edward Lemur1b52d872019-05-09 21:12:12 +00002306 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002307 gclient_utils.rmtree(traces_dir)
2308
2309 return push_stdout
2310
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002311 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002313 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002314 # Load default for user, repo, squash=true, in this order.
2315 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002316
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002318 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002319 # This may be None; default fallback value is determined in logic below.
2320 title = options.title
2321
Dominic Battre7d1c4842017-10-27 09:17:28 +02002322 # Extract bug number from branch name.
2323 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002324 fixed = options.fixed
2325 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2326 self.GetBranch())
2327 if not bug and not fixed and match:
2328 if match.group('type') == 'bug':
2329 bug = match.group('bugnum')
2330 else:
2331 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002332
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002333 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002334 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002335 if self.GetIssue():
2336 # Try to get the message from a previous upload.
2337 message = self.GetDescription()
2338 if not message:
2339 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002340 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002342 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002343 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002344 # When uploading a subsequent patchset, -m|--message is taken
2345 # as the patchset title if --title was not provided.
2346 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002347 else:
2348 default_title = RunGit(
2349 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002350 if options.force:
2351 title = default_title
2352 else:
2353 title = ask_for_data(
2354 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 change_id = self._GetChangeDetail()['change_id']
2356 while True:
2357 footer_change_ids = git_footers.get_footer_change_id(message)
2358 if footer_change_ids == [change_id]:
2359 break
2360 if not footer_change_ids:
2361 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002362 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002363 continue
2364 # There is already a valid footer but with different or several ids.
2365 # Doing this automatically is non-trivial as we don't want to lose
2366 # existing other footers, yet we want to append just 1 desired
2367 # Change-Id. Thus, just create a new footer, but let user verify the
2368 # new description.
2369 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002370 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002372 print(
2373 'WARNING: change %s has Change-Id footer(s):\n'
2374 ' %s\n'
2375 'but change has Change-Id %s, according to Gerrit.\n'
2376 'Please, check the proposed correction to the description, '
2377 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2378 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2379 change_id))
2380 confirm_or_exit(action='edit')
2381 change_desc.prompt()
2382
2383 message = change_desc.description
2384 if not message:
2385 DieWithError("Description is empty. Aborting...")
2386
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 # Continue the while loop.
2388 # Sanity check of this code - we should end up with proper message
2389 # footer.
2390 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002391 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002392 else: # if not self.GetIssue()
2393 if options.message:
2394 message = options.message
2395 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002396 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002397 if options.title:
2398 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002399 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002400 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002401 change_desc.prompt()
2402
Aaron Gableb56ad332017-01-06 15:24:31 -08002403 # On first upload, patchset title is always this string, while
2404 # --title flag gets converted to first line of message.
2405 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 if not change_desc.description:
2407 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002408 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 if len(change_ids) > 1:
2410 DieWithError('too many Change-Id footers, at most 1 allowed.')
2411 if not change_ids:
2412 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002413 change_desc.set_description(git_footers.add_footer_change_id(
2414 change_desc.description,
2415 GenerateGerritChangeId(change_desc.description)))
2416 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002417 assert len(change_ids) == 1
2418 change_id = change_ids[0]
2419
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002420 if options.reviewers or options.tbrs or options.add_owners_to:
2421 change_desc.update_reviewers(options.reviewers, options.tbrs,
2422 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002423 if options.preserve_tryjobs:
2424 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002425
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002427 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2428 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002429 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002430 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2431 desc_tempfile.write(change_desc.description)
2432 desc_tempfile.close()
2433 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2434 '-F', desc_tempfile.name]).strip()
2435 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002436 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002437 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002438 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002439 if not change_desc.description:
2440 DieWithError("Description is empty. Aborting...")
2441
2442 if not git_footers.get_footer_change_id(change_desc.description):
2443 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002444 change_desc.set_description(
2445 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002446 if options.reviewers or options.tbrs or options.add_owners_to:
2447 change_desc.update_reviewers(options.reviewers, options.tbrs,
2448 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002450 # For no-squash mode, we assume the remote called "origin" is the one we
2451 # want. It is not worthwhile to support different workflows for
2452 # no-squash mode.
2453 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002454 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2455
2456 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002457 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002458 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2459 ref_to_push)]).splitlines()
2460 if len(commits) > 1:
2461 print('WARNING: This will upload %d commits. Run the following command '
2462 'to see which commits will be uploaded: ' % len(commits))
2463 print('git log %s..%s' % (parent, ref_to_push))
2464 print('You can also use `git squash-branch` to squash these into a '
2465 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002466 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002467
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002468 if options.reviewers or options.tbrs or options.add_owners_to:
2469 change_desc.update_reviewers(options.reviewers, options.tbrs,
2470 options.add_owners_to, change)
2471
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002472 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002473 cc = []
2474 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2475 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2476 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002477 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002478 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002479 if options.cc:
2480 cc.extend(options.cc)
2481 cc = filter(None, [email.strip() for email in cc])
2482 if change_desc.get_cced():
2483 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002484 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2485 valid_accounts = set(reviewers + cc)
2486 # TODO(crbug/877717): relax this for all hosts.
2487 else:
2488 valid_accounts = gerrit_util.ValidAccounts(
2489 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002490 logging.info('accounts %s are recognized, %s invalid',
2491 sorted(valid_accounts),
2492 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002493
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002494 # Extra options that can be specified at push time. Doc:
2495 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002496 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002497
Aaron Gable844cf292017-06-28 11:32:59 -07002498 # By default, new changes are started in WIP mode, and subsequent patchsets
2499 # don't send email. At any time, passing --send-mail will mark the change
2500 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002501 if options.send_mail:
2502 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002503 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002504 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002505 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002506 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002507 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002508
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002509 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002510 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002511
Aaron Gable9b713dd2016-12-14 16:04:21 -08002512 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002513 # Punctuation and whitespace in |title| must be percent-encoded.
2514 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002515
agablec6787972016-09-09 16:13:34 -07002516 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002517 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002518
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002519 for r in sorted(reviewers):
2520 if r in valid_accounts:
2521 refspec_opts.append('r=%s' % r)
2522 reviewers.remove(r)
2523 else:
2524 # TODO(tandrii): this should probably be a hard failure.
2525 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2526 % r)
2527 for c in sorted(cc):
2528 # refspec option will be rejected if cc doesn't correspond to an
2529 # account, even though REST call to add such arbitrary cc may succeed.
2530 if c in valid_accounts:
2531 refspec_opts.append('cc=%s' % c)
2532 cc.remove(c)
2533
rmistry9eadede2016-09-19 11:22:43 -07002534 if options.topic:
2535 # Documentation on Gerrit topics is here:
2536 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002537 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002538
Edward Lemur687ca902018-12-05 02:30:30 +00002539 if options.enable_auto_submit:
2540 refspec_opts.append('l=Auto-Submit+1')
2541 if options.use_commit_queue:
2542 refspec_opts.append('l=Commit-Queue+2')
2543 elif options.cq_dry_run:
2544 refspec_opts.append('l=Commit-Queue+1')
2545
2546 if change_desc.get_reviewers(tbr_only=True):
2547 score = gerrit_util.GetCodeReviewTbrScore(
2548 self._GetGerritHost(),
2549 self._GetGerritProject())
2550 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002551
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002552 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002553 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002554 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002555 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002556 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2557
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002558 refspec_suffix = ''
2559 if refspec_opts:
2560 refspec_suffix = '%' + ','.join(refspec_opts)
2561 assert ' ' not in refspec_suffix, (
2562 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2563 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2564
Edward Lemur1b52d872019-05-09 21:12:12 +00002565 git_push_metadata = {
2566 'gerrit_host': self._GetGerritHost(),
2567 'title': title or '<untitled>',
2568 'change_id': change_id,
2569 'description': change_desc.description,
2570 }
2571 push_stdout = self._RunGitPushWithTraces(
2572 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002573
2574 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002575 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002576 change_numbers = [m.group(1)
2577 for m in map(regex.match, push_stdout.splitlines())
2578 if m]
2579 if len(change_numbers) != 1:
2580 DieWithError(
2581 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002582 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002583 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002584 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002585
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002586 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002587 # GetIssue() is not set in case of non-squash uploads according to tests.
2588 # TODO(agable): non-squash uploads in git cl should be removed.
2589 gerrit_util.AddReviewers(
2590 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002591 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002592 reviewers, cc,
2593 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002594
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002595 return 0
2596
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002597 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2598 change_desc):
2599 """Computes parent of the generated commit to be uploaded to Gerrit.
2600
2601 Returns revision or a ref name.
2602 """
2603 if custom_cl_base:
2604 # Try to avoid creating additional unintended CLs when uploading, unless
2605 # user wants to take this risk.
2606 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2607 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2608 local_ref_of_target_remote])
2609 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002610 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002611 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2612 'If you proceed with upload, more than 1 CL may be created by '
2613 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2614 'If you are certain that specified base `%s` has already been '
2615 'uploaded to Gerrit as another CL, you may proceed.\n' %
2616 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2617 if not force:
2618 confirm_or_exit(
2619 'Do you take responsibility for cleaning up potential mess '
2620 'resulting from proceeding with upload?',
2621 action='upload')
2622 return custom_cl_base
2623
Aaron Gablef97e33d2017-03-30 15:44:27 -07002624 if remote != '.':
2625 return self.GetCommonAncestorWithUpstream()
2626
2627 # If our upstream branch is local, we base our squashed commit on its
2628 # squashed version.
2629 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2630
Aaron Gablef97e33d2017-03-30 15:44:27 -07002631 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002632 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002633
2634 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002635 # TODO(tandrii): consider checking parent change in Gerrit and using its
2636 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2637 # the tree hash of the parent branch. The upside is less likely bogus
2638 # requests to reupload parent change just because it's uploadhash is
2639 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002640 parent = RunGit(['config',
2641 'branch.%s.gerritsquashhash' % upstream_branch_name],
2642 error_ok=True).strip()
2643 # Verify that the upstream branch has been uploaded too, otherwise
2644 # Gerrit will create additional CLs when uploading.
2645 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2646 RunGitSilent(['rev-parse', parent + ':'])):
2647 DieWithError(
2648 '\nUpload upstream branch %s first.\n'
2649 'It is likely that this branch has been rebased since its last '
2650 'upload, so you just need to upload it again.\n'
2651 '(If you uploaded it with --no-squash, then branch dependencies '
2652 'are not supported, and you should reupload with --squash.)'
2653 % upstream_branch_name,
2654 change_desc)
2655 return parent
2656
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002657 def _AddChangeIdToCommitMessage(self, options, args):
2658 """Re-commits using the current message, assumes the commit hook is in
2659 place.
2660 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002661 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002662 git_command = ['commit', '--amend', '-m', log_desc]
2663 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002664 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002665 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002666 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002667 return new_log_desc
2668 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002669 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002670
tandriie113dfd2016-10-11 10:20:12 -07002671 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002672 try:
2673 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002674 except GerritChangeNotExists:
2675 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002676
2677 if data['status'] in ('ABANDONED', 'MERGED'):
2678 return 'CL %s is closed' % self.GetIssue()
2679
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002680 def GetGerritChange(self, patchset=None):
2681 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2682 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2683 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002684 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002685 data = self._GetChangeDetail(['ALL_REVISIONS'])
2686
2687 assert host and issue and patchset, 'CL must be uploaded first'
2688
2689 has_patchset = any(
2690 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002691 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002692 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002693 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002694 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002695
tandrii8c5a3532016-11-04 07:52:02 -07002696 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002697 'host': host,
2698 'change': issue,
2699 'project': data['project'],
2700 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002701 }
tandriie113dfd2016-10-11 10:20:12 -07002702
tandriide281ae2016-10-12 06:02:30 -07002703 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002704 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002705
Edward Lemur707d70b2018-02-07 00:50:14 +01002706 def GetReviewers(self):
2707 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002708 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002709
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002710
2711_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002712 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002713}
2714
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002715
iannuccie53c9352016-08-17 14:40:40 -07002716def _add_codereview_issue_select_options(parser, extra=""):
2717 _add_codereview_select_options(parser)
2718
2719 text = ('Operate on this issue number instead of the current branch\'s '
2720 'implicit issue.')
2721 if extra:
2722 text += ' '+extra
2723 parser.add_option('-i', '--issue', type=int, help=text)
2724
2725
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002726def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002727 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002728 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002729 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002730 parser.add_option_group(parser.codereview_group)
2731 parser.codereview_group.add_option(
2732 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002733 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002734
2735
tandriif9aefb72016-07-01 09:06:51 -07002736def _get_bug_line_values(default_project, bugs):
2737 """Given default_project and comma separated list of bugs, yields bug line
2738 values.
2739
2740 Each bug can be either:
2741 * a number, which is combined with default_project
2742 * string, which is left as is.
2743
2744 This function may produce more than one line, because bugdroid expects one
2745 project per line.
2746
2747 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2748 ['v8:123', 'chromium:789']
2749 """
2750 default_bugs = []
2751 others = []
2752 for bug in bugs.split(','):
2753 bug = bug.strip()
2754 if bug:
2755 try:
2756 default_bugs.append(int(bug))
2757 except ValueError:
2758 others.append(bug)
2759
2760 if default_bugs:
2761 default_bugs = ','.join(map(str, default_bugs))
2762 if default_project:
2763 yield '%s:%s' % (default_project, default_bugs)
2764 else:
2765 yield default_bugs
2766 for other in sorted(others):
2767 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2768 yield other
2769
2770
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002771class ChangeDescription(object):
2772 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002773 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002774 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002775 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002776 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002777 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002778 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2779 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2780 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2781 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002782
Dan Beamd8b04ca2019-10-10 21:23:26 +00002783 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002784 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002785 if bug:
2786 regexp = re.compile(self.BUG_LINE)
2787 prefix = settings.GetBugPrefix()
2788 if not any((regexp.match(line) for line in self._description_lines)):
2789 values = list(_get_bug_line_values(prefix, bug))
2790 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002791 if fixed:
2792 regexp = re.compile(self.FIXED_LINE)
2793 prefix = settings.GetBugPrefix()
2794 if not any((regexp.match(line) for line in self._description_lines)):
2795 values = list(_get_bug_line_values(prefix, fixed))
2796 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002797
agable@chromium.org42c20792013-09-12 17:34:49 +00002798 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002799 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 return '\n'.join(self._description_lines)
2801
2802 def set_description(self, desc):
2803 if isinstance(desc, basestring):
2804 lines = desc.splitlines()
2805 else:
2806 lines = [line.rstrip() for line in desc]
2807 while lines and not lines[0]:
2808 lines.pop(0)
2809 while lines and not lines[-1]:
2810 lines.pop(-1)
2811 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002812
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002813 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2814 """Rewrites the R=/TBR= line(s) as a single line each.
2815
2816 Args:
2817 reviewers (list(str)) - list of additional emails to use for reviewers.
2818 tbrs (list(str)) - list of additional emails to use for TBRs.
2819 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2820 the change that are missing OWNER coverage. If this is not None, you
2821 must also pass a value for `change`.
2822 change (Change) - The Change that should be used for OWNERS lookups.
2823 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002824 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002825 assert isinstance(tbrs, list), tbrs
2826
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002827 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002828 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002829
2830 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002831 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002832
2833 reviewers = set(reviewers)
2834 tbrs = set(tbrs)
2835 LOOKUP = {
2836 'TBR': tbrs,
2837 'R': reviewers,
2838 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002839
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002840 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002841 regexp = re.compile(self.R_LINE)
2842 matches = [regexp.match(line) for line in self._description_lines]
2843 new_desc = [l for i, l in enumerate(self._description_lines)
2844 if not matches[i]]
2845 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002846
agable@chromium.org42c20792013-09-12 17:34:49 +00002847 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002848
2849 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 for match in matches:
2851 if not match:
2852 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002853 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2854
2855 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002856 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002857 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002858 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002859 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002860 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002861 LOOKUP[add_owners_to].update(
2862 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002863
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002864 # If any folks ended up in both groups, remove them from tbrs.
2865 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002866
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002867 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2868 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002869
2870 # Put the new lines in the description where the old first R= line was.
2871 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2872 if 0 <= line_loc < len(self._description_lines):
2873 if new_tbr_line:
2874 self._description_lines.insert(line_loc, new_tbr_line)
2875 if new_r_line:
2876 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002878 if new_r_line:
2879 self.append_footer(new_r_line)
2880 if new_tbr_line:
2881 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002882
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002883 def set_preserve_tryjobs(self):
2884 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2885 footers = git_footers.parse_footers(self.description)
2886 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2887 if v.lower() == 'true':
2888 return
2889 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2890
Anthony Polito8b955342019-09-24 19:01:36 +00002891 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 self.set_description([
2894 '# Enter a description of the change.',
2895 '# This will be displayed on the codereview site.',
2896 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002897 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002898 '--------------------',
2899 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002900 bug_regexp = re.compile(self.BUG_LINE)
2901 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002902 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002903 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2904 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002905 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002906
agable@chromium.org42c20792013-09-12 17:34:49 +00002907 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002908 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002909 if not content:
2910 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002911 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002912
Bruce Dawson2377b012018-01-11 16:46:49 -08002913 # Strip off comments and default inserted "Bug:" line.
2914 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002915 (line.startswith('#') or
2916 line.rstrip() == "Bug:" or
2917 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002918 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002919 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002920 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002921
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002922 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002923 """Adds a footer line to the description.
2924
2925 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2926 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2927 that Gerrit footers are always at the end.
2928 """
2929 parsed_footer_line = git_footers.parse_footer(line)
2930 if parsed_footer_line:
2931 # Line is a gerrit footer in the form: Footer-Key: any value.
2932 # Thus, must be appended observing Gerrit footer rules.
2933 self.set_description(
2934 git_footers.add_footer(self.description,
2935 key=parsed_footer_line[0],
2936 value=parsed_footer_line[1]))
2937 return
2938
2939 if not self._description_lines:
2940 self._description_lines.append(line)
2941 return
2942
2943 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2944 if gerrit_footers:
2945 # git_footers.split_footers ensures that there is an empty line before
2946 # actual (gerrit) footers, if any. We have to keep it that way.
2947 assert top_lines and top_lines[-1] == ''
2948 top_lines, separator = top_lines[:-1], top_lines[-1:]
2949 else:
2950 separator = [] # No need for separator if there are no gerrit_footers.
2951
2952 prev_line = top_lines[-1] if top_lines else ''
2953 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2954 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2955 top_lines.append('')
2956 top_lines.append(line)
2957 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002958
tandrii99a72f22016-08-17 14:33:24 -07002959 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002960 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002961 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002962 reviewers = [match.group(2).strip()
2963 for match in matches
2964 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002965 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002966
bradnelsond975b302016-10-23 12:20:23 -07002967 def get_cced(self):
2968 """Retrieves the list of reviewers."""
2969 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2970 cced = [match.group(2).strip() for match in matches if match]
2971 return cleanup_list(cced)
2972
Nodir Turakulov23b82142017-11-16 11:04:25 -08002973 def get_hash_tags(self):
2974 """Extracts and sanitizes a list of Gerrit hashtags."""
2975 subject = (self._description_lines or ('',))[0]
2976 subject = re.sub(
2977 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2978
2979 tags = []
2980 start = 0
2981 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2982 while True:
2983 m = bracket_exp.match(subject, start)
2984 if not m:
2985 break
2986 tags.append(self.sanitize_hash_tag(m.group(1)))
2987 start = m.end()
2988
2989 if not tags:
2990 # Try "Tag: " prefix.
2991 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2992 if m:
2993 tags.append(self.sanitize_hash_tag(m.group(1)))
2994 return tags
2995
2996 @classmethod
2997 def sanitize_hash_tag(cls, tag):
2998 """Returns a sanitized Gerrit hash tag.
2999
3000 A sanitized hashtag can be used as a git push refspec parameter value.
3001 """
3002 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3003
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003004 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3005 """Updates this commit description given the parent.
3006
3007 This is essentially what Gnumbd used to do.
3008 Consult https://goo.gl/WMmpDe for more details.
3009 """
3010 assert parent_msg # No, orphan branch creation isn't supported.
3011 assert parent_hash
3012 assert dest_ref
3013 parent_footer_map = git_footers.parse_footers(parent_msg)
3014 # This will also happily parse svn-position, which GnumbD is no longer
3015 # supporting. While we'd generate correct footers, the verifier plugin
3016 # installed in Gerrit will block such commit (ie git push below will fail).
3017 parent_position = git_footers.get_position(parent_footer_map)
3018
3019 # Cherry-picks may have last line obscuring their prior footers,
3020 # from git_footers perspective. This is also what Gnumbd did.
3021 cp_line = None
3022 if (self._description_lines and
3023 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3024 cp_line = self._description_lines.pop()
3025
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003026 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003027
3028 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3029 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003030 for i, line in enumerate(footer_lines):
3031 k, v = git_footers.parse_footer(line) or (None, None)
3032 if k and k.startswith('Cr-'):
3033 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003034
3035 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003036 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003037 if parent_position[0] == dest_ref:
3038 # Same branch as parent.
3039 number = int(parent_position[1]) + 1
3040 else:
3041 number = 1 # New branch, and extra lineage.
3042 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3043 int(parent_position[1])))
3044
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003045 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3046 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003047
3048 self._description_lines = top_lines
3049 if cp_line:
3050 self._description_lines.append(cp_line)
3051 if self._description_lines[-1] != '':
3052 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003053 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003054
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003055
Aaron Gablea1bab272017-04-11 16:38:18 -07003056def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003057 """Retrieves the reviewers that approved a CL from the issue properties with
3058 messages.
3059
3060 Note that the list may contain reviewers that are not committer, thus are not
3061 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003062
3063 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003064 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003065 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003066 return sorted(
3067 set(
3068 message['sender']
3069 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003070 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003071 )
3072 )
3073
3074
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003075def FindCodereviewSettingsFile(filename='codereview.settings'):
3076 """Finds the given file starting in the cwd and going up.
3077
3078 Only looks up to the top of the repository unless an
3079 'inherit-review-settings-ok' file exists in the root of the repository.
3080 """
3081 inherit_ok_file = 'inherit-review-settings-ok'
3082 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003083 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003084 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3085 root = '/'
3086 while True:
3087 if filename in os.listdir(cwd):
3088 if os.path.isfile(os.path.join(cwd, filename)):
3089 return open(os.path.join(cwd, filename))
3090 if cwd == root:
3091 break
3092 cwd = os.path.dirname(cwd)
3093
3094
3095def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003096 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003097 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003099 def SetProperty(name, setting, unset_error_ok=False):
3100 fullname = 'rietveld.' + name
3101 if setting in keyvals:
3102 RunGit(['config', fullname, keyvals[setting]])
3103 else:
3104 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3105
tandrii48df5812016-10-17 03:55:37 -07003106 if not keyvals.get('GERRIT_HOST', False):
3107 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003108 # Only server setting is required. Other settings can be absent.
3109 # In that case, we ignore errors raised during option deletion attempt.
3110 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3111 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3112 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003113 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003114 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3115 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003116 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3117 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003118
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003119 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003120 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003121
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003122 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003123 RunGit(['config', 'gerrit.squash-uploads',
3124 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003125
tandrii@chromium.org28253532016-04-14 13:46:56 +00003126 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003127 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003128 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3129
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003130 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003131 # should be of the form
3132 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3133 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003134 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3135 keyvals['ORIGIN_URL_CONFIG']])
3136
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003137
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003138def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003139 """Downloads a network object to a local file, like urllib.urlretrieve.
3140
3141 This is necessary because urllib is broken for SSL connections via a proxy.
3142 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003143 with open(destination, 'w') as f:
3144 f.write(urllib2.urlopen(source).read())
3145
3146
ukai@chromium.org712d6102013-11-27 00:52:58 +00003147def hasSheBang(fname):
3148 """Checks fname is a #! script."""
3149 with open(fname) as f:
3150 return f.read(2).startswith('#!')
3151
3152
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003153# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3154def DownloadHooks(*args, **kwargs):
3155 pass
3156
3157
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003158def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003159 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003160
3161 Args:
3162 force: True to update hooks. False to install hooks if not present.
3163 """
3164 if not settings.GetIsGerrit():
3165 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003166 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003167 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3168 if not os.access(dst, os.X_OK):
3169 if os.path.exists(dst):
3170 if not force:
3171 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003172 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003173 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003174 if not hasSheBang(dst):
3175 DieWithError('Not a script: %s\n'
3176 'You need to download from\n%s\n'
3177 'into .git/hooks/commit-msg and '
3178 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003179 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3180 except Exception:
3181 if os.path.exists(dst):
3182 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003183 DieWithError('\nFailed to download hooks.\n'
3184 'You need to download from\n%s\n'
3185 'into .git/hooks/commit-msg and '
3186 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003187
3188
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003189class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003190 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003191
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003192 _GOOGLESOURCE = 'googlesource.com'
3193
3194 def __init__(self):
3195 # Cached list of [host, identity, source], where source is either
3196 # .gitcookies or .netrc.
3197 self._all_hosts = None
3198
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003199 def ensure_configured_gitcookies(self):
3200 """Runs checks and suggests fixes to make git use .gitcookies from default
3201 path."""
3202 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3203 configured_path = RunGitSilent(
3204 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003205 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003206 if configured_path:
3207 self._ensure_default_gitcookies_path(configured_path, default)
3208 else:
3209 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003210
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003211 @staticmethod
3212 def _ensure_default_gitcookies_path(configured_path, default_path):
3213 assert configured_path
3214 if configured_path == default_path:
3215 print('git is already configured to use your .gitcookies from %s' %
3216 configured_path)
3217 return
3218
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003219 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003220 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3221 (configured_path, default_path))
3222
3223 if not os.path.exists(configured_path):
3224 print('However, your configured .gitcookies file is missing.')
3225 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3226 action='reconfigure')
3227 RunGit(['config', '--global', 'http.cookiefile', default_path])
3228 return
3229
3230 if os.path.exists(default_path):
3231 print('WARNING: default .gitcookies file already exists %s' %
3232 default_path)
3233 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3234 default_path)
3235
3236 confirm_or_exit('Move existing .gitcookies to default location?',
3237 action='move')
3238 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003239 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003240 print('Moved and reconfigured git to use .gitcookies from %s' %
3241 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003242
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003243 @staticmethod
3244 def _configure_gitcookies_path(default_path):
3245 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3246 if os.path.exists(netrc_path):
3247 print('You seem to be using outdated .netrc for git credentials: %s' %
3248 netrc_path)
3249 print('This tool will guide you through setting up recommended '
3250 '.gitcookies store for git credentials.\n'
3251 '\n'
3252 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3253 ' git config --global --unset http.cookiefile\n'
3254 ' mv %s %s.backup\n\n' % (default_path, default_path))
3255 confirm_or_exit(action='setup .gitcookies')
3256 RunGit(['config', '--global', 'http.cookiefile', default_path])
3257 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003258
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003259 def get_hosts_with_creds(self, include_netrc=False):
3260 if self._all_hosts is None:
3261 a = gerrit_util.CookiesAuthenticator()
3262 self._all_hosts = [
3263 (h, u, s)
3264 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003265 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3266 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003267 )
3268 if h.endswith(self._GOOGLESOURCE)
3269 ]
3270
3271 if include_netrc:
3272 return self._all_hosts
3273 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3274
3275 def print_current_creds(self, include_netrc=False):
3276 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3277 if not hosts:
3278 print('No Git/Gerrit credentials found')
3279 return
3280 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3281 header = [('Host', 'User', 'Which file'),
3282 ['=' * l for l in lengths]]
3283 for row in (header + hosts):
3284 print('\t'.join((('%%+%ds' % l) % s)
3285 for l, s in zip(lengths, row)))
3286
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003287 @staticmethod
3288 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003289 """Parses identity "git-<username>.domain" into <username> and domain."""
3290 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003291 # distinguishable from sub-domains. But we do know typical domains:
3292 if identity.endswith('.chromium.org'):
3293 domain = 'chromium.org'
3294 username = identity[:-len('.chromium.org')]
3295 else:
3296 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003297 if username.startswith('git-'):
3298 username = username[len('git-'):]
3299 return username, domain
3300
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003301 def _canonical_git_googlesource_host(self, host):
3302 """Normalizes Gerrit hosts (with '-review') to Git host."""
3303 assert host.endswith(self._GOOGLESOURCE)
3304 # Prefix doesn't include '.' at the end.
3305 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3306 if prefix.endswith('-review'):
3307 prefix = prefix[:-len('-review')]
3308 return prefix + '.' + self._GOOGLESOURCE
3309
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003310 def _canonical_gerrit_googlesource_host(self, host):
3311 git_host = self._canonical_git_googlesource_host(host)
3312 prefix = git_host.split('.', 1)[0]
3313 return prefix + '-review.' + self._GOOGLESOURCE
3314
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003315 def _get_counterpart_host(self, host):
3316 assert host.endswith(self._GOOGLESOURCE)
3317 git = self._canonical_git_googlesource_host(host)
3318 gerrit = self._canonical_gerrit_googlesource_host(git)
3319 return git if gerrit == host else gerrit
3320
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003321 def has_generic_host(self):
3322 """Returns whether generic .googlesource.com has been configured.
3323
3324 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3325 """
3326 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3327 if host == '.' + self._GOOGLESOURCE:
3328 return True
3329 return False
3330
3331 def _get_git_gerrit_identity_pairs(self):
3332 """Returns map from canonic host to pair of identities (Git, Gerrit).
3333
3334 One of identities might be None, meaning not configured.
3335 """
3336 host_to_identity_pairs = {}
3337 for host, identity, _ in self.get_hosts_with_creds():
3338 canonical = self._canonical_git_googlesource_host(host)
3339 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3340 idx = 0 if canonical == host else 1
3341 pair[idx] = identity
3342 return host_to_identity_pairs
3343
3344 def get_partially_configured_hosts(self):
3345 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003346 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003347 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003348 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003349
3350 def get_conflicting_hosts(self):
3351 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003352 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003353 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003354 if None not in (i1, i2) and i1 != i2)
3355
3356 def get_duplicated_hosts(self):
3357 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003358 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003359
3360 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3361 'chromium.googlesource.com': 'chromium.org',
3362 'chrome-internal.googlesource.com': 'google.com',
3363 }
3364
3365 def get_hosts_with_wrong_identities(self):
3366 """Finds hosts which **likely** reference wrong identities.
3367
3368 Note: skips hosts which have conflicting identities for Git and Gerrit.
3369 """
3370 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003371 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003372 pair = self._get_git_gerrit_identity_pairs().get(host)
3373 if pair and pair[0] == pair[1]:
3374 _, domain = self._parse_identity(pair[0])
3375 if domain != expected:
3376 hosts.add(host)
3377 return hosts
3378
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003379 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003380 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003381 hosts = sorted(hosts)
3382 assert hosts
3383 if extra_column_func is None:
3384 extras = [''] * len(hosts)
3385 else:
3386 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003387 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3388 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003389 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003390 lines.append(tmpl % he)
3391 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003392
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003393 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003394 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003395 yield ('.googlesource.com wildcard record detected',
3396 ['Chrome Infrastructure team recommends to list full host names '
3397 'explicitly.'],
3398 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003399
3400 dups = self.get_duplicated_hosts()
3401 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003402 yield ('The following hosts were defined twice',
3403 self._format_hosts(dups),
3404 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003405
3406 partial = self.get_partially_configured_hosts()
3407 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3409 'These hosts are missing',
3410 self._format_hosts(partial, lambda host: 'but %s defined' %
3411 self._get_counterpart_host(host)),
3412 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413
3414 conflicting = self.get_conflicting_hosts()
3415 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003416 yield ('The following Git hosts have differing credentials from their '
3417 'Gerrit counterparts',
3418 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3419 tuple(self._get_git_gerrit_identity_pairs()[host])),
3420 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003421
3422 wrong = self.get_hosts_with_wrong_identities()
3423 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003424 yield ('These hosts likely use wrong identity',
3425 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3426 (self._get_git_gerrit_identity_pairs()[host][0],
3427 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3428 wrong)
3429
3430 def find_and_report_problems(self):
3431 """Returns True if there was at least one problem, else False."""
3432 found = False
3433 bad_hosts = set()
3434 for title, sublines, hosts in self._find_problems():
3435 if not found:
3436 found = True
3437 print('\n\n.gitcookies problem report:\n')
3438 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003439 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003440 if sublines:
3441 print()
3442 print(' %s' % '\n '.join(sublines))
3443 print()
3444
3445 if bad_hosts:
3446 assert found
3447 print(' You can manually remove corresponding lines in your %s file and '
3448 'visit the following URLs with correct account to generate '
3449 'correct credential lines:\n' %
3450 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3451 print(' %s' % '\n '.join(sorted(set(
3452 gerrit_util.CookiesAuthenticator().get_new_password_url(
3453 self._canonical_git_googlesource_host(host))
3454 for host in bad_hosts
3455 ))))
3456 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003457
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003458
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003459@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003460def CMDcreds_check(parser, args):
3461 """Checks credentials and suggests changes."""
3462 _, _ = parser.parse_args(args)
3463
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003464 # Code below checks .gitcookies. Abort if using something else.
3465 authn = gerrit_util.Authenticator.get()
3466 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3467 if isinstance(authn, gerrit_util.GceAuthenticator):
3468 DieWithError(
3469 'This command is not designed for GCE, are you on a bot?\n'
3470 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3471 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003472 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003473 'This command is not designed for bot environment. It checks '
3474 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003475
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003476 checker = _GitCookiesChecker()
3477 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003478
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003479 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003480 checker.print_current_creds(include_netrc=True)
3481
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003482 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003483 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003484 return 0
3485 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003486
3487
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003488@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003489def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003490 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003491 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3492 branch = ShortBranchName(branchref)
3493 _, args = parser.parse_args(args)
3494 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003495 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003496 return RunGit(['config', 'branch.%s.base-url' % branch],
3497 error_ok=False).strip()
3498 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003499 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003500 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3501 error_ok=False).strip()
3502
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003503
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003504def color_for_status(status):
3505 """Maps a Changelist status to color, for CMDstatus and other tools."""
3506 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003507 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003508 'waiting': Fore.BLUE,
3509 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003510 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003511 'lgtm': Fore.GREEN,
3512 'commit': Fore.MAGENTA,
3513 'closed': Fore.CYAN,
3514 'error': Fore.WHITE,
3515 }.get(status, Fore.WHITE)
3516
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003517
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003518def get_cl_statuses(changes, fine_grained, max_processes=None):
3519 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003520
3521 If fine_grained is true, this will fetch CL statuses from the server.
3522 Otherwise, simply indicate if there's a matching url for the given branches.
3523
3524 If max_processes is specified, it is used as the maximum number of processes
3525 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3526 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003527
3528 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003529 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003530 if not changes:
3531 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003532
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003533 if not fine_grained:
3534 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003535 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003536 for cl in changes:
3537 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003538 return
3539
3540 # First, sort out authentication issues.
3541 logging.debug('ensuring credentials exist')
3542 for cl in changes:
3543 cl.EnsureAuthenticated(force=False, refresh=True)
3544
3545 def fetch(cl):
3546 try:
3547 return (cl, cl.GetStatus())
3548 except:
3549 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003550 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003551 raise
3552
3553 threads_count = len(changes)
3554 if max_processes:
3555 threads_count = max(1, min(threads_count, max_processes))
3556 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3557
3558 pool = ThreadPool(threads_count)
3559 fetched_cls = set()
3560 try:
3561 it = pool.imap_unordered(fetch, changes).__iter__()
3562 while True:
3563 try:
3564 cl, status = it.next(timeout=5)
3565 except multiprocessing.TimeoutError:
3566 break
3567 fetched_cls.add(cl)
3568 yield cl, status
3569 finally:
3570 pool.close()
3571
3572 # Add any branches that failed to fetch.
3573 for cl in set(changes) - fetched_cls:
3574 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003575
rmistry@google.com2dd99862015-06-22 12:22:18 +00003576
3577def upload_branch_deps(cl, args):
3578 """Uploads CLs of local branches that are dependents of the current branch.
3579
3580 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003581
3582 test1 -> test2.1 -> test3.1
3583 -> test3.2
3584 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003585
3586 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3587 run on the dependent branches in this order:
3588 test2.1, test3.1, test3.2, test2.2, test3.3
3589
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003590 Note: This function does not rebase your local dependent branches. Use it
3591 when you make a change to the parent branch that will not conflict
3592 with its dependent branches, and you would like their dependencies
3593 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003594 """
3595 if git_common.is_dirty_git_tree('upload-branch-deps'):
3596 return 1
3597
3598 root_branch = cl.GetBranch()
3599 if root_branch is None:
3600 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3601 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003602 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003603 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3604 'patchset dependencies without an uploaded CL.')
3605
3606 branches = RunGit(['for-each-ref',
3607 '--format=%(refname:short) %(upstream:short)',
3608 'refs/heads'])
3609 if not branches:
3610 print('No local branches found.')
3611 return 0
3612
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003613 # Create a dictionary of all local branches to the branches that are
3614 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003615 tracked_to_dependents = collections.defaultdict(list)
3616 for b in branches.splitlines():
3617 tokens = b.split()
3618 if len(tokens) == 2:
3619 branch_name, tracked = tokens
3620 tracked_to_dependents[tracked].append(branch_name)
3621
vapiera7fbd5a2016-06-16 09:17:49 -07003622 print()
3623 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003625
rmistry@google.com2dd99862015-06-22 12:22:18 +00003626 def traverse_dependents_preorder(branch, padding=''):
3627 dependents_to_process = tracked_to_dependents.get(branch, [])
3628 padding += ' '
3629 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631 dependents.append(dependent)
3632 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003633
rmistry@google.com2dd99862015-06-22 12:22:18 +00003634 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003635 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003636
3637 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003638 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003639 return 0
3640
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003641 confirm_or_exit('This command will checkout all dependent branches and run '
3642 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003643
rmistry@google.com2dd99862015-06-22 12:22:18 +00003644 # Record all dependents that failed to upload.
3645 failures = {}
3646 # Go through all dependents, checkout the branch and upload.
3647 try:
3648 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print()
3650 print('--------------------------------------')
3651 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003653 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003654 try:
3655 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003656 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003657 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003658 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003659 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003660 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003661 finally:
3662 # Swap back to the original root branch.
3663 RunGit(['checkout', '-q', root_branch])
3664
vapiera7fbd5a2016-06-16 09:17:49 -07003665 print()
3666 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003667 for dependent_branch in dependents:
3668 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print(' %s : %s' % (dependent_branch, upload_status))
3670 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003671
3672 return 0
3673
3674
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003675@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003676def CMDarchive(parser, args):
3677 """Archives and deletes branches associated with closed changelists."""
3678 parser.add_option(
3679 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003680 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003681 parser.add_option(
3682 '-f', '--force', action='store_true',
3683 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003684 parser.add_option(
3685 '-d', '--dry-run', action='store_true',
3686 help='Skip the branch tagging and removal steps.')
3687 parser.add_option(
3688 '-t', '--notags', action='store_true',
3689 help='Do not tag archived branches. '
3690 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003691
kmarshall3bff56b2016-06-06 18:31:47 -07003692 options, args = parser.parse_args(args)
3693 if args:
3694 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003695
3696 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3697 if not branches:
3698 return 0
3699
vapiera7fbd5a2016-06-16 09:17:49 -07003700 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003701 changes = [Changelist(branchref=b)
3702 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003703 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3704 statuses = get_cl_statuses(changes,
3705 fine_grained=True,
3706 max_processes=options.maxjobs)
3707 proposal = [(cl.GetBranch(),
3708 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3709 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003710 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003711 proposal.sort()
3712
3713 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003715 return 0
3716
3717 current_branch = GetCurrentBranch()
3718
vapiera7fbd5a2016-06-16 09:17:49 -07003719 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003720 if options.notags:
3721 for next_item in proposal:
3722 print(' ' + next_item[0])
3723 else:
3724 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3725 for next_item in proposal:
3726 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003727
kmarshall9249e012016-08-23 12:02:16 -07003728 # Quit now on precondition failure or if instructed by the user, either
3729 # via an interactive prompt or by command line flags.
3730 if options.dry_run:
3731 print('\nNo changes were made (dry run).\n')
3732 return 0
3733 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003734 print('You are currently on a branch \'%s\' which is associated with a '
3735 'closed codereview issue, so archive cannot proceed. Please '
3736 'checkout another branch and run this command again.' %
3737 current_branch)
3738 return 1
kmarshall9249e012016-08-23 12:02:16 -07003739 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003740 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3741 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003742 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003743 return 1
3744
3745 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003746 if not options.notags:
3747 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003748 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003749
vapiera7fbd5a2016-06-16 09:17:49 -07003750 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003751
3752 return 0
3753
3754
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003755@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003756def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003757 """Show status of changelists.
3758
3759 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003760 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003761 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003762 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003763 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003764 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003765 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003766 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003767
3768 Also see 'git cl comments'.
3769 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003770 parser.add_option(
3771 '--no-branch-color',
3772 action='store_true',
3773 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003774 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003775 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003776 parser.add_option('-f', '--fast', action='store_true',
3777 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003778 parser.add_option(
3779 '-j', '--maxjobs', action='store', type=int,
3780 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003781
iannuccie53c9352016-08-17 14:40:40 -07003782 _add_codereview_issue_select_options(
3783 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003784 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003785 if args:
3786 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003787
iannuccie53c9352016-08-17 14:40:40 -07003788 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003789 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003791 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003792 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003793 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003794 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003795 elif options.field == 'id':
3796 issueid = cl.GetIssue()
3797 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003798 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003799 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003800 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003801 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003803 elif options.field == 'status':
3804 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805 elif options.field == 'url':
3806 url = cl.GetIssueURL()
3807 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003808 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003809 return 0
3810
3811 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3812 if not branches:
3813 print('No local branch found.')
3814 return 0
3815
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003816 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003817 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003818 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003819 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003820 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003821 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003822 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003823
Daniel McArdlea23bf592019-02-12 00:25:12 +00003824 current_branch = GetCurrentBranch()
3825
3826 def FormatBranchName(branch, colorize=False):
3827 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3828 an asterisk when it is the current branch."""
3829
3830 asterisk = ""
3831 color = Fore.RESET
3832 if branch == current_branch:
3833 asterisk = "* "
3834 color = Fore.GREEN
3835 branch_name = ShortBranchName(branch)
3836
3837 if colorize:
3838 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003839 return asterisk + branch_name
3840
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003841 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003842
3843 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003844 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3845 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003846 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003847 c, status = output.next()
3848 branch_statuses[c.GetBranch()] = status
3849 status = branch_statuses.pop(branch)
3850 url = cl.GetIssueURL()
3851 if url and (not status or status == 'error'):
3852 # The issue probably doesn't exist anymore.
3853 url += ' (broken)'
3854
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003855 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003856 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003857 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003858 color = ''
3859 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003860 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003861
Alan Cuttera3be9a52019-03-04 18:50:33 +00003862 branch_display = FormatBranchName(branch)
3863 padding = ' ' * (alignment - len(branch_display))
3864 if not options.no_branch_color:
3865 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003866
Alan Cuttera3be9a52019-03-04 18:50:33 +00003867 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3868 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003869
vapiera7fbd5a2016-06-16 09:17:49 -07003870 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003871 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003872 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003873 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003874 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003875 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003876 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003877 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003878 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003879 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print('Issue description:')
3881 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882 return 0
3883
3884
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003885def colorize_CMDstatus_doc():
3886 """To be called once in main() to add colors to git cl status help."""
3887 colors = [i for i in dir(Fore) if i[0].isupper()]
3888
3889 def colorize_line(line):
3890 for color in colors:
3891 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003892 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003893 indent = len(line) - len(line.lstrip(' ')) + 1
3894 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3895 return line
3896
3897 lines = CMDstatus.__doc__.splitlines()
3898 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3899
3900
phajdan.jre328cf92016-08-22 04:12:17 -07003901def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003902 if path == '-':
3903 json.dump(contents, sys.stdout)
3904 else:
3905 with open(path, 'w') as f:
3906 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003907
3908
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003909@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003910@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003911def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003912 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003913
3914 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003915 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003916 parser.add_option('-r', '--reverse', action='store_true',
3917 help='Lookup the branch(es) for the specified issues. If '
3918 'no issues are specified, all branches with mapped '
3919 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003920 parser.add_option('--json',
3921 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003922 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003923 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003924
dnj@chromium.org406c4402015-03-03 17:22:28 +00003925 if options.reverse:
3926 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003927 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003928 # Reverse issue lookup.
3929 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003930
3931 git_config = {}
3932 for config in RunGit(['config', '--get-regexp',
3933 r'branch\..*issue']).splitlines():
3934 name, _space, val = config.partition(' ')
3935 git_config[name] = val
3936
dnj@chromium.org406c4402015-03-03 17:22:28 +00003937 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003938 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3939 config_key = _git_branch_config_key(ShortBranchName(branch),
3940 cls.IssueConfigKey())
3941 issue = git_config.get(config_key)
3942 if issue:
3943 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003944 if not args:
3945 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003946 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003947 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003948 try:
3949 issue_num = int(issue)
3950 except ValueError:
3951 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003952 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003953 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003954 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003955 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003956 if options.json:
3957 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003958 return 0
3959
3960 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003961 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003962 if not issue.valid:
3963 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3964 'or no argument to list it.\n'
3965 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003966 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003967 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003968 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003969 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003970 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3971 if options.json:
3972 write_json(options.json, {
3973 'issue': cl.GetIssue(),
3974 'issue_url': cl.GetIssueURL(),
3975 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003976 return 0
3977
3978
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003979@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003980def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003981 """Shows or posts review comments for any changelist."""
3982 parser.add_option('-a', '--add-comment', dest='comment',
3983 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003984 parser.add_option('-p', '--publish', action='store_true',
3985 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003986 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003987 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003988 parser.add_option('-m', '--machine-readable', dest='readable',
3989 action='store_false', default=True,
3990 help='output comments in a format compatible with '
3991 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003992 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003993 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003994 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003995 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003996
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003997 issue = None
3998 if options.issue:
3999 try:
4000 issue = int(options.issue)
4001 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004002 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004003
Edward Lemur934836a2019-09-09 20:16:54 +00004004 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004005
4006 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004007 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004008 return 0
4009
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004010 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4011 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004012 for comment in summary:
4013 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004014 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004015 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004016 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004017 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004018 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004019 elif comment.autogenerated:
4020 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004021 else:
4022 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004023 print('\n%s%s %s%s\n%s' % (
4024 color,
4025 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4026 comment.sender,
4027 Fore.RESET,
4028 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4029
smut@google.comc85ac942015-09-15 16:34:43 +00004030 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004031 def pre_serialize(c):
4032 dct = c.__dict__.copy()
4033 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4034 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004035 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004036 return 0
4037
4038
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004039@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004040@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004041def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004042 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004043 parser.add_option('-d', '--display', action='store_true',
4044 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004045 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004046 help='New description to set for this issue (- for stdin, '
4047 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004048 parser.add_option('-f', '--force', action='store_true',
4049 help='Delete any unpublished Gerrit edits for this issue '
4050 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004051
4052 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004053 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004054
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004055 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004056 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004057 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004058 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004059 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004060
Edward Lemur934836a2019-09-09 20:16:54 +00004061 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004062 if target_issue_arg:
4063 kwargs['issue'] = target_issue_arg.issue
4064 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004065
4066 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004067 if not cl.GetIssue():
4068 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004069
Edward Lemur678a6842019-10-03 22:25:05 +00004070 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004071 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004072
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004073 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004074
smut@google.com34fb6b12015-07-13 20:03:26 +00004075 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004077 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004078
4079 if options.new_description:
4080 text = options.new_description
4081 if text == '-':
4082 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004083 elif text == '+':
4084 base_branch = cl.GetCommonAncestorWithUpstream()
4085 change = cl.GetChange(base_branch, None, local_description=True)
4086 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004087
4088 description.set_description(text)
4089 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004090 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004091 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004092 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004093 return 0
4094
4095
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004096@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004097def CMDlint(parser, args):
4098 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004099 parser.add_option('--filter', action='append', metavar='-x,+y',
4100 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004101 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004102
4103 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004104 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004105 try:
4106 import cpplint
4107 import cpplint_chromium
4108 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004110 return 1
4111
4112 # Change the current working directory before calling lint so that it
4113 # shows the correct base.
4114 previous_cwd = os.getcwd()
4115 os.chdir(settings.GetRoot())
4116 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004117 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004118 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4119 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004120 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004121 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004122 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004123
4124 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004125 command = args + files
4126 if options.filter:
4127 command = ['--filter=' + ','.join(options.filter)] + command
4128 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004129
4130 white_regex = re.compile(settings.GetLintRegex())
4131 black_regex = re.compile(settings.GetLintIgnoreRegex())
4132 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4133 for filename in filenames:
4134 if white_regex.match(filename):
4135 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004136 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004137 else:
4138 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4139 extra_check_functions)
4140 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004141 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004142 finally:
4143 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004144 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004145 if cpplint._cpplint_state.error_count != 0:
4146 return 1
4147 return 0
4148
4149
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004150@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004151def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004152 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004153 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004154 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004155 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004156 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004157 parser.add_option('--all', action='store_true',
4158 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004159 parser.add_option('--parallel', action='store_true',
4160 help='Run all tests specified by input_api.RunTests in all '
4161 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004162 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004163
sbc@chromium.org71437c02015-04-09 19:29:40 +00004164 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004165 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004166 return 1
4167
Edward Lemur934836a2019-09-09 20:16:54 +00004168 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004169 if args:
4170 base_branch = args[0]
4171 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004172 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004173 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004174
Aaron Gable8076c282017-11-29 14:39:41 -08004175 if options.all:
4176 base_change = cl.GetChange(base_branch, None)
4177 files = [('M', f) for f in base_change.AllFiles()]
4178 change = presubmit_support.GitChange(
4179 base_change.Name(),
4180 base_change.FullDescriptionText(),
4181 base_change.RepositoryRoot(),
4182 files,
4183 base_change.issue,
4184 base_change.patchset,
4185 base_change.author_email,
4186 base_change._upstream)
4187 else:
4188 change = cl.GetChange(base_branch, None)
4189
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004190 cl.RunHook(
4191 committing=not options.upload,
4192 may_prompt=False,
4193 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004194 change=change,
4195 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004196 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004197
4198
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004199def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004200 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004201
4202 Works the same way as
4203 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4204 but can be called on demand on all platforms.
4205
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004206 The basic idea is to generate git hash of a state of the tree, original
4207 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004208 """
4209 lines = []
4210 tree_hash = RunGitSilent(['write-tree'])
4211 lines.append('tree %s' % tree_hash.strip())
4212 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4213 if code == 0:
4214 lines.append('parent %s' % parent.strip())
4215 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4216 lines.append('author %s' % author.strip())
4217 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4218 lines.append('committer %s' % committer.strip())
4219 lines.append('')
4220 # Note: Gerrit's commit-hook actually cleans message of some lines and
4221 # whitespace. This code is not doing this, but it clearly won't decrease
4222 # entropy.
4223 lines.append(message)
4224 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004225 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004226 return 'I%s' % change_hash.strip()
4227
4228
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004229def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004230 """Computes the remote branch ref to use for the CL.
4231
4232 Args:
4233 remote (str): The git remote for the CL.
4234 remote_branch (str): The git remote branch for the CL.
4235 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004236 """
4237 if not (remote and remote_branch):
4238 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004239
wittman@chromium.org455dc922015-01-26 20:15:50 +00004240 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004241 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004242 # refs, which are then translated into the remote full symbolic refs
4243 # below.
4244 if '/' not in target_branch:
4245 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4246 else:
4247 prefix_replacements = (
4248 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4249 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4250 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4251 )
4252 match = None
4253 for regex, replacement in prefix_replacements:
4254 match = re.search(regex, target_branch)
4255 if match:
4256 remote_branch = target_branch.replace(match.group(0), replacement)
4257 break
4258 if not match:
4259 # This is a branch path but not one we recognize; use as-is.
4260 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004261 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4262 # Handle the refs that need to land in different refs.
4263 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004264
wittman@chromium.org455dc922015-01-26 20:15:50 +00004265 # Create the true path to the remote branch.
4266 # Does the following translation:
4267 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4268 # * refs/remotes/origin/master -> refs/heads/master
4269 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4270 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4271 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4272 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4273 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4274 'refs/heads/')
4275 elif remote_branch.startswith('refs/remotes/branch-heads'):
4276 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004277
wittman@chromium.org455dc922015-01-26 20:15:50 +00004278 return remote_branch
4279
4280
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004281def cleanup_list(l):
4282 """Fixes a list so that comma separated items are put as individual items.
4283
4284 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4285 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4286 """
4287 items = sum((i.split(',') for i in l), [])
4288 stripped_items = (i.strip() for i in items)
4289 return sorted(filter(None, stripped_items))
4290
4291
Aaron Gable4db38df2017-11-03 14:59:07 -07004292@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004293@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004294def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004295 """Uploads the current changelist to codereview.
4296
4297 Can skip dependency patchset uploads for a branch by running:
4298 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004299 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004300 git config --unset branch.branch_name.skip-deps-uploads
4301 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004302
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004303 If the name of the checked out branch starts with "bug-" or "fix-" followed
4304 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004305 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004306
4307 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004308 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004309 [git-cl] add support for hashtags
4310 Foo bar: implement foo
4311 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004312 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004313 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4314 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004315 parser.add_option('--bypass-watchlists', action='store_true',
4316 dest='bypass_watchlists',
4317 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004318 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004319 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004320 parser.add_option('--message', '-m', dest='message',
4321 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004322 parser.add_option('-b', '--bug',
4323 help='pre-populate the bug number(s) for this issue. '
4324 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004325 parser.add_option('--message-file', dest='message_file',
4326 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004327 parser.add_option('--title', '-t', dest='title',
4328 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004329 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004330 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004331 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004332 parser.add_option('--tbrs',
4333 action='append', default=[],
4334 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004335 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004336 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004337 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004338 parser.add_option('--hashtag', dest='hashtags',
4339 action='append', default=[],
4340 help=('Gerrit hashtag for new CL; '
4341 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004342 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004343 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004344 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004345 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004346 metavar='TARGET',
4347 help='Apply CL to remote ref TARGET. ' +
4348 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004349 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004350 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004351 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004352 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004353 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004354 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004355 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4356 const='TBR', help='add a set of OWNERS to TBR')
4357 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4358 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004359 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004360 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004361 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 'implies --send-mail')
4363 parser.add_option('-d', '--cq-dry-run',
4364 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004365 help='Send the patchset to do a CQ dry run right after '
4366 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004367 parser.add_option('--preserve-tryjobs', action='store_true',
4368 help='instruct the CQ to let tryjobs running even after '
4369 'new patchsets are uploaded instead of canceling '
4370 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004371 parser.add_option('--dependencies', action='store_true',
4372 help='Uploads CLs of all the local branches that depend on '
4373 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004374 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4375 help='Sends your change to the CQ after an approval. Only '
4376 'works on repos that have the Auto-Submit label '
4377 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004378 parser.add_option('--parallel', action='store_true',
4379 help='Run all tests specified by input_api.RunTests in all '
4380 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004381 parser.add_option('--no-autocc', action='store_true',
4382 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004383 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004384 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004385 parser.add_option('-R', '--retry-failed', action='store_true',
4386 help='Retry failed tryjobs from old patchset immediately '
4387 'after uploading new patchset. Cannot be used with '
4388 '--use-commit-queue or --cq-dry-run.')
4389 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4390 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004391 parser.add_option('--fixed', '-x',
4392 help='List of bugs that will be commented on and marked '
4393 'fixed (pre-populates "Fixed:" tag). Same format as '
4394 '-b option / "Bug:" tag. If fixing several issues, '
4395 'separate with commas.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004396 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004397
rmistry@google.com2dd99862015-06-22 12:22:18 +00004398 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004399 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004400 (options, args) = parser.parse_args(args)
4401
sbc@chromium.org71437c02015-04-09 19:29:40 +00004402 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004403 return 1
4404
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004405 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004406 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004407 options.cc = cleanup_list(options.cc)
4408
tandriib80458a2016-06-23 12:20:07 -07004409 if options.message_file:
4410 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004411 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004412 options.message = gclient_utils.FileRead(options.message_file)
4413 options.message_file = None
4414
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004415 if ([options.cq_dry_run,
4416 options.use_commit_queue,
4417 options.retry_failed].count(True) > 1):
4418 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4419 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004420
Aaron Gableedbc4132017-09-11 13:22:28 -07004421 if options.use_commit_queue:
4422 options.send_mail = True
4423
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004424 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4425 settings.GetIsGerrit()
4426
Edward Lemur934836a2019-09-09 20:16:54 +00004427 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004428 if options.retry_failed and not cl.GetIssue():
4429 print('No previous patchsets, so --retry-failed has no effect.')
4430 options.retry_failed = False
4431 # cl.GetMostRecentPatchset uses cached information, and can return the last
4432 # patchset before upload. Calling it here makes it clear that it's the
4433 # last patchset before upload. Note that GetMostRecentPatchset will fail
4434 # if no CL has been uploaded yet.
4435 if options.retry_failed:
4436 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004437
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004438 ret = cl.CMDUpload(options, args, orig_args)
4439
4440 if options.retry_failed:
4441 if ret != 0:
4442 print('Upload failed, so --retry-failed has no effect.')
4443 return ret
4444 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004445 builds, _ = _fetch_latest_builds(
4446 auth_config, cl, options.buildbucket_host,
4447 latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004448 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004449 if len(buckets) == 0:
4450 print('No failed tryjobs, so --retry-failed has no effect.')
4451 return ret
4452 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4453
4454 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004455
4456
Francois Dorayd42c6812017-05-30 15:10:20 -04004457@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004458@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004459def CMDsplit(parser, args):
4460 """Splits a branch into smaller branches and uploads CLs.
4461
4462 Creates a branch and uploads a CL for each group of files modified in the
4463 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004464 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004465 the shared OWNERS file.
4466 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004467 parser.add_option('-d', '--description', dest='description_file',
4468 help='A text file containing a CL description in which '
4469 '$directory will be replaced by each CL\'s directory.')
4470 parser.add_option('-c', '--comment', dest='comment_file',
4471 help='A text file containing a CL comment.')
4472 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004473 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004474 help='List the files and reviewers for each CL that would '
4475 'be created, but don\'t create branches or CLs.')
4476 parser.add_option('--cq-dry-run', action='store_true',
4477 help='If set, will do a cq dry run for each uploaded CL. '
4478 'Please be careful when doing this; more than ~10 CLs '
4479 'has the potential to overload our build '
4480 'infrastructure. Try to upload these not during high '
4481 'load times (usually 11-3 Mountain View time). Email '
4482 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004483 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4484 default=True,
4485 help='Sends your change to the CQ after an approval. Only '
4486 'works on repos that have the Auto-Submit label '
4487 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004488 options, _ = parser.parse_args(args)
4489
4490 if not options.description_file:
4491 parser.error('No --description flag specified.')
4492
4493 def WrappedCMDupload(args):
4494 return CMDupload(OptionParser(), args)
4495
4496 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004497 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004498 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004499
4500
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004501@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004502@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004503def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004504 """DEPRECATED: Used to commit the current changelist via git-svn."""
4505 message = ('git-cl no longer supports committing to SVN repositories via '
4506 'git-svn. You probably want to use `git cl land` instead.')
4507 print(message)
4508 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004509
4510
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004511@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004512@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004513def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004514 """Commits the current changelist via git.
4515
4516 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4517 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004518 """
4519 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4520 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004521 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004522 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004523 parser.add_option('--parallel', action='store_true',
4524 help='Run all tests specified by input_api.RunTests in all '
4525 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004526 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004527
Edward Lemur934836a2019-09-09 20:16:54 +00004528 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004529
Robert Iannucci2e73d432018-03-14 01:10:47 -07004530 if not cl.GetIssue():
4531 DieWithError('You must upload the change first to Gerrit.\n'
4532 ' If you would rather have `git cl land` upload '
4533 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004534 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004535 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536
4537
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004538@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004539@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004540def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004541 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542 parser.add_option('-b', dest='newbranch',
4543 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004544 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004545 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004546 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004547 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004548
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004549 group = optparse.OptionGroup(
4550 parser,
4551 'Options for continuing work on the current issue uploaded from a '
4552 'different clone (e.g. different machine). Must be used independently '
4553 'from the other options. No issue number should be specified, and the '
4554 'branch must have an issue number associated with it')
4555 group.add_option('--reapply', action='store_true', dest='reapply',
4556 help='Reset the branch and reapply the issue.\n'
4557 'CAUTION: This will undo any local changes in this '
4558 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004559
4560 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004561 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004562 parser.add_option_group(group)
4563
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004564 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004566
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004567 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004568 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004569 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004570 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004571 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004572
Edward Lemur934836a2019-09-09 20:16:54 +00004573 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004574 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004575 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004576
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004577 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004578 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004580
4581 RunGit(['reset', '--hard', upstream])
4582 if options.pull:
4583 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004584
Edward Lemur678a6842019-10-03 22:25:05 +00004585 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4586 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004587
4588 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004589 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004590
Edward Lemurf38bc172019-09-03 21:02:13 +00004591 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004592 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004593 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004594
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004595 # We don't want uncommitted changes mixed up with the patch.
4596 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004597 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004599 if options.newbranch:
4600 if options.force:
4601 RunGit(['branch', '-D', options.newbranch],
4602 stderr=subprocess2.PIPE, error_ok=True)
4603 RunGit(['new-branch', options.newbranch])
4604
Edward Lemur678a6842019-10-03 22:25:05 +00004605 cl = Changelist(
4606 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004607
Edward Lemur678a6842019-10-03 22:25:05 +00004608 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004609 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004610
Edward Lemurf38bc172019-09-03 21:02:13 +00004611 return cl.CMDPatchWithParsedIssue(
4612 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613
4614
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004615def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616 """Fetches the tree status and returns either 'open', 'closed',
4617 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004618 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004619 if url:
4620 status = urllib2.urlopen(url).read().lower()
4621 if status.find('closed') != -1 or status == '0':
4622 return 'closed'
4623 elif status.find('open') != -1 or status == '1':
4624 return 'open'
4625 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 return 'unset'
4627
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004628
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629def GetTreeStatusReason():
4630 """Fetches the tree status from a json url and returns the message
4631 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004632 url = settings.GetTreeStatusUrl()
4633 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 connection = urllib2.urlopen(json_url)
4635 status = json.loads(connection.read())
4636 connection.close()
4637 return status['message']
4638
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004639
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004640@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004641def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004642 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004643 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644 status = GetTreeStatus()
4645 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004646 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647 return 2
4648
vapiera7fbd5a2016-06-16 09:17:49 -07004649 print('The tree is %s' % status)
4650 print()
4651 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004652 if status != 'open':
4653 return 1
4654 return 0
4655
4656
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004657@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004658def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004659 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4660 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004661 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004662 '-b', '--bot', action='append',
4663 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4664 'times to specify multiple builders. ex: '
4665 '"-b win_rel -b win_layout". See '
4666 'the try server waterfall for the builders name and the tests '
4667 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004668 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004669 '-B', '--bucket', default='',
4670 help=('Buildbucket bucket to send the try requests.'))
4671 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004672 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004673 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004674 'be determined by the try recipe that builder runs, which usually '
4675 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004676 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004677 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004678 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004679 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004680 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004681 '--category', default='git_cl_try', help='Specify custom build category.')
4682 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004683 '--project',
4684 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004685 'in recipe to determine to which repository or directory to '
4686 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004687 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004688 '-p', '--property', dest='properties', action='append', default=[],
4689 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004690 'key2=value2 etc. The value will be treated as '
4691 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004692 'NOTE: using this may make your tryjob not usable for CQ, '
4693 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004694 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004695 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4696 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004697 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004698 parser.add_option(
4699 '-R', '--retry-failed', action='store_true', default=False,
4700 help='Retry failed jobs from the latest set of tryjobs. '
4701 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004702 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004703 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004704 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004705 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004706
machenbach@chromium.org45453142015-09-15 08:45:22 +00004707 # Make sure that all properties are prop=value pairs.
4708 bad_params = [x for x in options.properties if '=' not in x]
4709 if bad_params:
4710 parser.error('Got properties with missing "=": %s' % bad_params)
4711
maruel@chromium.org15192402012-09-06 12:38:29 +00004712 if args:
4713 parser.error('Unknown arguments: %s' % args)
4714
Edward Lemur934836a2019-09-09 20:16:54 +00004715 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004716 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004717 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004718
Edward Lemurf38bc172019-09-03 21:02:13 +00004719 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004720 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004721
tandriie113dfd2016-10-11 10:20:12 -07004722 error_message = cl.CannotTriggerTryJobReason()
4723 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004724 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004725
Quinten Yearsley983111f2019-09-26 17:18:48 +00004726 if options.retry_failed:
4727 if options.bot or options.bucket:
4728 print('ERROR: The option --retry-failed is not compatible with '
4729 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4730 return 1
4731 print('Searching for failed tryjobs...')
4732 builds, patchset = _fetch_latest_builds(
4733 auth_config, cl, options.buildbucket_host)
4734 if options.verbose:
4735 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004736 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004737 if not buckets:
4738 print('There are no failed jobs in the latest set of jobs '
4739 '(patchset #%d), doing nothing.' % patchset)
4740 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004741 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004742 if num_builders > 10:
4743 confirm_or_exit('There are %d builders with failed builds.'
4744 % num_builders, action='continue')
4745 else:
4746 buckets = _get_bucket_map(cl, options, parser)
4747 if buckets and any(b.startswith('master.') for b in buckets):
4748 print('ERROR: Buildbot masters are not supported.')
4749 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004750
qyearsleydd49f942016-10-28 11:57:22 -07004751 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4752 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004753 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004754 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004755 print('git cl try with no bots now defaults to CQ dry run.')
4756 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4757 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004758
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004759 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004760 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004761 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004762 'of bot requires an initial job from a parent (usually a builder). '
4763 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004764 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004765 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004766
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004767 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004768 try:
4769 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4770 except BuildbucketResponseException as ex:
4771 print('ERROR: %s' % ex)
4772 return 1
4773 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004774
4775
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004776@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004777def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004778 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004779 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004780 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004781 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004782 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004783 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004784 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004785 '--color', action='store_true', default=setup_color.IS_TTY,
4786 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004787 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004788 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4789 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004790 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004791 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004792 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004793 parser.add_option_group(group)
4794 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004795 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004796 options, args = parser.parse_args(args)
4797 if args:
4798 parser.error('Unrecognized args: %s' % ' '.join(args))
4799
4800 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004801 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004802 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004803 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004804
tandrii221ab252016-10-06 08:12:04 -07004805 patchset = options.patchset
4806 if not patchset:
4807 patchset = cl.GetMostRecentPatchset()
4808 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004809 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004810 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004811 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004812 cl.GetIssue())
4813
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004814 try:
tandrii221ab252016-10-06 08:12:04 -07004815 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004816 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004817 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004818 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004819 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004820 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004821 else:
4822 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004823 return 0
4824
4825
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004826@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004827@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004828def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004829 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004830 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004831 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004832 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004833
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004834 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004835 if args:
4836 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004837 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004838 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004839 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004840 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004841
4842 # Clear configured merge-base, if there is one.
4843 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004844 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004845 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004846 return 0
4847
4848
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004849@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004850def CMDweb(parser, args):
4851 """Opens the current CL in the web browser."""
4852 _, args = parser.parse_args(args)
4853 if args:
4854 parser.error('Unrecognized args: %s' % ' '.join(args))
4855
4856 issue_url = Changelist().GetIssueURL()
4857 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004858 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004859 return 1
4860
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004861 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004862 # allows us to hide the "Created new window in existing browser session."
4863 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004864 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004865 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004866 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004867 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004868 os.open(os.devnull, os.O_RDWR)
4869 try:
4870 webbrowser.open(issue_url)
4871 finally:
4872 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004873 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004874 return 0
4875
4876
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004877@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004878def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004879 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004880 parser.add_option('-d', '--dry-run', action='store_true',
4881 help='trigger in dry run mode')
4882 parser.add_option('-c', '--clear', action='store_true',
4883 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004884 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004885 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004886 if args:
4887 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004888 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004889 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004890
Edward Lemur934836a2019-09-09 20:16:54 +00004891 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004892 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004893 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004894 elif options.dry_run:
4895 state = _CQState.DRY_RUN
4896 else:
4897 state = _CQState.COMMIT
4898 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004899 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004900 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004901 return 0
4902
4903
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004904@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004905def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004906 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004907 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004908 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004909 if args:
4910 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004911 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004912 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004913 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004914 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004915 cl.CloseIssue()
4916 return 0
4917
4918
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004919@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004920def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004921 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004922 parser.add_option(
4923 '--stat',
4924 action='store_true',
4925 dest='stat',
4926 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004927 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004928 if args:
4929 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004930
Edward Lemur934836a2019-09-09 20:16:54 +00004931 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004932 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004933 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004934 if not issue:
4935 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004936
Aaron Gablea718c3e2017-08-28 17:47:28 -07004937 base = cl._GitGetBranchConfigValue('last-upload-hash')
4938 if not base:
4939 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4940 if not base:
4941 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4942 revision_info = detail['revisions'][detail['current_revision']]
4943 fetch_info = revision_info['fetch']['http']
4944 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4945 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004946
Aaron Gablea718c3e2017-08-28 17:47:28 -07004947 cmd = ['git', 'diff']
4948 if options.stat:
4949 cmd.append('--stat')
4950 cmd.append(base)
4951 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004952
4953 return 0
4954
4955
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004956@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004957def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004958 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004959 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004960 '--ignore-current',
4961 action='store_true',
4962 help='Ignore the CL\'s current reviewers and start from scratch.')
4963 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004964 '--ignore-self',
4965 action='store_true',
4966 help='Do not consider CL\'s author as an owners.')
4967 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004968 '--no-color',
4969 action='store_true',
4970 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004971 parser.add_option(
4972 '--batch',
4973 action='store_true',
4974 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004975 # TODO: Consider moving this to another command, since other
4976 # git-cl owners commands deal with owners for a given CL.
4977 parser.add_option(
4978 '--show-all',
4979 action='store_true',
4980 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004981 options, args = parser.parse_args(args)
4982
4983 author = RunGit(['config', 'user.email']).strip() or None
4984
Edward Lemur934836a2019-09-09 20:16:54 +00004985 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004986
Yang Guo6e269a02019-06-26 11:17:02 +00004987 if options.show_all:
4988 for arg in args:
4989 base_branch = cl.GetCommonAncestorWithUpstream()
4990 change = cl.GetChange(base_branch, None)
4991 database = owners.Database(change.RepositoryRoot(), file, os.path)
4992 database.load_data_needed_for([arg])
4993 print('Owners for %s:' % arg)
4994 for owner in sorted(database.all_possible_owners([arg], None)):
4995 print(' - %s' % owner)
4996 return 0
4997
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004998 if args:
4999 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005000 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005001 base_branch = args[0]
5002 else:
5003 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005004 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005005
5006 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005007 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5008
5009 if options.batch:
5010 db = owners.Database(change.RepositoryRoot(), file, os.path)
5011 print('\n'.join(db.reviewers_for(affected_files, author)))
5012 return 0
5013
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005014 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005015 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005016 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005017 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005018 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005019 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005020 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005021 override_files=change.OriginalOwnersFiles(),
5022 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023
5024
Aiden Bennerc08566e2018-10-03 17:52:42 +00005025def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005026 """Generates a diff command."""
5027 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005028 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5029
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005030 if allow_prefix:
5031 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5032 # case that diff.noprefix is set in the user's git config.
5033 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5034 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005035 diff_cmd += ['--no-prefix']
5036
5037 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005038
5039 if args:
5040 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005041 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005042 diff_cmd.append(arg)
5043 else:
5044 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005045
5046 return diff_cmd
5047
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005048
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005049def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005050 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005051 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005052
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005053
enne@chromium.org555cfe42014-01-29 18:21:39 +00005054@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005055@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005056def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005057 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005058 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005059 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005060 parser.add_option('--full', action='store_true',
5061 help='Reformat the full content of all touched files')
5062 parser.add_option('--dry-run', action='store_true',
5063 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005064 parser.add_option(
5065 '--python',
5066 action='store_true',
5067 default=None,
5068 help='Enables python formatting on all python files.')
5069 parser.add_option(
5070 '--no-python',
5071 action='store_true',
5072 dest='python',
5073 help='Disables python formatting on all python files. '
5074 'Takes precedence over --python. '
5075 'If neither --python or --no-python are set, python '
5076 'files that have a .style.yapf file in an ancestor '
5077 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005078 parser.add_option('--js', action='store_true',
5079 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005080 parser.add_option('--diff', action='store_true',
5081 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005082 parser.add_option('--presubmit', action='store_true',
5083 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005084 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005085
Daniel Chengc55eecf2016-12-30 03:11:02 -08005086 # Normalize any remaining args against the current path, so paths relative to
5087 # the current directory are still resolved as expected.
5088 args = [os.path.join(os.getcwd(), arg) for arg in args]
5089
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005090 # git diff generates paths against the root of the repository. Change
5091 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005092 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005093 if rel_base_path:
5094 os.chdir(rel_base_path)
5095
digit@chromium.org29e47272013-05-17 17:01:46 +00005096 # Grab the merge-base commit, i.e. the upstream commit of the current
5097 # branch when it was created or the last time it was rebased. This is
5098 # to cover the case where the user may have called "git fetch origin",
5099 # moving the origin branch to a newer commit, but hasn't rebased yet.
5100 upstream_commit = None
5101 cl = Changelist()
5102 upstream_branch = cl.GetUpstreamBranch()
5103 if upstream_branch:
5104 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5105 upstream_commit = upstream_commit.strip()
5106
5107 if not upstream_commit:
5108 DieWithError('Could not find base commit for this branch. '
5109 'Are you in detached state?')
5110
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005111 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5112 diff_output = RunGit(changed_files_cmd)
5113 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005114 # Filter out files deleted by this CL
5115 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005116
Christopher Lamc5ba6922017-01-24 11:19:14 +11005117 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005118 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005119
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005120 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5121 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5122 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005123 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005124
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005125 top_dir = os.path.normpath(
5126 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5127
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005128 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5129 # formatted. This is used to block during the presubmit.
5130 return_value = 0
5131
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005132 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005133 # Locate the clang-format binary in the checkout
5134 try:
5135 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005136 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005137 DieWithError(e)
5138
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005139 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005140 cmd = [clang_format_tool]
5141 if not opts.dry_run and not opts.diff:
5142 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005143 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005144 if opts.diff:
5145 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005146 else:
5147 env = os.environ.copy()
5148 env['PATH'] = str(os.path.dirname(clang_format_tool))
5149 try:
5150 script = clang_format.FindClangFormatScriptInChromiumTree(
5151 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005152 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005153 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005154
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005155 cmd = [sys.executable, script, '-p0']
5156 if not opts.dry_run and not opts.diff:
5157 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005158
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005159 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5160 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005161
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005162 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5163 if opts.diff:
5164 sys.stdout.write(stdout)
5165 if opts.dry_run and len(stdout) > 0:
5166 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005167
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005168 # Similar code to above, but using yapf on .py files rather than clang-format
5169 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005170 py_explicitly_disabled = opts.python is not None and not opts.python
5171 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005172 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5173 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5174 if sys.platform.startswith('win'):
5175 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005176
Aiden Bennerc08566e2018-10-03 17:52:42 +00005177 # If we couldn't find a yapf file we'll default to the chromium style
5178 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005179 chromium_default_yapf_style = os.path.join(depot_tools_path,
5180 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005181 # Used for caching.
5182 yapf_configs = {}
5183 for f in python_diff_files:
5184 # Find the yapf style config for the current file, defaults to depot
5185 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005186 _FindYapfConfigFile(f, yapf_configs, top_dir)
5187
5188 # Turn on python formatting by default if a yapf config is specified.
5189 # This breaks in the case of this repo though since the specified
5190 # style file is also the global default.
5191 if opts.python is None:
5192 filtered_py_files = []
5193 for f in python_diff_files:
5194 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5195 filtered_py_files.append(f)
5196 else:
5197 filtered_py_files = python_diff_files
5198
5199 # Note: yapf still seems to fix indentation of the entire file
5200 # even if line ranges are specified.
5201 # See https://github.com/google/yapf/issues/499
5202 if not opts.full and filtered_py_files:
5203 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5204
5205 for f in filtered_py_files:
5206 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5207 if yapf_config is None:
5208 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005209
5210 cmd = [yapf_tool, '--style', yapf_config, f]
5211
5212 has_formattable_lines = False
5213 if not opts.full:
5214 # Only run yapf over changed line ranges.
5215 for diff_start, diff_len in py_line_diffs[f]:
5216 diff_end = diff_start + diff_len - 1
5217 # Yapf errors out if diff_end < diff_start but this
5218 # is a valid line range diff for a removal.
5219 if diff_end >= diff_start:
5220 has_formattable_lines = True
5221 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5222 # If all line diffs were removals we have nothing to format.
5223 if not has_formattable_lines:
5224 continue
5225
5226 if opts.diff or opts.dry_run:
5227 cmd += ['--diff']
5228 # Will return non-zero exit code if non-empty diff.
5229 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5230 if opts.diff:
5231 sys.stdout.write(stdout)
5232 elif len(stdout) > 0:
5233 return_value = 2
5234 else:
5235 cmd += ['-i']
5236 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005237
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005238 # Dart's formatter does not have the nice property of only operating on
5239 # modified chunks, so hard code full.
5240 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005241 try:
5242 command = [dart_format.FindDartFmtToolInChromiumTree()]
5243 if not opts.dry_run and not opts.diff:
5244 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005245 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005246
ppi@chromium.org6593d932016-03-03 15:41:15 +00005247 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005248 if opts.dry_run and stdout:
5249 return_value = 2
5250 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005251 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5252 'found in this checkout. Files in other languages are still '
5253 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005254
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005255 # Format GN build files. Always run on full build files for canonical form.
5256 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005257 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005258 if opts.dry_run or opts.diff:
5259 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005260 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005261 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5262 shell=sys.platform == 'win32',
5263 cwd=top_dir)
5264 if opts.dry_run and gn_ret == 2:
5265 return_value = 2 # Not formatted.
5266 elif opts.diff and gn_ret == 2:
5267 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005268 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005269 elif gn_ret != 0:
5270 # For non-dry run cases (and non-2 return values for dry-run), a
5271 # nonzero error code indicates a failure, probably because the file
5272 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005273 DieWithError('gn format failed on ' + gn_diff_file +
5274 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005275
Ilya Shermane081cbe2017-08-15 17:51:04 -07005276 # Skip the metrics formatting from the global presubmit hook. These files have
5277 # a separate presubmit hook that issues an error if the files need formatting,
5278 # whereas the top-level presubmit script merely issues a warning. Formatting
5279 # these files is somewhat slow, so it's important not to duplicate the work.
5280 if not opts.presubmit:
5281 for xml_dir in GetDirtyMetricsDirs(diff_files):
5282 tool_dir = os.path.join(top_dir, xml_dir)
5283 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5284 if opts.dry_run or opts.diff:
5285 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005286 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005287 if opts.diff:
5288 sys.stdout.write(stdout)
5289 if opts.dry_run and stdout:
5290 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005291
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005292 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005293
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005294
Steven Holte2e664bf2017-04-21 13:10:47 -07005295def GetDirtyMetricsDirs(diff_files):
5296 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5297 metrics_xml_dirs = [
5298 os.path.join('tools', 'metrics', 'actions'),
5299 os.path.join('tools', 'metrics', 'histograms'),
5300 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005301 os.path.join('tools', 'metrics', 'ukm'),
5302 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005303 for xml_dir in metrics_xml_dirs:
5304 if any(file.startswith(xml_dir) for file in xml_diff_files):
5305 yield xml_dir
5306
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005307
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005308@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005309@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005310def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005311 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005312 _, args = parser.parse_args(args)
5313
5314 if len(args) != 1:
5315 parser.print_help()
5316 return 1
5317
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005318 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005319 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005320 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005321
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005322 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005323
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005324 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005325 output = RunGit(['config', '--local', '--get-regexp',
5326 r'branch\..*\.%s' % issueprefix],
5327 error_ok=True)
5328 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005329 if issue == target_issue:
5330 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005331
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005332 branches = []
5333 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005334 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005335 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005336 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005337 return 1
5338 if len(branches) == 1:
5339 RunGit(['checkout', branches[0]])
5340 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005341 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005342 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005343 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005344 which = raw_input('Choose by index: ')
5345 try:
5346 RunGit(['checkout', branches[int(which)]])
5347 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005348 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005349 return 1
5350
5351 return 0
5352
5353
maruel@chromium.org29404b52014-09-08 22:58:00 +00005354def CMDlol(parser, args):
5355 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005356 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005357 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5358 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5359 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005360 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005361 return 0
5362
5363
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005364class OptionParser(optparse.OptionParser):
5365 """Creates the option parse and add --verbose support."""
5366 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005367 optparse.OptionParser.__init__(
5368 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005369 self.add_option(
5370 '-v', '--verbose', action='count', default=0,
5371 help='Use 2 times for more debugging info')
5372
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005373 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005374 try:
5375 return self._parse_args(args)
5376 finally:
5377 # Regardless of success or failure of args parsing, we want to report
5378 # metrics, but only after logging has been initialized (if parsing
5379 # succeeded).
5380 global settings
5381 settings = Settings()
5382
5383 if not metrics.DISABLE_METRICS_COLLECTION:
5384 # GetViewVCUrl ultimately calls logging method.
5385 project_url = settings.GetViewVCUrl().strip('/+')
5386 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5387 metrics.collector.add('project_urls', [project_url])
5388
5389 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005390 # Create an optparse.Values object that will store only the actual passed
5391 # options, without the defaults.
5392 actual_options = optparse.Values()
5393 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5394 # Create an optparse.Values object with the default options.
5395 options = optparse.Values(self.get_default_values().__dict__)
5396 # Update it with the options passed by the user.
5397 options._update_careful(actual_options.__dict__)
5398 # Store the options passed by the user in an _actual_options attribute.
5399 # We store only the keys, and not the values, since the values can contain
5400 # arbitrary information, which might be PII.
5401 metrics.collector.add('arguments', actual_options.__dict__.keys())
5402
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005403 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005404 logging.basicConfig(
5405 level=levels[min(options.verbose, len(levels) - 1)],
5406 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5407 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005408
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005409 return options, args
5410
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005411
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005412def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005413 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005414 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005415 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005416 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005417
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005418 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005419 dispatcher = subcommand.CommandDispatcher(__name__)
5420 try:
5421 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005422 except auth.AuthenticationError as e:
5423 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005424 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005425 if e.code != 500:
5426 raise
5427 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005428 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005429 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005430 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005431
5432
5433if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005434 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5435 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005436 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005437 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005438 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005439 sys.exit(main(sys.argv[1:]))