blob: 8ba9e31527db6082a1e787f3d4c991556898afa3 [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
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000112DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
113DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
114
thestig@chromium.org44202a22014-03-11 19:22:18 +0000115# Valid extensions for files we want to lint.
116DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
117DEFAULT_LINT_IGNORE_REGEX = r"$^"
118
Aiden Bennerc08566e2018-10-03 17:52:42 +0000119# File name for yapf style config files.
120YAPF_CONFIG_FILENAME = '.style.yapf'
121
Edward Lesmes50da7702020-03-30 19:23:43 +0000122# The issue, patchset and codereview server are stored on git config for each
123# branch under branch.<branch-name>.<config-key>.
124ISSUE_CONFIG_KEY = 'gerritissue'
125PATCHSET_CONFIG_KEY = 'gerritpatchset'
126CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
127
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000128# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000129Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131# Initialized in main()
132settings = None
133
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134# Used by tests/git_cl_test.py to add extra logging.
135# Inside the weirdly failing test, add this:
136# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700137# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100138_IS_BEING_TESTED = False
139
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000140
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000141_KNOWN_GERRIT_TO_SHORT_URLS = {
142 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
143 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
144}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000145assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
146 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000147
148
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000149class GitPushError(Exception):
150 pass
151
152
Christopher Lamf732cd52017-01-24 12:40:11 +1100153def DieWithError(message, change_desc=None):
154 if change_desc:
155 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000156 print('\n ** Content of CL description **\n' +
157 '='*72 + '\n' +
158 change_desc.description + '\n' +
159 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100160
vapiera7fbd5a2016-06-16 09:17:49 -0700161 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 sys.exit(1)
163
164
Christopher Lamf732cd52017-01-24 12:40:11 +1100165def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000166 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000167 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000168 with open(backup_path, 'wb') as backup_file:
169 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100170
171
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000172def GetNoGitPagerEnv():
173 env = os.environ.copy()
174 # 'cat' is a magical git string that disables pagers on all platforms.
175 env['GIT_PAGER'] = 'cat'
176 return env
177
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000178
bsep@chromium.org627d9002016-04-29 00:00:52 +0000179def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000181 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
182 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000183 except subprocess2.CalledProcessError as e:
184 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000185 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000186 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
187 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000188 out = e.stdout.decode('utf-8', 'replace')
189 if e.stderr:
190 out += e.stderr.decode('utf-8', 'replace')
191 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000192
193
194def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000195 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000196 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197
198
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000199def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000200 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700201 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000202 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700203 else:
204 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000205 try:
tandrii5d48c322016-08-18 16:19:37 -0700206 (out, _), code = subprocess2.communicate(['git'] + args,
207 env=GetNoGitPagerEnv(),
208 stdout=subprocess2.PIPE,
209 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000210 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700211 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900212 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000213 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000214
215
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000216def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000217 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000218 return RunGitWithCode(args, suppress_stderr=True)[1]
219
220
tandrii2a16b952016-10-19 07:09:44 -0700221def time_sleep(seconds):
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700224 return time.sleep(seconds)
225
226
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000227def time_time():
228 # Use this so that it can be mocked in tests without interfering with python
229 # system machinery.
230 return time.time()
231
232
Edward Lemur1b52d872019-05-09 21:12:12 +0000233def datetime_now():
234 # Use this so that it can be mocked in tests without interfering with python
235 # system machinery.
236 return datetime.datetime.now()
237
238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239def confirm_or_exit(prefix='', action='confirm'):
240 """Asks user to press enter to continue or press Ctrl+C to abort."""
241 if not prefix or prefix.endswith('\n'):
242 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100243 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 mid = ' Press'
245 elif prefix.endswith(' '):
246 mid = 'press'
247 else:
248 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000249 gclient_utils.AskForData(
250 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251
252
253def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000254 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000255 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256 while True:
257 if 'yes'.startswith(result):
258 return True
259 if 'no'.startswith(result):
260 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000261 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100262
263
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000265 prop_list = getattr(options, 'properties', [])
266 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000267 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000268 try:
269 properties[key] = json.loads(val)
270 except ValueError:
271 pass # If a value couldn't be evaluated, treat it as a string.
272 return properties
273
274
Edward Lemur4c707a22019-09-24 21:13:43 +0000275def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000276 """Calls a buildbucket v2 method and returns the parsed json response."""
277 headers = {
278 'Accept': 'application/json',
279 'Content-Type': 'application/json',
280 }
281 request = json.dumps(request)
282 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
283
284 logging.info('POST %s with %s' % (url, request))
285
286 attempts = 1
287 time_to_sleep = 1
288 while True:
289 response, content = http.request(url, 'POST', body=request, headers=headers)
290 if response.status == 200:
291 return json.loads(content[4:])
292 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
293 msg = '%s error when calling POST %s with %s: %s' % (
294 response.status, url, request, content)
295 raise BuildbucketResponseException(msg)
296 logging.debug(
297 '%s error when calling POST %s with %s. '
298 'Sleeping for %d seconds and retrying...' % (
299 response.status, url, request, time_to_sleep))
300 time.sleep(time_to_sleep)
301 time_to_sleep *= 2
302 attempts += 1
303
304 assert False, 'unreachable'
305
306
Edward Lemur6215c792019-10-03 21:59:05 +0000307def _parse_bucket(raw_bucket):
308 legacy = True
309 project = bucket = None
310 if '/' in raw_bucket:
311 legacy = False
312 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000313 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000314 elif raw_bucket.startswith('luci.'):
315 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000316 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000317 elif '.' in raw_bucket:
318 project = raw_bucket.split('.')[0]
319 bucket = raw_bucket
320 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000321 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000322 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
323 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000324
325
Quinten Yearsley777660f2020-03-04 23:37:06 +0000326def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700328
329 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000330 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000331 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700332 options: Command-line options.
333 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000335 for project, bucket, builder in jobs:
336 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 print('To see results here, run: git cl try-results')
338 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700339
Quinten Yearsley777660f2020-03-04 23:37:06 +0000340 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 if not requests:
342 return
343
Edward Lemur5b929a42019-10-21 17:57:39 +0000344 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000345 http.force_exception_to_status_code = True
346
347 batch_request = {'requests': requests}
348 batch_response = _call_buildbucket(
349 http, options.buildbucket_host, 'Batch', batch_request)
350
351 errors = [
352 ' ' + response['error']['message']
353 for response in batch_response.get('responses', [])
354 if 'error' in response
355 ]
356 if errors:
357 raise BuildbucketResponseException(
358 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
359
360
Quinten Yearsley777660f2020-03-04 23:37:06 +0000361def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000362 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000363 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000364 shared_properties = {
365 'category': options.ensure_value('category', 'git_cl_try')
366 }
367 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 shared_properties['clobber'] = True
369 shared_properties.update(_get_properties_from_options(options) or {})
370
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000371 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000372 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000373 shared_tags.append({'key': 'retry_failed',
374 'value': '1'})
375
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000376 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000377 for (project, bucket, builder) in jobs:
378 properties = shared_properties.copy()
379 if 'presubmit' in builder.lower():
380 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381
Edward Lemur45768512020-03-02 19:03:14 +0000382 requests.append({
383 'scheduleBuild': {
384 'requestId': str(uuid.uuid4()),
385 'builder': {
386 'project': getattr(options, 'project', None) or project,
387 'bucket': bucket,
388 'builder': builder,
389 },
390 'gerritChanges': gerrit_changes,
391 'properties': properties,
392 'tags': [
393 {'key': 'builder', 'value': builder},
394 ] + shared_tags,
395 }
396 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000397
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000398 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000399 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000400 requests[-1]['scheduleBuild']['gitilesCommit'] = {
401 'host': gerrit_changes[0]['host'],
402 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000403 'id': options.revision,
404 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000405 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000406
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000407 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000408
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000409
Quinten Yearsley777660f2020-03-04 23:37:06 +0000410def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000411 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000412
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000413 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000414 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000415 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000416 request = {
417 'predicate': {
418 'gerritChanges': [changelist.GetGerritChange(patchset)],
419 },
420 'fields': ','.join('builds.*.' + field for field in fields),
421 }
tandrii221ab252016-10-06 08:12:04 -0700422
Edward Lemur5b929a42019-10-21 17:57:39 +0000423 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000424 if authenticator.has_cached_credentials():
425 http = authenticator.authorize(httplib2.Http())
426 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700427 print('Warning: Some results might be missing because %s' %
428 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000429 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000430 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431 http.force_exception_to_status_code = True
432
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000433 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
434 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000435
Edward Lemur45768512020-03-02 19:03:14 +0000436
Edward Lemur5b929a42019-10-21 17:57:39 +0000437def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000438 """Fetches builds from the latest patchset that has builds (within
439 the last few patchsets).
440
441 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000442 changelist (Changelist): The CL to fetch builds for
443 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000444 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
445 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000446 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000447 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
448 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000449 """
450 assert buildbucket_host
451 assert changelist.GetIssue(), 'CL must be uploaded first'
452 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000453 if latest_patchset is None:
454 assert changelist.GetMostRecentPatchset()
455 ps = changelist.GetMostRecentPatchset()
456 else:
457 assert latest_patchset > 0, latest_patchset
458 ps = latest_patchset
459
Quinten Yearsley983111f2019-09-26 17:18:48 +0000460 min_ps = max(1, ps - 5)
461 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000462 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000463 if len(builds):
464 return builds, ps
465 ps -= 1
466 return [], 0
467
468
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000469def _filter_failed_for_retry(all_builds):
470 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000471
472 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000473 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000474 i.e. a list of buildbucket.v2.Builds which includes status and builder
475 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000476
477 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000478 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000479 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000480 """
Edward Lemur45768512020-03-02 19:03:14 +0000481 grouped = {}
482 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000483 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000484 key = (builder['project'], builder['bucket'], builder['builder'])
485 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000486
Edward Lemur45768512020-03-02 19:03:14 +0000487 jobs = []
488 for (project, bucket, builder), builds in grouped.items():
489 if 'triggered' in builder:
490 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
491 'from a parent. Please schedule a manual job for the parent '
492 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000493 continue
494 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
495 # Don't retry if any are running.
496 continue
Edward Lemur45768512020-03-02 19:03:14 +0000497 # If builder had several builds, retry only if the last one failed.
498 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
499 # build, but in case of retrying failed jobs retrying a flaky one makes
500 # sense.
501 builds = sorted(builds, key=lambda b: b['createTime'])
502 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
503 continue
504 # Don't retry experimental build previously triggered by CQ.
505 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
506 for t in builds[-1]['tags']):
507 continue
508 jobs.append((project, bucket, builder))
509
510 # Sort the jobs to make testing easier.
511 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512
513
Quinten Yearsley777660f2020-03-04 23:37:06 +0000514def _print_tryjobs(options, builds):
515 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000517 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 return
519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 longest_builder = max(len(b['builder']['builder']) for b in builds)
521 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000522 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000523 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
524 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000525
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000526 builds_by_status = {}
527 for b in builds:
528 builds_by_status.setdefault(b['status'], []).append({
529 'id': b['id'],
530 'name': name_fmt.format(
531 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
532 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 sort_key = lambda b: (b['name'], b['id'])
535
536 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000537 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000538 if not builds:
539 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000541 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000542 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000543 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 else:
545 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
546
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000547 print(colorize(title))
548 for b in sorted(builds, key=sort_key):
549 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550
551 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 print_builds(
553 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
554 print_builds(
555 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
556 color=Fore.MAGENTA)
557 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
558 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
559 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000560 print_builds('Started:', builds_by_status.pop('STARTED', []),
561 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000562 print_builds(
563 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 print_builds(
566 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000567 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568
569
Aiden Bennerc08566e2018-10-03 17:52:42 +0000570def _ComputeDiffLineRanges(files, upstream_commit):
571 """Gets the changed line ranges for each file since upstream_commit.
572
573 Parses a git diff on provided files and returns a dict that maps a file name
574 to an ordered list of range tuples in the form (start_line, count).
575 Ranges are in the same format as a git diff.
576 """
577 # If files is empty then diff_output will be a full diff.
578 if len(files) == 0:
579 return {}
580
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000581 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000582 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000583 diff_output = RunGit(diff_cmd)
584
585 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
586 # 2 capture groups
587 # 0 == fname of diff file
588 # 1 == 'diff_start,diff_count' or 'diff_start'
589 # will match each of
590 # diff --git a/foo.foo b/foo.py
591 # @@ -12,2 +14,3 @@
592 # @@ -12,2 +17 @@
593 # running re.findall on the above string with pattern will give
594 # [('foo.py', ''), ('', '14,3'), ('', '17')]
595
596 curr_file = None
597 line_diffs = {}
598 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
599 if match[0] != '':
600 # Will match the second filename in diff --git a/a.py b/b.py.
601 curr_file = match[0]
602 line_diffs[curr_file] = []
603 else:
604 # Matches +14,3
605 if ',' in match[1]:
606 diff_start, diff_count = match[1].split(',')
607 else:
608 # Single line changes are of the form +12 instead of +12,1.
609 diff_start = match[1]
610 diff_count = 1
611
612 diff_start = int(diff_start)
613 diff_count = int(diff_count)
614
615 # If diff_count == 0 this is a removal we can ignore.
616 line_diffs[curr_file].append((diff_start, diff_count))
617
618 return line_diffs
619
620
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000621def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622 """Checks if a yapf file is in any parent directory of fpath until top_dir.
623
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000624 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000625 is found returns None. Uses yapf_config_cache as a cache for previously found
626 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000628 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000629 # Return result if we've already computed it.
630 if fpath in yapf_config_cache:
631 return yapf_config_cache[fpath]
632
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000633 parent_dir = os.path.dirname(fpath)
634 if os.path.isfile(fpath):
635 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000636 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000637 # Otherwise fpath is a directory
638 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
639 if os.path.isfile(yapf_file):
640 ret = yapf_file
641 elif fpath == top_dir or parent_dir == fpath:
642 # If we're at the top level directory, or if we're at root
643 # there is no provided style.
644 ret = None
645 else:
646 # Otherwise recurse on the current directory.
647 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000648 yapf_config_cache[fpath] = ret
649 return ret
650
651
Brian Sheedyb4307d52019-12-02 19:18:17 +0000652def _GetYapfIgnorePatterns(top_dir):
653 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000654
655 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
656 but this functionality appears to break when explicitly passing files to
657 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000658 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000659 the .yapfignore file should be in the directory that yapf is invoked from,
660 which we assume to be the top level directory in this case.
661
662 Args:
663 top_dir: The top level directory for the repository being formatted.
664
665 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000666 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000667 """
668 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000669 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000670 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000671 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000672
Anthony Politoc64e3902021-04-30 21:55:25 +0000673 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
674 stripped_line = line.strip()
675 # Comments and blank lines should be ignored.
676 if stripped_line.startswith('#') or stripped_line == '':
677 continue
678 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000679 return ignore_patterns
680
681
682def _FilterYapfIgnoredFiles(filepaths, patterns):
683 """Filters out any filepaths that match any of the given patterns.
684
685 Args:
686 filepaths: An iterable of strings containing filepaths to filter.
687 patterns: An iterable of strings containing fnmatch patterns to filter on.
688
689 Returns:
690 A list of strings containing all the elements of |filepaths| that did not
691 match any of the patterns in |patterns|.
692 """
693 # Not inlined so that tests can use the same implementation.
694 return [f for f in filepaths
695 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000696
697
Aaron Gable13101a62018-02-09 13:20:41 -0800698def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000699 """Prints statistics about the change to the user."""
700 # --no-ext-diff is broken in some versions of Git, so try to work around
701 # this by overriding the environment (but there is still a problem if the
702 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000703 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000704 if 'GIT_EXTERNAL_DIFF' in env:
705 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000706
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000707 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800708 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000709 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000710
711
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000712class BuildbucketResponseException(Exception):
713 pass
714
715
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716class Settings(object):
717 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000718 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000719 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000720 self.tree_status_url = None
721 self.viewvc_url = None
722 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000723 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000724 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000725 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000726 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000727 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000728 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000729
Edward Lemur26964072020-02-19 19:18:51 +0000730 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000731 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000732 if self.updated:
733 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000734
Edward Lemur26964072020-02-19 19:18:51 +0000735 # The only value that actually changes the behavior is
736 # autoupdate = "false". Everything else means "true".
737 autoupdate = (
738 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
739
740 cr_settings_file = FindCodereviewSettingsFile()
741 if autoupdate != 'false' and cr_settings_file:
742 LoadCodereviewSettingsFromFile(cr_settings_file)
743 cr_settings_file.close()
744
745 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 @staticmethod
748 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000749 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000750
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000752 if self.root is None:
753 self.root = os.path.abspath(self.GetRelativeRoot())
754 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000755
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756 def GetTreeStatusUrl(self, error_ok=False):
757 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000758 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
759 if self.tree_status_url is None and not error_ok:
760 DieWithError(
761 'You must configure your tree status URL by running '
762 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 return self.tree_status_url
764
765 def GetViewVCUrl(self):
766 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000767 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 return self.viewvc_url
769
rmistry@google.com90752582014-01-14 21:04:50 +0000770 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000771 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000772
rmistry@google.com5626a922015-02-26 14:03:30 +0000773 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000774 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000775 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000776 return run_post_upload_hook == "True"
777
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000778 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000779 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000780
Dirk Pranke6f0df682021-06-25 00:42:33 +0000781 def GetUsePython3(self):
782 return self._GetConfig('rietveld.use-python3')
783
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000784 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000785 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000786 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000787 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
788 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000789 # Default is squash now (http://crbug.com/611892#c23).
790 self.squash_gerrit_uploads = self._GetConfig(
791 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000792 return self.squash_gerrit_uploads
793
Edward Lesmes4de54132020-05-05 19:41:33 +0000794 def GetSquashGerritUploadsOverride(self):
795 """Return True or False if codereview.settings should be overridden.
796
797 Returns None if no override has been defined.
798 """
799 # See also http://crbug.com/611892#c23
800 result = self._GetConfig('gerrit.override-squash-uploads').lower()
801 if result == 'true':
802 return True
803 if result == 'false':
804 return False
805 return None
806
tandrii@chromium.org28253532016-04-14 13:46:56 +0000807 def GetGerritSkipEnsureAuthenticated(self):
808 """Return True if EnsureAuthenticated should not be done for Gerrit
809 uploads."""
810 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000811 self.gerrit_skip_ensure_authenticated = self._GetConfig(
812 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000813 return self.gerrit_skip_ensure_authenticated
814
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000815 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000816 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000817 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000818 # Git requires single quotes for paths with spaces. We need to replace
819 # them with double quotes for Windows to treat such paths as a single
820 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000821 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000822 return self.git_editor or None
823
thestig@chromium.org44202a22014-03-11 19:22:18 +0000824 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000826
827 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000828 return self._GetConfig(
829 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000830
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000831 def GetFormatFullByDefault(self):
832 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000833 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000834 result = (
835 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
836 error_ok=True).strip())
837 self.format_full_by_default = (result == 'true')
838 return self.format_full_by_default
839
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000840 def IsStatusCommitOrderByDate(self):
841 if self.is_status_commit_order_by_date is None:
842 result = (RunGit(['config', '--bool', 'cl.date-order'],
843 error_ok=True).strip())
844 self.is_status_commit_order_by_date = (result == 'true')
845 return self.is_status_commit_order_by_date
846
Edward Lemur26964072020-02-19 19:18:51 +0000847 def _GetConfig(self, key, default=''):
848 self._LazyUpdateIfNeeded()
849 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850
851
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000852class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000853 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000854 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000855 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000856 DRY_RUN = 'dry_run'
857 COMMIT = 'commit'
858
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000859 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000860
861
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000862class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000863 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 self.issue = issue
865 self.patchset = patchset
866 self.hostname = hostname
867
868 @property
869 def valid(self):
870 return self.issue is not None
871
872
Edward Lemurf38bc172019-09-03 21:02:13 +0000873def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000874 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
875 fail_result = _ParsedIssueNumberArgument()
876
Edward Lemur678a6842019-10-03 22:25:05 +0000877 if isinstance(arg, int):
878 return _ParsedIssueNumberArgument(issue=arg)
879 if not isinstance(arg, basestring):
880 return fail_result
881
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000882 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000883 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000884 if not arg.startswith('http'):
885 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700886
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000887 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000888 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
889 if url.startswith(short_url):
890 url = gerrit_url + url[len(short_url):]
891 break
892
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000893 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000894 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000895 except ValueError:
896 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200897
Edward Lemur678a6842019-10-03 22:25:05 +0000898 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
899 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
900 # Short urls like https://domain/<issue_number> can be used, but don't allow
901 # specifying the patchset (you'd 404), but we allow that here.
902 if parsed_url.path == '/':
903 part = parsed_url.fragment
904 else:
905 part = parsed_url.path
906
907 match = re.match(
908 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
909 if not match:
910 return fail_result
911
912 issue = int(match.group('issue'))
913 patchset = match.group('patchset')
914 return _ParsedIssueNumberArgument(
915 issue=issue,
916 patchset=int(patchset) if patchset else None,
917 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000918
919
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000920def _create_description_from_log(args):
921 """Pulls out the commit log to use as a base for the CL description."""
922 log_args = []
923 if len(args) == 1 and not args[0].endswith('.'):
924 log_args = [args[0] + '..']
925 elif len(args) == 1 and args[0].endswith('...'):
926 log_args = [args[0][:-1]]
927 elif len(args) == 2:
928 log_args = [args[0] + '..' + args[1]]
929 else:
930 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000931 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000932
933
Aaron Gablea45ee112016-11-22 15:14:38 -0800934class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700935 def __init__(self, issue, url):
936 self.issue = issue
937 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800938 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700939
940 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800941 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700942 self.issue, self.url)
943
944
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100945_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000946 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100947 # TODO(tandrii): these two aren't known in Gerrit.
948 'approval', 'disapproval'])
949
950
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000952 """Changelist works with one changelist in local branch.
953
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000954 Notes:
955 * Not safe for concurrent multi-{thread,process} use.
956 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700957 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000958 """
959
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000960 def __init__(self,
961 branchref=None,
962 issue=None,
963 codereview_host=None,
964 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000965 """Create a new ChangeList instance.
966
Edward Lemurf38bc172019-09-03 21:02:13 +0000967 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000968 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000970 global settings
971 if not settings:
972 # Happens when git_cl.py is used as a utility library.
973 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000974
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000975 self.branchref = branchref
976 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000977 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000978 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000979 else:
980 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000981 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000982 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000983 self.lookedup_issue = False
984 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000985 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000986 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000987 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800989 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000990 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000991 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000992
Edward Lemur125d60a2019-09-13 18:25:41 +0000993 # Lazily cached values.
994 self._gerrit_host = None # e.g. chromium-review.googlesource.com
995 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +0000996 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +0000997 # Map from change number (issue) to its detail cache.
998 self._detail_cache = {}
999
1000 if codereview_host is not None:
1001 assert not codereview_host.startswith('https://'), codereview_host
1002 self._gerrit_host = codereview_host
1003 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001004
Edward Lesmese1576912021-02-16 21:53:34 +00001005 @property
1006 def owners_client(self):
1007 if self._owners_client is None:
1008 remote, remote_branch = self.GetRemoteBranch()
1009 branch = GetTargetRef(remote, remote_branch, None)
1010 self._owners_client = owners_client.GetCodeOwnersClient(
1011 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001012 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001013 host=self.GetGerritHost(),
1014 project=self.GetGerritProject(),
1015 branch=branch)
1016 return self._owners_client
1017
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001018 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001019 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001020
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001021 The return value is a string suitable for passing to git cl with the --cc
1022 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001023 """
1024 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001025 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001026 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001027 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1028 return self.cc
1029
Daniel Cheng7227d212017-11-17 08:12:37 -08001030 def ExtendCC(self, more_cc):
1031 """Extends the list of users to cc on this CL based on the changed files."""
1032 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001034 def GetCommitDate(self):
1035 """Returns the commit date as provided in the constructor"""
1036 return self.commit_date
1037
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001039 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001041 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001042 if not branchref:
1043 return None
1044 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001045 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 return self.branch
1047
1048 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001049 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.GetBranch() # Poke the lazy loader.
1051 return self.branchref
1052
Edward Lemur85153282020-02-14 22:06:29 +00001053 def _GitGetBranchConfigValue(self, key, default=None):
1054 return scm.GIT.GetBranchConfig(
1055 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001056
Edward Lemur85153282020-02-14 22:06:29 +00001057 def _GitSetBranchConfigValue(self, key, value):
1058 action = 'set %s to %r' % (key, value)
1059 if not value:
1060 action = 'unset %s' % key
1061 assert self.GetBranch(), 'a branch is needed to ' + action
1062 return scm.GIT.SetBranchConfig(
1063 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001064
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001065 @staticmethod
1066 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001067 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001068 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001069 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001070 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1071 settings.GetRoot(), branch)
1072 if not remote or not upstream_branch:
1073 DieWithError(
1074 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001075 'Verify this branch is set up to track another \n'
1076 '(via the --track argument to "git checkout -b ..."). \n'
1077 'or pass complete "git diff"-style arguments if supported, like\n'
1078 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001079
1080 return remote, upstream_branch
1081
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001082 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001083 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001084 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001085 DieWithError('The upstream for the current branch (%s) does not exist '
1086 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001087 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001088 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 def GetUpstreamBranch(self):
1091 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001092 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001093 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001094 upstream_branch = upstream_branch.replace('refs/heads/',
1095 'refs/remotes/%s/' % remote)
1096 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1097 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 self.upstream_branch = upstream_branch
1099 return self.upstream_branch
1100
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001101 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001102 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001103 remote, branch = None, self.GetBranch()
1104 seen_branches = set()
1105 while branch not in seen_branches:
1106 seen_branches.add(branch)
1107 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001108 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001109 if remote != '.' or branch.startswith('refs/remotes'):
1110 break
1111 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001112 remotes = RunGit(['remote'], error_ok=True).split()
1113 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001115 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001117 logging.warning('Could not determine which remote this change is '
1118 'associated with, so defaulting to "%s".' %
1119 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001120 else:
Gavin Make6a62332020-12-04 21:57:10 +00001121 logging.warning('Could not determine which remote this change is '
1122 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001123 branch = 'HEAD'
1124 if branch.startswith('refs/remotes'):
1125 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001126 elif branch.startswith('refs/branch-heads/'):
1127 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001128 else:
1129 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001130 return self._remote
1131
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 def GetRemoteUrl(self):
1133 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1134
1135 Returns None if there is no remote.
1136 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001137 is_cached, value = self._cached_remote_url
1138 if is_cached:
1139 return value
1140
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001141 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001142 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001143
Edward Lemur298f2cf2019-02-22 21:40:39 +00001144 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001145 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001146 if host:
1147 self._cached_remote_url = (True, url)
1148 return url
1149
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001150 # If it cannot be parsed as an url, assume it is a local directory,
1151 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001152 logging.warning('"%s" doesn\'t appear to point to a git host. '
1153 'Interpreting it as a local directory.', url)
1154 if not os.path.isdir(url):
1155 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001156 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1157 'but it doesn\'t exist.',
1158 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001159 return None
1160
1161 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001162 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001163
Edward Lemur79d4f992019-11-11 23:49:02 +00001164 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001165 if not host:
1166 logging.error(
1167 'Remote "%(remote)s" for branch "%(branch)s" points to '
1168 '"%(cache_path)s", but it is misconfigured.\n'
1169 '"%(cache_path)s" must be a git repo and must have a remote named '
1170 '"%(remote)s" pointing to the git host.', {
1171 'remote': remote,
1172 'cache_path': cache_path,
1173 'branch': self.GetBranch()})
1174 return None
1175
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001176 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001177 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001178
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001179 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001180 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001181 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001182 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001183 if self.issue is not None:
1184 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001185 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001186 return self.issue
1187
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001188 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001189 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001190 issue = self.GetIssue()
1191 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001192 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001193 server = self.GetCodereviewServer()
1194 if short:
1195 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1196 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197
Dirk Pranke6f0df682021-06-25 00:42:33 +00001198 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001199 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001200
Edward Lemur6c6827c2020-02-06 21:15:18 +00001201 def FetchDescription(self, pretty=False):
1202 assert self.GetIssue(), 'issue is required to query Gerrit'
1203
Edward Lemur9aa1a962020-02-25 00:58:38 +00001204 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001205 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1206 current_rev = data['current_revision']
1207 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001208
1209 if not pretty:
1210 return self.description
1211
1212 # Set width to 72 columns + 2 space indent.
1213 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1214 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1215 lines = self.description.splitlines()
1216 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217
1218 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001219 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001220 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001221 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001222 if self.patchset is not None:
1223 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001224 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001225 return self.patchset
1226
Edward Lemur9aa1a962020-02-25 00:58:38 +00001227 def GetAuthor(self):
1228 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1229
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001231 """Set this branch's patchset. If patchset=0, clears the patchset."""
1232 assert self.GetBranch()
1233 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001234 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001235 else:
1236 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001237 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001238
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001239 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001240 """Set this branch's issue. If issue isn't given, clears the issue."""
1241 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001243 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001244 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001246 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001247 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001248 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001249 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 else:
tandrii5d48c322016-08-18 16:19:37 -07001251 # Reset all of these just to be clean.
1252 reset_suffixes = [
1253 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001254 ISSUE_CONFIG_KEY,
1255 PATCHSET_CONFIG_KEY,
1256 CODEREVIEW_SERVER_CONFIG_KEY,
1257 'gerritsquashhash',
1258 ]
tandrii5d48c322016-08-18 16:19:37 -07001259 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001260 try:
1261 self._GitSetBranchConfigValue(prop, None)
1262 except subprocess2.CalledProcessError:
1263 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001264 msg = RunGit(['log', '-1', '--format=%B']).strip()
1265 if msg and git_footers.get_footer_change_id(msg):
1266 print('WARNING: The change patched into this branch has a Change-Id. '
1267 'Removing it.')
1268 RunGit(['commit', '--amend', '-m',
1269 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001270 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001271 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001272 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273
Edward Lemur2c62b332020-03-12 22:12:33 +00001274 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001275 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001276 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001277 except subprocess2.CalledProcessError:
1278 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001279 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001280 'This branch probably doesn\'t exist anymore. To reset the\n'
1281 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001282 ' git branch --set-upstream-to origin/main %s\n'
1283 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001284 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001285
dsansomee2d6fd92016-09-08 00:10:47 -07001286 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001287 assert self.GetIssue(), 'issue is required to update description'
1288
1289 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001290 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001291 if not force:
1292 confirm_or_exit(
1293 'The description cannot be modified while the issue has a pending '
1294 'unpublished edit. Either publish the edit in the Gerrit web UI '
1295 'or delete it.\n\n', action='delete the unpublished edit')
1296
1297 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001298 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001299 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001300 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001301 description, notify='NONE')
1302
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001303 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001304
Edward Lemur75526302020-02-27 22:31:05 +00001305 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001306 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001307 '--root', settings.GetRoot(),
1308 '--upstream', upstream,
1309 ]
1310
1311 args.extend(['--verbose'] * verbose)
1312
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001313 remote, remote_branch = self.GetRemoteBranch()
1314 target_ref = GetTargetRef(remote, remote_branch, None)
1315 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1316 args.extend(['--gerrit_project', self.GetGerritProject()])
1317 args.extend(['--gerrit_branch', target_ref])
1318
Edward Lemur99df04e2020-03-05 19:39:43 +00001319 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001320 issue = self.GetIssue()
1321 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001322 if author:
1323 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001324 if issue:
1325 args.extend(['--issue', str(issue)])
1326 if patchset:
1327 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001328
Edward Lemur75526302020-02-27 22:31:05 +00001329 return args
1330
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001331 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001332 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001333 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1334 args = self._GetCommonPresubmitArgs(verbose, upstream)
1335 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001336 if may_prompt:
1337 args.append('--may_prompt')
1338 if parallel:
1339 args.append('--parallel')
1340 if all_files:
1341 args.append('--all_files')
1342
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001343 if resultdb and not realm:
1344 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1345 # it is not required to pass the realm flag
1346 print('Note: ResultDB reporting will NOT be performed because --realm'
1347 ' was not specified. To enable ResultDB, please run the command'
1348 ' again with the --realm argument to specify the LUCI realm.')
1349
1350 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1351 use_python3=False)
1352 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1353 use_python3=True)
1354 return self._MergePresubmitResults(py2_results, py3_results)
1355
1356 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1357 args = args[:]
1358 vpython = 'vpython3' if use_python3 else 'vpython'
1359
Edward Lemur227d5102020-02-25 23:45:35 +00001360 with gclient_utils.temporary_file() as description_file:
1361 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001362 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001363 args.extend(['--json_output', json_output])
1364 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001365 if self.GetUsePython3():
1366 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001367 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001368 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001369 if resultdb and realm:
1370 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001371
1372 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001373 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001374
Edward Lemur227d5102020-02-25 23:45:35 +00001375 metrics.collector.add_repeated('sub_commands', {
1376 'command': 'presubmit',
1377 'execution_time': time_time() - start,
1378 'exit_code': exit_code,
1379 })
1380
1381 if exit_code:
1382 sys.exit(exit_code)
1383
1384 json_results = gclient_utils.FileRead(json_output)
1385 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001386
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001387 def _MergePresubmitResults(self, py2_results, py3_results):
1388 return {
1389 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1390 py3_results.get('more_cc', []))),
1391 'errors': (
1392 py2_results.get('errors', []) + py3_results.get('errors', [])),
1393 'notifications': (
1394 py2_results.get('notifications', []) +
1395 py3_results.get('notifications', [])),
1396 'warnings': (
1397 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1398 }
1399
Edward Lemur75526302020-02-27 22:31:05 +00001400 def RunPostUploadHook(self, verbose, upstream, description):
1401 args = self._GetCommonPresubmitArgs(verbose, upstream)
1402 args.append('--post_upload')
1403
1404 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001405 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001406 args.extend(['--description_file', description_file])
1407 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1408 p.wait()
1409
Edward Lemur5a644f82020-03-18 16:44:57 +00001410 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1411 # Get description message for upload.
1412 if self.GetIssue():
1413 description = self.FetchDescription()
1414 elif options.message:
1415 description = options.message
1416 else:
1417 description = _create_description_from_log(git_diff_args)
1418 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001419 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001420
Edward Lemur5a644f82020-03-18 16:44:57 +00001421 bug = options.bug
1422 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001423 if not self.GetIssue():
1424 # Extract bug number from branch name, but only if issue is being created.
1425 # It must start with bug or fix, followed by _ or - and number.
1426 # Optionally, it may contain _ or - after number with arbitrary text.
1427 # Examples:
1428 # bug-123
1429 # bug_123
1430 # fix-123
1431 # fix-123-some-description
1432 match = re.match(
1433 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1434 self.GetBranch())
1435 if not bug and not fixed and match:
1436 if match.group('type') == 'bug':
1437 bug = match.group('bugnum')
1438 else:
1439 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001440
1441 change_description = ChangeDescription(description, bug, fixed)
1442
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001443 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1444 if options.add_owners_to:
1445 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001446 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001447 files, [], options.tbrs + options.reviewers)
1448 missing_files = [
1449 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001450 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001451 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001452 owners = self.owners_client.SuggestOwners(
1453 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001454 if options.add_owners_to == 'TBR':
1455 assert isinstance(options.tbrs, list), options.tbrs
1456 options.tbrs.extend(owners)
1457 else:
1458 assert isinstance(options.reviewers, list), options.reviewers
1459 options.reviewers.extend(owners)
1460
Edward Lemur5a644f82020-03-18 16:44:57 +00001461 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001462 if options.reviewers or options.tbrs:
1463 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001464
1465 return change_description
1466
1467 def _GetTitleForUpload(self, options):
1468 # When not squashing, just return options.title.
1469 if not options.squash:
1470 return options.title
1471
1472 # On first upload, patchset title is always this string, while options.title
1473 # gets converted to first line of message.
1474 if not self.GetIssue():
1475 return 'Initial upload'
1476
1477 # When uploading subsequent patchsets, options.message is taken as the title
1478 # if options.title is not provided.
1479 if options.title:
1480 return options.title
1481 if options.message:
1482 return options.message.strip()
1483
1484 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001485 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001486 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001487 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001488 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001489
1490 # Use the default title if the user confirms the default with a 'y'.
1491 if user_title.lower() == 'y':
1492 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001493 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001494
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001495 def CMDUpload(self, options, git_diff_args, orig_args):
1496 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001497 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001498 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001499 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001500 else:
1501 if self.GetBranch() is None:
1502 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1503
1504 # Default to diffing against common ancestor of upstream branch
1505 base_branch = self.GetCommonAncestorWithUpstream()
1506 git_diff_args = [base_branch, 'HEAD']
1507
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001508 # Fast best-effort checks to abort before running potentially expensive
1509 # hooks if uploading is likely to fail anyway. Passing these checks does
1510 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001511 self.EnsureAuthenticated(force=options.force)
1512 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513
1514 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001515 watchlist = watchlists.Watchlists(settings.GetRoot())
1516 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001517 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001518 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001519
Edward Lemur5a644f82020-03-18 16:44:57 +00001520 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001521 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001522 hook_results = self.RunHook(
1523 committing=False,
1524 may_prompt=not options.force,
1525 verbose=options.verbose,
1526 parallel=options.parallel,
1527 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001528 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001529 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001530 resultdb=options.resultdb,
1531 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001532 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533
Aaron Gable13101a62018-02-09 13:20:41 -08001534 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001535 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001536 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001537 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001538 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001539 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540 # Run post upload hooks, if specified.
1541 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001542 self.RunPostUploadHook(
1543 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001544
1545 # Upload all dependencies if specified.
1546 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001547 print()
1548 print('--dependencies has been specified.')
1549 print('All dependent local branches will be re-uploaded.')
1550 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001551 # Remove the dependencies flag from args so that we do not end up in a
1552 # loop.
1553 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001554 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001555 return ret
1556
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001557 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001558 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001559
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001560 Issue must have been already uploaded and known. Optionally allows for
1561 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001562 """
1563 assert new_state in _CQState.ALL_STATES
1564 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001565 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001566 vote_map = {
1567 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001568 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001569 _CQState.DRY_RUN: 1,
1570 _CQState.COMMIT: 2,
1571 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001572 if new_state == _CQState.QUICK_RUN:
1573 labels = {
1574 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1575 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1576 }
1577 else:
1578 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001579 notify = False if new_state == _CQState.DRY_RUN else None
1580 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001581 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001582 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001583 return 0
1584 except KeyboardInterrupt:
1585 raise
1586 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001587 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001588 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001589 ' * Your project has no CQ,\n'
1590 ' * You don\'t have permission to change the CQ state,\n'
1591 ' * There\'s a bug in this code (see stack trace below).\n'
1592 'Consider specifying which bots to trigger manually or asking your '
1593 'project owners for permissions or contacting Chrome Infra at:\n'
1594 'https://www.chromium.org/infra\n\n' %
1595 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001596 # Still raise exception so that stack trace is printed.
1597 raise
1598
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001599 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001600 # Lazy load of configs.
1601 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001602 if self._gerrit_host and '.' not in self._gerrit_host:
1603 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1604 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001605 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001606 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001607 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001608 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001609 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1610 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001611 return self._gerrit_host
1612
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001613 def _GetGitHost(self):
1614 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001615 remote_url = self.GetRemoteUrl()
1616 if not remote_url:
1617 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001618 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001620 def GetCodereviewServer(self):
1621 if not self._gerrit_server:
1622 # If we're on a branch then get the server potentially associated
1623 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001624 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001625 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001626 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001627 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001628 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001629 if not self._gerrit_server:
1630 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1631 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001632 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001633 parts[0] = parts[0] + '-review'
1634 self._gerrit_host = '.'.join(parts)
1635 self._gerrit_server = 'https://%s' % self._gerrit_host
1636 return self._gerrit_server
1637
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001638 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001639 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001640 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001641 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001642 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001643 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001644 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001645 if project.endswith('.git'):
1646 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001647 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1648 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1649 # gitiles/git-over-https protocol. E.g.,
1650 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1651 # as
1652 # https://chromium.googlesource.com/v8/v8
1653 if project.startswith('a/'):
1654 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001655 return project
1656
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001657 def _GerritChangeIdentifier(self):
1658 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1659
1660 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001661 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001662 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001663 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001664 if project:
1665 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1666 # Fall back on still unique, but less efficient change number.
1667 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001668
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001669 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001670 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001671 if settings.GetGerritSkipEnsureAuthenticated():
1672 # For projects with unusual authentication schemes.
1673 # See http://crbug.com/603378.
1674 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001675
1676 # Check presence of cookies only if using cookies-based auth method.
1677 cookie_auth = gerrit_util.Authenticator.get()
1678 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001680
Florian Mayerae510e82020-01-30 21:04:48 +00001681 remote_url = self.GetRemoteUrl()
1682 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001683 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001684 return
1685 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001686 logging.warning('Ignoring branch %(branch)s with non-https remote '
1687 '%(remote)s', {
1688 'branch': self.branch,
1689 'remote': self.GetRemoteUrl()
1690 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001691 return
1692
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001693 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001694 self.GetCodereviewServer()
1695 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001696 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001697
1698 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1699 git_auth = cookie_auth.get_auth_header(git_host)
1700 if gerrit_auth and git_auth:
1701 if gerrit_auth == git_auth:
1702 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001703 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001704 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001705 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001706 ' %s\n'
1707 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001708 ' Consider running the following command:\n'
1709 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001710 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001711 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001712 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001713 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 cookie_auth.get_new_password_message(git_host)))
1715 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001716 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001717 return
1718 else:
1719 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001720 ([] if gerrit_auth else [self._gerrit_host]) +
1721 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001722 DieWithError('Credentials for the following hosts are required:\n'
1723 ' %s\n'
1724 'These are read from %s (or legacy %s)\n'
1725 '%s' % (
1726 '\n '.join(missing),
1727 cookie_auth.get_gitcookies_path(),
1728 cookie_auth.get_netrc_path(),
1729 cookie_auth.get_new_password_message(git_host)))
1730
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001731 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001732 if not self.GetIssue():
1733 return
1734
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001735 status = self._GetChangeDetail()['status']
1736 if status in ('MERGED', 'ABANDONED'):
1737 DieWithError('Change %s has been %s, new uploads are not allowed' %
1738 (self.GetIssueURL(),
1739 'submitted' if status == 'MERGED' else 'abandoned'))
1740
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001741 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1742 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1743 # Apparently this check is not very important? Otherwise get_auth_email
1744 # could have been added to other implementations of Authenticator.
1745 cookies_auth = gerrit_util.Authenticator.get()
1746 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001747 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001748
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001749 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001750 if self.GetIssueOwner() == cookies_user:
1751 return
1752 logging.debug('change %s owner is %s, cookies user is %s',
1753 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001754 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001755 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001756 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 if details['email'] == self.GetIssueOwner():
1758 return
1759 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001760 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001761 'as %s.\n'
1762 'Uploading may fail due to lack of permissions.' %
1763 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1764 confirm_or_exit(action='upload')
1765
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001766 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001767 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001768 or CQ status, assuming adherence to a common workflow.
1769
1770 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001771 * 'error' - error from review tool (including deleted issues)
1772 * 'unsent' - no reviewers added
1773 * 'waiting' - waiting for review
1774 * 'reply' - waiting for uploader to reply to review
1775 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001776 * 'dry-run' - dry-running in the CQ
1777 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001778 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001779 """
1780 if not self.GetIssue():
1781 return None
1782
1783 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001784 data = self._GetChangeDetail([
1785 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001786 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001787 return 'error'
1788
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001789 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001790 return 'closed'
1791
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001792 cq_label = data['labels'].get('Commit-Queue', {})
1793 max_cq_vote = 0
1794 for vote in cq_label.get('all', []):
1795 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1796 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001797 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001798 if max_cq_vote == 1:
1799 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001800
Aaron Gable9ab38c62017-04-06 14:36:33 -07001801 if data['labels'].get('Code-Review', {}).get('approved'):
1802 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001803
1804 if not data.get('reviewers', {}).get('REVIEWER', []):
1805 return 'unsent'
1806
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001807 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001808 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001809 while messages:
1810 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001811 if (m.get('tag', '').startswith('autogenerated:cq') or
1812 m.get('tag', '').startswith('autogenerated:cv')):
1813 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001814 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001815 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 # Most recent message was by owner.
1817 return 'waiting'
1818 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001819 # Some reply from non-owner.
1820 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001821
1822 # Somehow there are no messages even though there are reviewers.
1823 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001824
1825 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001826 if not self.GetIssue():
1827 return None
1828
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001829 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001830 patchset = data['revisions'][data['current_revision']]['_number']
1831 self.SetPatchset(patchset)
1832 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833
Gavin Make61ccc52020-11-13 00:12:57 +00001834 def GetMostRecentDryRunPatchset(self):
1835 """Get patchsets equivalent to the most recent patchset and return
1836 the patchset with the latest dry run. If none have been dry run, return
1837 the latest patchset."""
1838 if not self.GetIssue():
1839 return None
1840
1841 data = self._GetChangeDetail(['ALL_REVISIONS'])
1842 patchset = data['revisions'][data['current_revision']]['_number']
1843 dry_run = set([int(m['_revision_number'])
1844 for m in data.get('messages', [])
1845 if m.get('tag', '').endswith('dry-run')])
1846
1847 for revision_info in sorted(data.get('revisions', {}).values(),
1848 key=lambda c: c['_number'], reverse=True):
1849 if revision_info['_number'] in dry_run:
1850 patchset = revision_info['_number']
1851 break
1852 if revision_info.get('kind', '') not in \
1853 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1854 break
1855 self.SetPatchset(patchset)
1856 return patchset
1857
Aaron Gable636b13f2017-07-14 10:42:48 -07001858 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001859 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001860 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001861 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001862
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001863 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001864 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001865 # CURRENT_REVISION is included to get the latest patchset so that
1866 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001867 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1869 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001870 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001871 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001872 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001873 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001874
1875 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001876 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001877 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001878 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001879 line_comments = file_comments.setdefault(path, [])
1880 line_comments.extend(
1881 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001882
1883 # Build dictionary of file comments for easy access and sorting later.
1884 # {author+date: {path: {patchset: {line: url+message}}}}
1885 comments = collections.defaultdict(
1886 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001887
1888 server = self.GetCodereviewServer()
1889 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1890 # /c/ is automatically added by short URL server.
1891 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1892 self.GetIssue())
1893 else:
1894 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1895
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001896 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001897 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001898 tag = comment.get('tag', '')
1899 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001900 continue
1901 key = (comment['author']['email'], comment['updated'])
1902 if comment.get('side', 'REVISION') == 'PARENT':
1903 patchset = 'Base'
1904 else:
1905 patchset = 'PS%d' % comment['patch_set']
1906 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001907 url = ('%s/%s/%s#%s%s' %
1908 (url_prefix, comment['patch_set'], path,
1909 'b' if comment.get('side') == 'PARENT' else '',
1910 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001911 comments[key][path][patchset][line] = (url, comment['message'])
1912
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001914 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001915 summary = self._BuildCommentSummary(msg, comments, readable)
1916 if summary:
1917 summaries.append(summary)
1918 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001919
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 @staticmethod
1921 def _BuildCommentSummary(msg, comments, readable):
1922 key = (msg['author']['email'], msg['date'])
1923 # Don't bother showing autogenerated messages that don't have associated
1924 # file or line comments. this will filter out most autogenerated
1925 # messages, but will keep robot comments like those from Tricium.
1926 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1927 if is_autogenerated and not comments.get(key):
1928 return None
1929 message = msg['message']
1930 # Gerrit spits out nanoseconds.
1931 assert len(msg['date'].split('.')[-1]) == 9
1932 date = datetime.datetime.strptime(msg['date'][:-3],
1933 '%Y-%m-%d %H:%M:%S.%f')
1934 if key in comments:
1935 message += '\n'
1936 for path, patchsets in sorted(comments.get(key, {}).items()):
1937 if readable:
1938 message += '\n%s' % path
1939 for patchset, lines in sorted(patchsets.items()):
1940 for line, (url, content) in sorted(lines.items()):
1941 if line:
1942 line_str = 'Line %d' % line
1943 path_str = '%s:%d:' % (path, line)
1944 else:
1945 line_str = 'File comment'
1946 path_str = '%s:0:' % path
1947 if readable:
1948 message += '\n %s, %s: %s' % (patchset, line_str, url)
1949 message += '\n %s\n' % content
1950 else:
1951 message += '\n%s ' % path_str
1952 message += '\n%s\n' % content
1953
1954 return _CommentSummary(
1955 date=date,
1956 message=message,
1957 sender=msg['author']['email'],
1958 autogenerated=is_autogenerated,
1959 # These could be inferred from the text messages and correlated with
1960 # Code-Review label maximum, however this is not reliable.
1961 # Leaving as is until the need arises.
1962 approval=False,
1963 disapproval=False,
1964 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001965
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001967 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001968 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001969
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001970 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001971 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001972 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001973
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001974 def _GetChangeDetail(self, options=None):
1975 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001976 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001977 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001978
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001979 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001980 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001981 options.append('CURRENT_COMMIT')
1982
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001983 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001984 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001985 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001986
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001987 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1988 # Assumption: data fetched before with extra options is suitable
1989 # for return for a smaller set of options.
1990 # For example, if we cached data for
1991 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1992 # and request is for options=[CURRENT_REVISION],
1993 # THEN we can return prior cached data.
1994 if options_set.issubset(cached_options_set):
1995 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001996
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001997 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001998 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001999 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002000 except gerrit_util.GerritError as e:
2001 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002002 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002003 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002004
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002005 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002006 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002007
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002008 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002009 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002010 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002011 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002012 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002013 except gerrit_util.GerritError as e:
2014 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002015 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002016 raise
agable32978d92016-11-01 12:55:02 -07002017 return data
2018
Karen Qian40c19422019-03-13 21:28:29 +00002019 def _IsCqConfigured(self):
2020 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002021 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002022
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002023 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002024 if git_common.is_dirty_git_tree('land'):
2025 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002026
tandriid60367b2016-06-22 05:25:12 -07002027 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002028 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002029 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002030 'which can test and land changes for you. '
2031 'Are you sure you wish to bypass it?\n',
2032 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033 differs = True
tandriic4344b52016-08-29 06:04:54 -07002034 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002035 # Note: git diff outputs nothing if there is no diff.
2036 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002037 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002038 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002039 if detail['current_revision'] == last_upload:
2040 differs = False
2041 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002042 print('WARNING: Local branch contents differ from latest uploaded '
2043 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 if differs:
2045 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002046 confirm_or_exit(
2047 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2048 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002049 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002050 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002051 upstream = self.GetCommonAncestorWithUpstream()
2052 if self.GetIssue():
2053 description = self.FetchDescription()
2054 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002055 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002056 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 committing=True,
2058 may_prompt=not force,
2059 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002060 parallel=parallel,
2061 upstream=upstream,
2062 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002063 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002064 resultdb=resultdb,
2065 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002067 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002068 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002069 links = self._GetChangeCommit().get('web_links', [])
2070 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002071 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002072 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002073 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002074 return 0
2075
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002076 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2077 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002078 assert parsed_issue_arg.valid
2079
Edward Lemur125d60a2019-09-13 18:25:41 +00002080 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002081
2082 if parsed_issue_arg.hostname:
2083 self._gerrit_host = parsed_issue_arg.hostname
2084 self._gerrit_server = 'https://%s' % self._gerrit_host
2085
tandriic2405f52016-10-10 08:13:15 -07002086 try:
2087 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002088 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002089 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002090
2091 if not parsed_issue_arg.patchset:
2092 # Use current revision by default.
2093 revision_info = detail['revisions'][detail['current_revision']]
2094 patchset = int(revision_info['_number'])
2095 else:
2096 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002097 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002098 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2099 break
2100 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002101 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002102 (parsed_issue_arg.patchset, self.GetIssue()))
2103
Edward Lemur125d60a2019-09-13 18:25:41 +00002104 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002105 if remote_url.endswith('.git'):
2106 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002107 remote_url = remote_url.rstrip('/')
2108
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002109 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002110 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002111
2112 if remote_url != fetch_info['url']:
2113 DieWithError('Trying to patch a change from %s but this repo appears '
2114 'to be %s.' % (fetch_info['url'], remote_url))
2115
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002116 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002117
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002118 # If we have created a new branch then do the "set issue" immediately in
2119 # case the cherry-pick fails, which happens when resolving conflicts.
2120 if newbranch:
2121 self.SetIssue(parsed_issue_arg.issue)
2122
Aaron Gable62619a32017-06-16 08:22:09 -07002123 if force:
2124 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2125 print('Checked out commit for change %i patchset %i locally' %
2126 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002127 elif nocommit:
2128 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2129 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002130 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002131 RunGit(['cherry-pick', 'FETCH_HEAD'])
2132 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002133 (parsed_issue_arg.issue, patchset))
2134 print('Note: this created a local commit which does not have '
2135 'the same hash as the one uploaded for review. This will make '
2136 'uploading changes based on top of this branch difficult.\n'
2137 'If you want to do that, use "git cl patch --force" instead.')
2138
Stefan Zagerd08043c2017-10-12 12:07:02 -07002139 if self.GetBranch():
2140 self.SetIssue(parsed_issue_arg.issue)
2141 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002142 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002143 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2144 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2145 else:
2146 print('WARNING: You are in detached HEAD state.\n'
2147 'The patch has been applied to your checkout, but you will not be '
2148 'able to upload a new patch set to the gerrit issue.\n'
2149 'Try using the \'-b\' option if you would like to work on a '
2150 'branch and/or upload a new patch set.')
2151
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 return 0
2153
tandrii16e0b4e2016-06-07 10:34:28 -07002154 def _GerritCommitMsgHookCheck(self, offer_removal):
2155 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2156 if not os.path.exists(hook):
2157 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002158 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2159 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002160 data = gclient_utils.FileRead(hook)
2161 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2162 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002163 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002164 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002165 'and may interfere with it in subtle ways.\n'
2166 'We recommend you remove the commit-msg hook.')
2167 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002168 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002169 gclient_utils.rm_file_or_tree(hook)
2170 print('Gerrit commit-msg hook removed.')
2171 else:
2172 print('OK, will keep Gerrit commit-msg hook in place.')
2173
Edward Lemur1b52d872019-05-09 21:12:12 +00002174 def _CleanUpOldTraces(self):
2175 """Keep only the last |MAX_TRACES| traces."""
2176 try:
2177 traces = sorted([
2178 os.path.join(TRACES_DIR, f)
2179 for f in os.listdir(TRACES_DIR)
2180 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2181 and not f.startswith('tmp'))
2182 ])
2183 traces_to_delete = traces[:-MAX_TRACES]
2184 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002185 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002186 except OSError:
2187 print('WARNING: Failed to remove old git traces from\n'
2188 ' %s'
2189 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002190
Edward Lemur5737f022019-05-17 01:24:00 +00002191 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002192 """Zip and write the git push traces stored in traces_dir."""
2193 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002194 traces_zip = trace_name + '-traces'
2195 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002196 # Create a temporary dir to store git config and gitcookies in. It will be
2197 # compressed and stored next to the traces.
2198 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002199 git_info_zip = trace_name + '-git-info'
2200
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002201 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002202
Edward Lemur1b52d872019-05-09 21:12:12 +00002203 git_push_metadata['trace_name'] = trace_name
2204 gclient_utils.FileWrite(
2205 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2206
2207 # Keep only the first 6 characters of the git hashes on the packet
2208 # trace. This greatly decreases size after compression.
2209 packet_traces = os.path.join(traces_dir, 'trace-packet')
2210 if os.path.isfile(packet_traces):
2211 contents = gclient_utils.FileRead(packet_traces)
2212 gclient_utils.FileWrite(
2213 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2214 shutil.make_archive(traces_zip, 'zip', traces_dir)
2215
2216 # Collect and compress the git config and gitcookies.
2217 git_config = RunGit(['config', '-l'])
2218 gclient_utils.FileWrite(
2219 os.path.join(git_info_dir, 'git-config'),
2220 git_config)
2221
2222 cookie_auth = gerrit_util.Authenticator.get()
2223 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2224 gitcookies_path = cookie_auth.get_gitcookies_path()
2225 if os.path.isfile(gitcookies_path):
2226 gitcookies = gclient_utils.FileRead(gitcookies_path)
2227 gclient_utils.FileWrite(
2228 os.path.join(git_info_dir, 'gitcookies'),
2229 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2230 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2231
Edward Lemur1b52d872019-05-09 21:12:12 +00002232 gclient_utils.rmtree(git_info_dir)
2233
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002234 def _RunGitPushWithTraces(self,
2235 refspec,
2236 refspec_opts,
2237 git_push_metadata,
2238 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002239 """Run git push and collect the traces resulting from the execution."""
2240 # Create a temporary directory to store traces in. Traces will be compressed
2241 # and stored in a 'traces' dir inside depot_tools.
2242 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002243 trace_name = os.path.join(
2244 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002245
2246 env = os.environ.copy()
2247 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2248 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002249 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002250 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2251 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2252 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2253
2254 try:
2255 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002256 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002257 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002258 push_cmd = ['git', 'push', remote_url, refspec]
2259 if git_push_options:
2260 for opt in git_push_options:
2261 push_cmd.extend(['-o', opt])
2262
Edward Lemur0f58ae42019-04-30 17:24:12 +00002263 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002264 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002265 env=env,
2266 print_stdout=True,
2267 # Flush after every line: useful for seeing progress when running as
2268 # recipe.
2269 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002270 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002271 except subprocess2.CalledProcessError as e:
2272 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002273 if 'blocked keyword' in str(e.stdout):
2274 raise GitPushError(
2275 'Failed to create a change, very likely due to blocked keyword. '
2276 'Please examine output above for the reason of the failure.\n'
2277 'If this is a false positive, you can try to bypass blocked '
2278 'keyword by using push option '
2279 '-o uploadvalidator~skip, e.g.:\n'
2280 'git cl upload -o uploadvalidator~skip\n\n'
2281 'If git-cl is not working correctly, file a bug under the '
2282 'Infra>SDK component.')
2283
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002284 raise GitPushError(
2285 'Failed to create a change. Please examine output above for the '
2286 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002287 'For emergencies, Googlers can escalate to '
2288 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002289 'Hint: run command below to diagnose common Git/Gerrit '
2290 'credential problems:\n'
2291 ' git cl creds-check\n'
2292 '\n'
2293 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2294 'component including the files below.\n'
2295 'Review the files before upload, since they might contain sensitive '
2296 'information.\n'
2297 'Set the Restrict-View-Google label so that they are not publicly '
2298 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002299 finally:
2300 execution_time = time_time() - before_push
2301 metrics.collector.add_repeated('sub_commands', {
2302 'command': 'git push',
2303 'execution_time': execution_time,
2304 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002305 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002306 })
2307
Edward Lemur1b52d872019-05-09 21:12:12 +00002308 git_push_metadata['execution_time'] = execution_time
2309 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002310 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002311
Edward Lemur1b52d872019-05-09 21:12:12 +00002312 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002313 gclient_utils.rmtree(traces_dir)
2314
2315 return push_stdout
2316
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002317 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2318 change_desc):
2319 """Upload the current branch to Gerrit, retry if new remote HEAD is
2320 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002321 remote, remote_branch = self.GetRemoteBranch()
2322 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2323
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002324 try:
2325 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002326 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002327 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002328 # Repository might be in the middle of transition to main branch as
2329 # default, and uploads to old default might be blocked.
2330 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002331 DieWithError(str(e), change_desc)
2332
Josip Sokcevicb631a882021-01-06 18:18:10 +00002333 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2334 self.GetGerritProject())
2335 if project_head == branch:
2336 DieWithError(str(e), change_desc)
2337 branch = project_head
2338
2339 print("WARNING: Fetching remote state and retrying upload to default "
2340 "branch...")
2341 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002342 options.edit_description = False
2343 options.force = True
2344 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002345 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2346 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002347 except GitPushError as e:
2348 DieWithError(str(e), change_desc)
2349
2350 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002351 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002352 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002353 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002354 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002356 # User requested to change description
2357 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002358 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002359 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002360 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002361 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002362 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002363 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002364 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002365 if len(change_ids) == 1:
2366 change_id = change_ids[0]
2367 else:
2368 change_id = GenerateGerritChangeId(change_desc.description)
2369 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002371 if options.preserve_tryjobs:
2372 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002373
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002375 parent = self._ComputeParent(
2376 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002377 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002378 with gclient_utils.temporary_file() as desc_tempfile:
2379 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2380 ref_to_push = RunGit(
2381 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002382 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002383 if options.no_add_changeid:
2384 pass
2385 else: # adding Change-Ids is okay.
2386 if not git_footers.get_footer_change_id(change_desc.description):
2387 DownloadGerritHook(False)
2388 change_desc.set_description(
2389 self._AddChangeIdToCommitMessage(change_desc.description,
2390 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002392 # For no-squash mode, we assume the remote called "origin" is the one we
2393 # want. It is not worthwhile to support different workflows for
2394 # no-squash mode.
2395 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002396 # attempt to extract the changeid from the current description
2397 # fail informatively if not possible.
2398 change_id_candidates = git_footers.get_footer_change_id(
2399 change_desc.description)
2400 if not change_id_candidates:
2401 DieWithError("Unable to extract change-id from message.")
2402 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002404 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002405 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2406 ref_to_push)]).splitlines()
2407 if len(commits) > 1:
2408 print('WARNING: This will upload %d commits. Run the following command '
2409 'to see which commits will be uploaded: ' % len(commits))
2410 print('git log %s..%s' % (parent, ref_to_push))
2411 print('You can also use `git squash-branch` to squash these into a '
2412 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002413 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002414
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002415 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002416 cc = []
2417 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2418 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2419 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002420 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002421 if len(cc) > 100:
2422 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2423 'process/lsc/lsc_workflow.md')
2424 print('WARNING: This will auto-CC %s users.' % len(cc))
2425 print('LSC may be more appropriate: %s' % lsc)
2426 print('You can also use the --no-autocc flag to disable auto-CC.')
2427 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002428 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002429 if options.cc:
2430 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002431 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002432 if change_desc.get_cced():
2433 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002434 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002435 valid_accounts = set(reviewers + cc)
2436 # TODO(crbug/877717): relax this for all hosts.
2437 else:
2438 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002439 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002440 logging.info('accounts %s are recognized, %s invalid',
2441 sorted(valid_accounts),
2442 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002443
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002444 # Extra options that can be specified at push time. Doc:
2445 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002446 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002447
Aaron Gable844cf292017-06-28 11:32:59 -07002448 # By default, new changes are started in WIP mode, and subsequent patchsets
2449 # don't send email. At any time, passing --send-mail will mark the change
2450 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002451 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002452 refspec_opts.append('ready')
2453 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002454 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002455 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002456 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002457 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002458
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002459 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002460 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002461
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002462 # Set options.title in case user was prompted in _GetTitleForUpload and
2463 # _CMDUploadChange needs to be called again.
2464 options.title = self._GetTitleForUpload(options)
2465 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002466 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002467 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002468 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002469
agablec6787972016-09-09 16:13:34 -07002470 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002471 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002472
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002473 for r in sorted(reviewers):
2474 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002475 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002476 reviewers.remove(r)
2477 else:
2478 # TODO(tandrii): this should probably be a hard failure.
2479 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2480 % r)
2481 for c in sorted(cc):
2482 # refspec option will be rejected if cc doesn't correspond to an
2483 # account, even though REST call to add such arbitrary cc may succeed.
2484 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002485 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002486 cc.remove(c)
2487
rmistry9eadede2016-09-19 11:22:43 -07002488 if options.topic:
2489 # Documentation on Gerrit topics is here:
2490 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002491 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002492
Edward Lemur687ca902018-12-05 02:30:30 +00002493 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002494 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002495 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002496 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002497 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002498 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002499 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002500 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002501 elif options.cq_quick_run:
2502 refspec_opts.append('l=Commit-Queue+1')
2503 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002504
2505 if change_desc.get_reviewers(tbr_only=True):
2506 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002507 self.GetGerritHost(),
2508 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002509 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002510
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002511 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002512 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002513 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002514 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002515 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2516
2517 refspec_suffix = ''
2518 if refspec_opts:
2519 refspec_suffix = '%' + ','.join(refspec_opts)
2520 assert ' ' not in refspec_suffix, (
2521 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2522 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002523
Edward Lemur1b52d872019-05-09 21:12:12 +00002524 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002525 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002526 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002527 'change_id': change_id,
2528 'description': change_desc.description,
2529 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002530
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002531 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002532 git_push_metadata,
2533 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534
2535 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002536 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002537 change_numbers = [m.group(1)
2538 for m in map(regex.match, push_stdout.splitlines())
2539 if m]
2540 if len(change_numbers) != 1:
2541 DieWithError(
2542 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002543 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002544 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002545 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002546
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002547 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002548 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002549 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002550 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002551 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002552 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002553 reviewers, cc,
2554 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002555
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002556 return 0
2557
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002558 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2559 change_desc):
2560 """Computes parent of the generated commit to be uploaded to Gerrit.
2561
2562 Returns revision or a ref name.
2563 """
2564 if custom_cl_base:
2565 # Try to avoid creating additional unintended CLs when uploading, unless
2566 # user wants to take this risk.
2567 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2568 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2569 local_ref_of_target_remote])
2570 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002571 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002572 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2573 'If you proceed with upload, more than 1 CL may be created by '
2574 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2575 'If you are certain that specified base `%s` has already been '
2576 'uploaded to Gerrit as another CL, you may proceed.\n' %
2577 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2578 if not force:
2579 confirm_or_exit(
2580 'Do you take responsibility for cleaning up potential mess '
2581 'resulting from proceeding with upload?',
2582 action='upload')
2583 return custom_cl_base
2584
Aaron Gablef97e33d2017-03-30 15:44:27 -07002585 if remote != '.':
2586 return self.GetCommonAncestorWithUpstream()
2587
2588 # If our upstream branch is local, we base our squashed commit on its
2589 # squashed version.
2590 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2591
Aaron Gablef97e33d2017-03-30 15:44:27 -07002592 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002593 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002594 if upstream_branch_name == 'main':
2595 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002596
2597 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002598 # TODO(tandrii): consider checking parent change in Gerrit and using its
2599 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2600 # the tree hash of the parent branch. The upside is less likely bogus
2601 # requests to reupload parent change just because it's uploadhash is
2602 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002603 parent = scm.GIT.GetBranchConfig(
2604 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002605 # Verify that the upstream branch has been uploaded too, otherwise
2606 # Gerrit will create additional CLs when uploading.
2607 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2608 RunGitSilent(['rev-parse', parent + ':'])):
2609 DieWithError(
2610 '\nUpload upstream branch %s first.\n'
2611 'It is likely that this branch has been rebased since its last '
2612 'upload, so you just need to upload it again.\n'
2613 '(If you uploaded it with --no-squash, then branch dependencies '
2614 'are not supported, and you should reupload with --squash.)'
2615 % upstream_branch_name,
2616 change_desc)
2617 return parent
2618
Edward Lemura12175c2020-03-09 16:58:26 +00002619 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002620 """Re-commits using the current message, assumes the commit hook is in
2621 place.
2622 """
Edward Lemura12175c2020-03-09 16:58:26 +00002623 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002624 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002625 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002626 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002627 return new_log_desc
2628 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002629 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002630
tandriie113dfd2016-10-11 10:20:12 -07002631 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002632 try:
2633 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002634 except GerritChangeNotExists:
2635 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002636
2637 if data['status'] in ('ABANDONED', 'MERGED'):
2638 return 'CL %s is closed' % self.GetIssue()
2639
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002640 def GetGerritChange(self, patchset=None):
2641 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002642 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002643 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002644 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002645 data = self._GetChangeDetail(['ALL_REVISIONS'])
2646
2647 assert host and issue and patchset, 'CL must be uploaded first'
2648
2649 has_patchset = any(
2650 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002651 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002652 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002653 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002654 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002655
tandrii8c5a3532016-11-04 07:52:02 -07002656 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002657 'host': host,
2658 'change': issue,
2659 'project': data['project'],
2660 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002661 }
tandriie113dfd2016-10-11 10:20:12 -07002662
tandriide281ae2016-10-12 06:02:30 -07002663 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002664 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002665
Edward Lemur707d70b2018-02-07 00:50:14 +01002666 def GetReviewers(self):
2667 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002668 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002669
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002670
Lei Zhang8a0efc12020-08-05 19:58:45 +00002671def _get_bug_line_values(default_project_prefix, bugs):
2672 """Given default_project_prefix and comma separated list of bugs, yields bug
2673 line values.
tandriif9aefb72016-07-01 09:06:51 -07002674
2675 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002676 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002677 * string, which is left as is.
2678
2679 This function may produce more than one line, because bugdroid expects one
2680 project per line.
2681
Lei Zhang8a0efc12020-08-05 19:58:45 +00002682 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002683 ['v8:123', 'chromium:789']
2684 """
2685 default_bugs = []
2686 others = []
2687 for bug in bugs.split(','):
2688 bug = bug.strip()
2689 if bug:
2690 try:
2691 default_bugs.append(int(bug))
2692 except ValueError:
2693 others.append(bug)
2694
2695 if default_bugs:
2696 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002697 if default_project_prefix:
2698 if not default_project_prefix.endswith(':'):
2699 default_project_prefix += ':'
2700 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002701 else:
2702 yield default_bugs
2703 for other in sorted(others):
2704 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2705 yield other
2706
2707
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002708class ChangeDescription(object):
2709 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002710 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002711 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002712 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002713 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002714 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002715 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2716 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002717 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002718 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002719
Dan Beamd8b04ca2019-10-10 21:23:26 +00002720 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002721 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002722 if bug:
2723 regexp = re.compile(self.BUG_LINE)
2724 prefix = settings.GetBugPrefix()
2725 if not any((regexp.match(line) for line in self._description_lines)):
2726 values = list(_get_bug_line_values(prefix, bug))
2727 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002728 if fixed:
2729 regexp = re.compile(self.FIXED_LINE)
2730 prefix = settings.GetBugPrefix()
2731 if not any((regexp.match(line) for line in self._description_lines)):
2732 values = list(_get_bug_line_values(prefix, fixed))
2733 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002734
agable@chromium.org42c20792013-09-12 17:34:49 +00002735 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002736 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002737 return '\n'.join(self._description_lines)
2738
2739 def set_description(self, desc):
2740 if isinstance(desc, basestring):
2741 lines = desc.splitlines()
2742 else:
2743 lines = [line.rstrip() for line in desc]
2744 while lines and not lines[0]:
2745 lines.pop(0)
2746 while lines and not lines[-1]:
2747 lines.pop(-1)
2748 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002749
Edward Lemur5a644f82020-03-18 16:44:57 +00002750 def ensure_change_id(self, change_id):
2751 description = self.description
2752 footer_change_ids = git_footers.get_footer_change_id(description)
2753 # Make sure that the Change-Id in the description matches the given one.
2754 if footer_change_ids != [change_id]:
2755 if footer_change_ids:
2756 # Remove any existing Change-Id footers since they don't match the
2757 # expected change_id footer.
2758 description = git_footers.remove_footer(description, 'Change-Id')
2759 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2760 'if you want to set a new one.')
2761 # Add the expected Change-Id footer.
2762 description = git_footers.add_footer_change_id(description, change_id)
2763 self.set_description(description)
2764
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002765 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002766 """Rewrites the R=/TBR= line(s) as a single line each.
2767
2768 Args:
2769 reviewers (list(str)) - list of additional emails to use for reviewers.
2770 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002771 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002772 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002773 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002774
2775 reviewers = set(reviewers)
2776 tbrs = set(tbrs)
2777 LOOKUP = {
2778 'TBR': tbrs,
2779 'R': reviewers,
2780 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002781
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002782 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002783 regexp = re.compile(self.R_LINE)
2784 matches = [regexp.match(line) for line in self._description_lines]
2785 new_desc = [l for i, l in enumerate(self._description_lines)
2786 if not matches[i]]
2787 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002788
agable@chromium.org42c20792013-09-12 17:34:49 +00002789 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002790
2791 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002792 for match in matches:
2793 if not match:
2794 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002795 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2796
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 # If any folks ended up in both groups, remove them from tbrs.
2798 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002799
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002800 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2801 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002802
2803 # Put the new lines in the description where the old first R= line was.
2804 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2805 if 0 <= line_loc < len(self._description_lines):
2806 if new_tbr_line:
2807 self._description_lines.insert(line_loc, new_tbr_line)
2808 if new_r_line:
2809 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002810 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002811 if new_r_line:
2812 self.append_footer(new_r_line)
2813 if new_tbr_line:
2814 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002815
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002816 def set_preserve_tryjobs(self):
2817 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2818 footers = git_footers.parse_footers(self.description)
2819 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2820 if v.lower() == 'true':
2821 return
2822 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2823
Anthony Polito8b955342019-09-24 19:01:36 +00002824 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002825 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 self.set_description([
2827 '# Enter a description of the change.',
2828 '# This will be displayed on the codereview site.',
2829 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002830 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002831 '--------------------',
2832 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002833 bug_regexp = re.compile(self.BUG_LINE)
2834 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002835 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002836 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002837
Dan Beamd8b04ca2019-10-10 21:23:26 +00002838 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002839 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002840
Bruce Dawsonfc487042020-10-27 19:11:37 +00002841 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002842 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002843 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002844 if not content:
2845 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002847
Bruce Dawson2377b012018-01-11 16:46:49 -08002848 # Strip off comments and default inserted "Bug:" line.
2849 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002850 (line.startswith('#') or
2851 line.rstrip() == "Bug:" or
2852 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002853 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002854 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002855 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002856
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002857 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002858 """Adds a footer line to the description.
2859
2860 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2861 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2862 that Gerrit footers are always at the end.
2863 """
2864 parsed_footer_line = git_footers.parse_footer(line)
2865 if parsed_footer_line:
2866 # Line is a gerrit footer in the form: Footer-Key: any value.
2867 # Thus, must be appended observing Gerrit footer rules.
2868 self.set_description(
2869 git_footers.add_footer(self.description,
2870 key=parsed_footer_line[0],
2871 value=parsed_footer_line[1]))
2872 return
2873
2874 if not self._description_lines:
2875 self._description_lines.append(line)
2876 return
2877
2878 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2879 if gerrit_footers:
2880 # git_footers.split_footers ensures that there is an empty line before
2881 # actual (gerrit) footers, if any. We have to keep it that way.
2882 assert top_lines and top_lines[-1] == ''
2883 top_lines, separator = top_lines[:-1], top_lines[-1:]
2884 else:
2885 separator = [] # No need for separator if there are no gerrit_footers.
2886
2887 prev_line = top_lines[-1] if top_lines else ''
2888 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2889 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2890 top_lines.append('')
2891 top_lines.append(line)
2892 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002893
tandrii99a72f22016-08-17 14:33:24 -07002894 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002895 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002896 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002897 reviewers = [match.group(2).strip()
2898 for match in matches
2899 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002900 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002901
bradnelsond975b302016-10-23 12:20:23 -07002902 def get_cced(self):
2903 """Retrieves the list of reviewers."""
2904 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2905 cced = [match.group(2).strip() for match in matches if match]
2906 return cleanup_list(cced)
2907
Nodir Turakulov23b82142017-11-16 11:04:25 -08002908 def get_hash_tags(self):
2909 """Extracts and sanitizes a list of Gerrit hashtags."""
2910 subject = (self._description_lines or ('',))[0]
2911 subject = re.sub(
2912 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2913
2914 tags = []
2915 start = 0
2916 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2917 while True:
2918 m = bracket_exp.match(subject, start)
2919 if not m:
2920 break
2921 tags.append(self.sanitize_hash_tag(m.group(1)))
2922 start = m.end()
2923
2924 if not tags:
2925 # Try "Tag: " prefix.
2926 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2927 if m:
2928 tags.append(self.sanitize_hash_tag(m.group(1)))
2929 return tags
2930
2931 @classmethod
2932 def sanitize_hash_tag(cls, tag):
2933 """Returns a sanitized Gerrit hash tag.
2934
2935 A sanitized hashtag can be used as a git push refspec parameter value.
2936 """
2937 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2938
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002939
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002940def FindCodereviewSettingsFile(filename='codereview.settings'):
2941 """Finds the given file starting in the cwd and going up.
2942
2943 Only looks up to the top of the repository unless an
2944 'inherit-review-settings-ok' file exists in the root of the repository.
2945 """
2946 inherit_ok_file = 'inherit-review-settings-ok'
2947 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002948 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002949 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2950 root = '/'
2951 while True:
2952 if filename in os.listdir(cwd):
2953 if os.path.isfile(os.path.join(cwd, filename)):
2954 return open(os.path.join(cwd, filename))
2955 if cwd == root:
2956 break
2957 cwd = os.path.dirname(cwd)
2958
2959
2960def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002961 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002962 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002963
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002964 def SetProperty(name, setting, unset_error_ok=False):
2965 fullname = 'rietveld.' + name
2966 if setting in keyvals:
2967 RunGit(['config', fullname, keyvals[setting]])
2968 else:
2969 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2970
tandrii48df5812016-10-17 03:55:37 -07002971 if not keyvals.get('GERRIT_HOST', False):
2972 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002973 # Only server setting is required. Other settings can be absent.
2974 # In that case, we ignore errors raised during option deletion attempt.
2975 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2976 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2977 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002978 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002979 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2980 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002981 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2982 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002983 SetProperty(
2984 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00002985 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002986
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002987 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002988 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002989
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002990 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002991 RunGit(['config', 'gerrit.squash-uploads',
2992 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002993
tandrii@chromium.org28253532016-04-14 13:46:56 +00002994 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002995 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002996 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2997
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002998 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002999 # should be of the form
3000 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3001 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003002 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3003 keyvals['ORIGIN_URL_CONFIG']])
3004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003005
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003006def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003007 """Downloads a network object to a local file, like urllib.urlretrieve.
3008
3009 This is necessary because urllib is broken for SSL connections via a proxy.
3010 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003011 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003012 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003013
3014
ukai@chromium.org712d6102013-11-27 00:52:58 +00003015def hasSheBang(fname):
3016 """Checks fname is a #! script."""
3017 with open(fname) as f:
3018 return f.read(2).startswith('#!')
3019
3020
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003021def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003022 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003023
3024 Args:
3025 force: True to update hooks. False to install hooks if not present.
3026 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003027 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003028 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3029 if not os.access(dst, os.X_OK):
3030 if os.path.exists(dst):
3031 if not force:
3032 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003033 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003034 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003035 if not hasSheBang(dst):
3036 DieWithError('Not a script: %s\n'
3037 'You need to download from\n%s\n'
3038 'into .git/hooks/commit-msg and '
3039 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003040 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3041 except Exception:
3042 if os.path.exists(dst):
3043 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003044 DieWithError('\nFailed to download hooks.\n'
3045 'You need to download from\n%s\n'
3046 'into .git/hooks/commit-msg and '
3047 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003048
3049
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003050class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003051 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003052
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003053 _GOOGLESOURCE = 'googlesource.com'
3054
3055 def __init__(self):
3056 # Cached list of [host, identity, source], where source is either
3057 # .gitcookies or .netrc.
3058 self._all_hosts = None
3059
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003060 def ensure_configured_gitcookies(self):
3061 """Runs checks and suggests fixes to make git use .gitcookies from default
3062 path."""
3063 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3064 configured_path = RunGitSilent(
3065 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003066 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003067 if configured_path:
3068 self._ensure_default_gitcookies_path(configured_path, default)
3069 else:
3070 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003071
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003072 @staticmethod
3073 def _ensure_default_gitcookies_path(configured_path, default_path):
3074 assert configured_path
3075 if configured_path == default_path:
3076 print('git is already configured to use your .gitcookies from %s' %
3077 configured_path)
3078 return
3079
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003080 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003081 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3082 (configured_path, default_path))
3083
3084 if not os.path.exists(configured_path):
3085 print('However, your configured .gitcookies file is missing.')
3086 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3087 action='reconfigure')
3088 RunGit(['config', '--global', 'http.cookiefile', default_path])
3089 return
3090
3091 if os.path.exists(default_path):
3092 print('WARNING: default .gitcookies file already exists %s' %
3093 default_path)
3094 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3095 default_path)
3096
3097 confirm_or_exit('Move existing .gitcookies to default location?',
3098 action='move')
3099 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003100 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003101 print('Moved and reconfigured git to use .gitcookies from %s' %
3102 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003103
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003104 @staticmethod
3105 def _configure_gitcookies_path(default_path):
3106 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3107 if os.path.exists(netrc_path):
3108 print('You seem to be using outdated .netrc for git credentials: %s' %
3109 netrc_path)
3110 print('This tool will guide you through setting up recommended '
3111 '.gitcookies store for git credentials.\n'
3112 '\n'
3113 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3114 ' git config --global --unset http.cookiefile\n'
3115 ' mv %s %s.backup\n\n' % (default_path, default_path))
3116 confirm_or_exit(action='setup .gitcookies')
3117 RunGit(['config', '--global', 'http.cookiefile', default_path])
3118 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003119
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003120 def get_hosts_with_creds(self, include_netrc=False):
3121 if self._all_hosts is None:
3122 a = gerrit_util.CookiesAuthenticator()
3123 self._all_hosts = [
3124 (h, u, s)
3125 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003126 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3127 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003128 )
3129 if h.endswith(self._GOOGLESOURCE)
3130 ]
3131
3132 if include_netrc:
3133 return self._all_hosts
3134 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3135
3136 def print_current_creds(self, include_netrc=False):
3137 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3138 if not hosts:
3139 print('No Git/Gerrit credentials found')
3140 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003141 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003142 header = [('Host', 'User', 'Which file'),
3143 ['=' * l for l in lengths]]
3144 for row in (header + hosts):
3145 print('\t'.join((('%%+%ds' % l) % s)
3146 for l, s in zip(lengths, row)))
3147
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003148 @staticmethod
3149 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003150 """Parses identity "git-<username>.domain" into <username> and domain."""
3151 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003152 # distinguishable from sub-domains. But we do know typical domains:
3153 if identity.endswith('.chromium.org'):
3154 domain = 'chromium.org'
3155 username = identity[:-len('.chromium.org')]
3156 else:
3157 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003158 if username.startswith('git-'):
3159 username = username[len('git-'):]
3160 return username, domain
3161
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003162 def _canonical_git_googlesource_host(self, host):
3163 """Normalizes Gerrit hosts (with '-review') to Git host."""
3164 assert host.endswith(self._GOOGLESOURCE)
3165 # Prefix doesn't include '.' at the end.
3166 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3167 if prefix.endswith('-review'):
3168 prefix = prefix[:-len('-review')]
3169 return prefix + '.' + self._GOOGLESOURCE
3170
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003171 def _canonical_gerrit_googlesource_host(self, host):
3172 git_host = self._canonical_git_googlesource_host(host)
3173 prefix = git_host.split('.', 1)[0]
3174 return prefix + '-review.' + self._GOOGLESOURCE
3175
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003176 def _get_counterpart_host(self, host):
3177 assert host.endswith(self._GOOGLESOURCE)
3178 git = self._canonical_git_googlesource_host(host)
3179 gerrit = self._canonical_gerrit_googlesource_host(git)
3180 return git if gerrit == host else gerrit
3181
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003182 def has_generic_host(self):
3183 """Returns whether generic .googlesource.com has been configured.
3184
3185 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3186 """
3187 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3188 if host == '.' + self._GOOGLESOURCE:
3189 return True
3190 return False
3191
3192 def _get_git_gerrit_identity_pairs(self):
3193 """Returns map from canonic host to pair of identities (Git, Gerrit).
3194
3195 One of identities might be None, meaning not configured.
3196 """
3197 host_to_identity_pairs = {}
3198 for host, identity, _ in self.get_hosts_with_creds():
3199 canonical = self._canonical_git_googlesource_host(host)
3200 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3201 idx = 0 if canonical == host else 1
3202 pair[idx] = identity
3203 return host_to_identity_pairs
3204
3205 def get_partially_configured_hosts(self):
3206 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003207 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003208 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003209 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003210
3211 def get_conflicting_hosts(self):
3212 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003213 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003214 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003215 if None not in (i1, i2) and i1 != i2)
3216
3217 def get_duplicated_hosts(self):
3218 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003219 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003220
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003221
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003222 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003223 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003224 hosts = sorted(hosts)
3225 assert hosts
3226 if extra_column_func is None:
3227 extras = [''] * len(hosts)
3228 else:
3229 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003230 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3231 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003232 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003233 lines.append(tmpl % he)
3234 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003235
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003236 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003237 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003238 yield ('.googlesource.com wildcard record detected',
3239 ['Chrome Infrastructure team recommends to list full host names '
3240 'explicitly.'],
3241 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003242
3243 dups = self.get_duplicated_hosts()
3244 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003245 yield ('The following hosts were defined twice',
3246 self._format_hosts(dups),
3247 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003248
3249 partial = self.get_partially_configured_hosts()
3250 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003251 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3252 'These hosts are missing',
3253 self._format_hosts(partial, lambda host: 'but %s defined' %
3254 self._get_counterpart_host(host)),
3255 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003256
3257 conflicting = self.get_conflicting_hosts()
3258 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003259 yield ('The following Git hosts have differing credentials from their '
3260 'Gerrit counterparts',
3261 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3262 tuple(self._get_git_gerrit_identity_pairs()[host])),
3263 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003264
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003265 def find_and_report_problems(self):
3266 """Returns True if there was at least one problem, else False."""
3267 found = False
3268 bad_hosts = set()
3269 for title, sublines, hosts in self._find_problems():
3270 if not found:
3271 found = True
3272 print('\n\n.gitcookies problem report:\n')
3273 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003274 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003275 if sublines:
3276 print()
3277 print(' %s' % '\n '.join(sublines))
3278 print()
3279
3280 if bad_hosts:
3281 assert found
3282 print(' You can manually remove corresponding lines in your %s file and '
3283 'visit the following URLs with correct account to generate '
3284 'correct credential lines:\n' %
3285 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3286 print(' %s' % '\n '.join(sorted(set(
3287 gerrit_util.CookiesAuthenticator().get_new_password_url(
3288 self._canonical_git_googlesource_host(host))
3289 for host in bad_hosts
3290 ))))
3291 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003292
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003293
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003294@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003295def CMDcreds_check(parser, args):
3296 """Checks credentials and suggests changes."""
3297 _, _ = parser.parse_args(args)
3298
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003299 # Code below checks .gitcookies. Abort if using something else.
3300 authn = gerrit_util.Authenticator.get()
3301 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003302 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003303 'This command is not designed for bot environment. It checks '
3304 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003305 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3306 if isinstance(authn, gerrit_util.GceAuthenticator):
3307 message += (
3308 '\n'
3309 'If you need to run this on GCE or a cloudtop instance, '
3310 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3311 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003312
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003313 checker = _GitCookiesChecker()
3314 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003315
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003316 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003317 checker.print_current_creds(include_netrc=True)
3318
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003319 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003320 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003321 return 0
3322 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003323
3324
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003325@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003326def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003327 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003328 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003329 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003330 _, args = parser.parse_args(args)
3331 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003332 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003333 return RunGit(['config', 'branch.%s.base-url' % branch],
3334 error_ok=False).strip()
3335 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003336 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003337 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3338 error_ok=False).strip()
3339
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003340
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003341def color_for_status(status):
3342 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003343 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003344 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003345 'unsent': BOLD + Fore.YELLOW,
3346 'waiting': BOLD + Fore.RED,
3347 'reply': BOLD + Fore.YELLOW,
3348 'not lgtm': BOLD + Fore.RED,
3349 'lgtm': BOLD + Fore.GREEN,
3350 'commit': BOLD + Fore.MAGENTA,
3351 'closed': BOLD + Fore.CYAN,
3352 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003353 }.get(status, Fore.WHITE)
3354
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003355
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003356def get_cl_statuses(changes, fine_grained, max_processes=None):
3357 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003358
3359 If fine_grained is true, this will fetch CL statuses from the server.
3360 Otherwise, simply indicate if there's a matching url for the given branches.
3361
3362 If max_processes is specified, it is used as the maximum number of processes
3363 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3364 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003365
3366 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003367 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003368 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003369 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003370
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003371 if not fine_grained:
3372 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003373 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003374 for cl in changes:
3375 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003376 return
3377
3378 # First, sort out authentication issues.
3379 logging.debug('ensuring credentials exist')
3380 for cl in changes:
3381 cl.EnsureAuthenticated(force=False, refresh=True)
3382
3383 def fetch(cl):
3384 try:
3385 return (cl, cl.GetStatus())
3386 except:
3387 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003388 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003389 raise
3390
3391 threads_count = len(changes)
3392 if max_processes:
3393 threads_count = max(1, min(threads_count, max_processes))
3394 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3395
Edward Lemur61bf4172020-02-24 23:22:37 +00003396 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003397 fetched_cls = set()
3398 try:
3399 it = pool.imap_unordered(fetch, changes).__iter__()
3400 while True:
3401 try:
3402 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003403 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003404 break
3405 fetched_cls.add(cl)
3406 yield cl, status
3407 finally:
3408 pool.close()
3409
3410 # Add any branches that failed to fetch.
3411 for cl in set(changes) - fetched_cls:
3412 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003413
rmistry@google.com2dd99862015-06-22 12:22:18 +00003414
Jose Lopes3863fc52020-04-07 17:00:25 +00003415def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003416 """Uploads CLs of local branches that are dependents of the current branch.
3417
3418 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003419
3420 test1 -> test2.1 -> test3.1
3421 -> test3.2
3422 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003423
3424 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3425 run on the dependent branches in this order:
3426 test2.1, test3.1, test3.2, test2.2, test3.3
3427
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003428 Note: This function does not rebase your local dependent branches. Use it
3429 when you make a change to the parent branch that will not conflict
3430 with its dependent branches, and you would like their dependencies
3431 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003432 """
3433 if git_common.is_dirty_git_tree('upload-branch-deps'):
3434 return 1
3435
3436 root_branch = cl.GetBranch()
3437 if root_branch is None:
3438 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3439 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003440 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003441 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3442 'patchset dependencies without an uploaded CL.')
3443
3444 branches = RunGit(['for-each-ref',
3445 '--format=%(refname:short) %(upstream:short)',
3446 'refs/heads'])
3447 if not branches:
3448 print('No local branches found.')
3449 return 0
3450
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003451 # Create a dictionary of all local branches to the branches that are
3452 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003453 tracked_to_dependents = collections.defaultdict(list)
3454 for b in branches.splitlines():
3455 tokens = b.split()
3456 if len(tokens) == 2:
3457 branch_name, tracked = tokens
3458 tracked_to_dependents[tracked].append(branch_name)
3459
vapiera7fbd5a2016-06-16 09:17:49 -07003460 print()
3461 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003462 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003463
rmistry@google.com2dd99862015-06-22 12:22:18 +00003464 def traverse_dependents_preorder(branch, padding=''):
3465 dependents_to_process = tracked_to_dependents.get(branch, [])
3466 padding += ' '
3467 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003468 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003469 dependents.append(dependent)
3470 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003471
rmistry@google.com2dd99862015-06-22 12:22:18 +00003472 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003473 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003474
3475 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003476 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003477 return 0
3478
Jose Lopes3863fc52020-04-07 17:00:25 +00003479 if not force:
3480 confirm_or_exit('This command will checkout all dependent branches and run '
3481 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003482
rmistry@google.com2dd99862015-06-22 12:22:18 +00003483 # Record all dependents that failed to upload.
3484 failures = {}
3485 # Go through all dependents, checkout the branch and upload.
3486 try:
3487 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print()
3489 print('--------------------------------------')
3490 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003491 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003492 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003493 try:
3494 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003495 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003496 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003497 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003498 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003499 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003500 finally:
3501 # Swap back to the original root branch.
3502 RunGit(['checkout', '-q', root_branch])
3503
vapiera7fbd5a2016-06-16 09:17:49 -07003504 print()
3505 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003506 for dependent_branch in dependents:
3507 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003508 print(' %s : %s' % (dependent_branch, upload_status))
3509 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003510
3511 return 0
3512
3513
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003514def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003515 """Given a proposed tag name, returns a tag name that is guaranteed to be
3516 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3517 or 'foo-3', and so on."""
3518
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003519 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003520 for suffix_num in itertools.count(1):
3521 if suffix_num == 1:
3522 to_check = proposed_tag
3523 else:
3524 to_check = '%s-%d' % (proposed_tag, suffix_num)
3525
3526 if to_check not in existing_tags:
3527 return to_check
3528
3529
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003530@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003531def CMDarchive(parser, args):
3532 """Archives and deletes branches associated with closed changelists."""
3533 parser.add_option(
3534 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003535 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003536 parser.add_option(
3537 '-f', '--force', action='store_true',
3538 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003539 parser.add_option(
3540 '-d', '--dry-run', action='store_true',
3541 help='Skip the branch tagging and removal steps.')
3542 parser.add_option(
3543 '-t', '--notags', action='store_true',
3544 help='Do not tag archived branches. '
3545 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003546 parser.add_option(
3547 '-p',
3548 '--pattern',
3549 default='git-cl-archived-{issue}-{branch}',
3550 help='Format string for archive tags. '
3551 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003552
kmarshall3bff56b2016-06-06 18:31:47 -07003553 options, args = parser.parse_args(args)
3554 if args:
3555 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003556
3557 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3558 if not branches:
3559 return 0
3560
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003561 tags = RunGit(['for-each-ref', '--format=%(refname)',
3562 'refs/tags']).splitlines() or []
3563 tags = [t.split('/')[-1] for t in tags]
3564
vapiera7fbd5a2016-06-16 09:17:49 -07003565 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003566 changes = [Changelist(branchref=b)
3567 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003568 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3569 statuses = get_cl_statuses(changes,
3570 fine_grained=True,
3571 max_processes=options.maxjobs)
3572 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003573 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3574 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003575 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003576 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003577 proposal.sort()
3578
3579 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003580 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003581 return 0
3582
Edward Lemur85153282020-02-14 22:06:29 +00003583 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003584
vapiera7fbd5a2016-06-16 09:17:49 -07003585 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003586 if options.notags:
3587 for next_item in proposal:
3588 print(' ' + next_item[0])
3589 else:
3590 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3591 for next_item in proposal:
3592 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003593
kmarshall9249e012016-08-23 12:02:16 -07003594 # Quit now on precondition failure or if instructed by the user, either
3595 # via an interactive prompt or by command line flags.
3596 if options.dry_run:
3597 print('\nNo changes were made (dry run).\n')
3598 return 0
3599 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003600 print('You are currently on a branch \'%s\' which is associated with a '
3601 'closed codereview issue, so archive cannot proceed. Please '
3602 'checkout another branch and run this command again.' %
3603 current_branch)
3604 return 1
kmarshall9249e012016-08-23 12:02:16 -07003605 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003606 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003607 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003608 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003609 return 1
3610
3611 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003612 if not options.notags:
3613 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003614
3615 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3616 # Clean up the tag if we failed to delete the branch.
3617 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003618
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003620
3621 return 0
3622
3623
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003624@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003625def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003626 """Show status of changelists.
3627
3628 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003629 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003630 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003631 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003632 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003633 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003634 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003635 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003636
3637 Also see 'git cl comments'.
3638 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003639 parser.add_option(
3640 '--no-branch-color',
3641 action='store_true',
3642 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003643 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003644 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003645 parser.add_option('-f', '--fast', action='store_true',
3646 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003647 parser.add_option(
3648 '-j', '--maxjobs', action='store', type=int,
3649 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003650 parser.add_option(
3651 '-i', '--issue', type=int,
3652 help='Operate on this issue instead of the current branch\'s implicit '
3653 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003654 parser.add_option('-d',
3655 '--date-order',
3656 action='store_true',
3657 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003658 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003659 if args:
3660 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003661
iannuccie53c9352016-08-17 14:40:40 -07003662 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003663 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003664
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003665 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003666 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003667 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003668 if cl.GetIssue():
3669 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003670 elif options.field == 'id':
3671 issueid = cl.GetIssue()
3672 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003673 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003674 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003675 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003676 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003678 elif options.field == 'status':
3679 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003680 elif options.field == 'url':
3681 url = cl.GetIssueURL()
3682 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003684 return 0
3685
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003686 branches = RunGit([
3687 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3688 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003689 if not branches:
3690 print('No local branch found.')
3691 return 0
3692
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003693 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003694 Changelist(branchref=b, commit_date=ct)
3695 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3696 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003698 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003699 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003700 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003701
Edward Lemur85153282020-02-14 22:06:29 +00003702 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003703
3704 def FormatBranchName(branch, colorize=False):
3705 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3706 an asterisk when it is the current branch."""
3707
3708 asterisk = ""
3709 color = Fore.RESET
3710 if branch == current_branch:
3711 asterisk = "* "
3712 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003713 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003714
3715 if colorize:
3716 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003717 return asterisk + branch_name
3718
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003719 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003720
3721 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003722
3723 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003724 sorted_changes = sorted(changes,
3725 key=lambda c: c.GetCommitDate(),
3726 reverse=True)
3727 else:
3728 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3729 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003730 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003731 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003732 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003733 branch_statuses[c.GetBranch()] = status
3734 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003735 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003736 if url and (not status or status == 'error'):
3737 # The issue probably doesn't exist anymore.
3738 url += ' (broken)'
3739
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003740 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003741 # Turn off bold as well as colors.
3742 END = '\033[0m'
3743 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003744 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003745 color = ''
3746 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003747 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003748
Alan Cuttera3be9a52019-03-04 18:50:33 +00003749 branch_display = FormatBranchName(branch)
3750 padding = ' ' * (alignment - len(branch_display))
3751 if not options.no_branch_color:
3752 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003753
Alan Cuttera3be9a52019-03-04 18:50:33 +00003754 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3755 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003756
vapiera7fbd5a2016-06-16 09:17:49 -07003757 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003758 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003759 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003760 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003761 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003762 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003763 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003764 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003765 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003766 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003767 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003768 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003769 return 0
3770
3771
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003772def colorize_CMDstatus_doc():
3773 """To be called once in main() to add colors to git cl status help."""
3774 colors = [i for i in dir(Fore) if i[0].isupper()]
3775
3776 def colorize_line(line):
3777 for color in colors:
3778 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003779 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003780 indent = len(line) - len(line.lstrip(' ')) + 1
3781 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3782 return line
3783
3784 lines = CMDstatus.__doc__.splitlines()
3785 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3786
3787
phajdan.jre328cf92016-08-22 04:12:17 -07003788def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003789 if path == '-':
3790 json.dump(contents, sys.stdout)
3791 else:
3792 with open(path, 'w') as f:
3793 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003794
3795
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003796@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003797@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003798def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003799 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003800
3801 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003802 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003803 parser.add_option('-r', '--reverse', action='store_true',
3804 help='Lookup the branch(es) for the specified issues. If '
3805 'no issues are specified, all branches with mapped '
3806 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003807 parser.add_option('--json',
3808 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003809 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003810
dnj@chromium.org406c4402015-03-03 17:22:28 +00003811 if options.reverse:
3812 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003813 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003814 # Reverse issue lookup.
3815 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003816
3817 git_config = {}
3818 for config in RunGit(['config', '--get-regexp',
3819 r'branch\..*issue']).splitlines():
3820 name, _space, val = config.partition(' ')
3821 git_config[name] = val
3822
dnj@chromium.org406c4402015-03-03 17:22:28 +00003823 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003824 issue = git_config.get(
3825 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003826 if issue:
3827 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003828 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003829 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003830 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003831 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003832 try:
3833 issue_num = int(issue)
3834 except ValueError:
3835 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003836 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003837 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003838 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003839 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003840 if options.json:
3841 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003842 return 0
3843
3844 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003845 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003846 if not issue.valid:
3847 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3848 'or no argument to list it.\n'
3849 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003850 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003851 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003852 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003853 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003854 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3855 if options.json:
3856 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003857 'gerrit_host': cl.GetGerritHost(),
3858 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003859 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003860 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003861 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003862 return 0
3863
3864
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003865@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003866def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003867 """Shows or posts review comments for any changelist."""
3868 parser.add_option('-a', '--add-comment', dest='comment',
3869 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003870 parser.add_option('-p', '--publish', action='store_true',
3871 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003872 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003873 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003874 parser.add_option('-m', '--machine-readable', dest='readable',
3875 action='store_false', default=True,
3876 help='output comments in a format compatible with '
3877 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003878 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003879 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003880 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003881
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003882 issue = None
3883 if options.issue:
3884 try:
3885 issue = int(options.issue)
3886 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003887 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003888
Edward Lemur934836a2019-09-09 20:16:54 +00003889 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003890
3891 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003892 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003893 return 0
3894
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003895 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3896 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003897 for comment in summary:
3898 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003899 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003900 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003901 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003902 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003903 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003904 elif comment.autogenerated:
3905 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003906 else:
3907 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003908 print('\n%s%s %s%s\n%s' % (
3909 color,
3910 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3911 comment.sender,
3912 Fore.RESET,
3913 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3914
smut@google.comc85ac942015-09-15 16:34:43 +00003915 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003916 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003917 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003918 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3919 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003920 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003921 return 0
3922
3923
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003924@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003925@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003926def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003927 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003928 parser.add_option('-d', '--display', action='store_true',
3929 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003930 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003931 help='New description to set for this issue (- for stdin, '
3932 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003933 parser.add_option('-f', '--force', action='store_true',
3934 help='Delete any unpublished Gerrit edits for this issue '
3935 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003936
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003937 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003938
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003939 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003940 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003941 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003942 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003943 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003944
Edward Lemur934836a2019-09-09 20:16:54 +00003945 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003946 if target_issue_arg:
3947 kwargs['issue'] = target_issue_arg.issue
3948 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003949
3950 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003951 if not cl.GetIssue():
3952 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003953
Edward Lemur678a6842019-10-03 22:25:05 +00003954 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003955 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003956
Edward Lemur6c6827c2020-02-06 21:15:18 +00003957 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003958
smut@google.com34fb6b12015-07-13 20:03:26 +00003959 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003960 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003961 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003962
3963 if options.new_description:
3964 text = options.new_description
3965 if text == '-':
3966 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003967 elif text == '+':
3968 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003969 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003970
3971 description.set_description(text)
3972 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003973 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003974 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003975 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003976 return 0
3977
3978
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003979@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003980def CMDlint(parser, args):
3981 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003982 parser.add_option('--filter', action='append', metavar='-x,+y',
3983 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003984 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003985
3986 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003987 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003988 try:
3989 import cpplint
3990 import cpplint_chromium
3991 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003992 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003993 return 1
3994
3995 # Change the current working directory before calling lint so that it
3996 # shows the correct base.
3997 previous_cwd = os.getcwd()
3998 os.chdir(settings.GetRoot())
3999 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004000 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004001 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004002 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004003 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004004 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004005
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004006 # Process cpplint arguments, if any.
4007 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4008 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004009 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004010
Lei Zhang379d1ad2020-07-15 19:40:06 +00004011 include_regex = re.compile(settings.GetLintRegex())
4012 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004013 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4014 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004015 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004016 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004017 continue
4018
4019 if ignore_regex.match(filename):
4020 print('Ignoring file %s' % filename)
4021 continue
4022
4023 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4024 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004025 finally:
4026 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004028 if cpplint._cpplint_state.error_count != 0:
4029 return 1
4030 return 0
4031
4032
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004033@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004034def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004035 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004036 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004037 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004038 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004039 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004040 parser.add_option('--all', action='store_true',
4041 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004042 parser.add_option('--parallel', action='store_true',
4043 help='Run all tests specified by input_api.RunTests in all '
4044 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004045 parser.add_option('--resultdb', action='store_true',
4046 help='Run presubmit checks in the ResultSink environment '
4047 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004048 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004049 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050
sbc@chromium.org71437c02015-04-09 19:29:40 +00004051 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053 return 1
4054
Edward Lemur934836a2019-09-09 20:16:54 +00004055 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004056 if args:
4057 base_branch = args[0]
4058 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004059 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004060 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004062 if cl.GetIssue():
4063 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004064 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004065 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004066
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004067 cl.RunHook(
4068 committing=not options.upload,
4069 may_prompt=False,
4070 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004071 parallel=options.parallel,
4072 upstream=base_branch,
4073 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004074 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004075 resultdb=options.resultdb,
4076 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004077 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004078
4079
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004080def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004081 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004082
4083 Works the same way as
4084 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4085 but can be called on demand on all platforms.
4086
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004087 The basic idea is to generate git hash of a state of the tree, original
4088 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004089 """
4090 lines = []
4091 tree_hash = RunGitSilent(['write-tree'])
4092 lines.append('tree %s' % tree_hash.strip())
4093 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4094 if code == 0:
4095 lines.append('parent %s' % parent.strip())
4096 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4097 lines.append('author %s' % author.strip())
4098 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4099 lines.append('committer %s' % committer.strip())
4100 lines.append('')
4101 # Note: Gerrit's commit-hook actually cleans message of some lines and
4102 # whitespace. This code is not doing this, but it clearly won't decrease
4103 # entropy.
4104 lines.append(message)
4105 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004106 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004107 return 'I%s' % change_hash.strip()
4108
4109
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004110def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004111 """Computes the remote branch ref to use for the CL.
4112
4113 Args:
4114 remote (str): The git remote for the CL.
4115 remote_branch (str): The git remote branch for the CL.
4116 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004117 """
4118 if not (remote and remote_branch):
4119 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004120
wittman@chromium.org455dc922015-01-26 20:15:50 +00004121 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004122 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004123 # refs, which are then translated into the remote full symbolic refs
4124 # below.
4125 if '/' not in target_branch:
4126 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4127 else:
4128 prefix_replacements = (
4129 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4130 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4131 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4132 )
4133 match = None
4134 for regex, replacement in prefix_replacements:
4135 match = re.search(regex, target_branch)
4136 if match:
4137 remote_branch = target_branch.replace(match.group(0), replacement)
4138 break
4139 if not match:
4140 # This is a branch path but not one we recognize; use as-is.
4141 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004142 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4143 # Handle the refs that need to land in different refs.
4144 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004145
wittman@chromium.org455dc922015-01-26 20:15:50 +00004146 # Create the true path to the remote branch.
4147 # Does the following translation:
4148 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004149 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004150 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4151 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4152 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4153 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4154 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4155 'refs/heads/')
4156 elif remote_branch.startswith('refs/remotes/branch-heads'):
4157 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004158
wittman@chromium.org455dc922015-01-26 20:15:50 +00004159 return remote_branch
4160
4161
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004162def cleanup_list(l):
4163 """Fixes a list so that comma separated items are put as individual items.
4164
4165 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4166 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4167 """
4168 items = sum((i.split(',') for i in l), [])
4169 stripped_items = (i.strip() for i in items)
4170 return sorted(filter(None, stripped_items))
4171
4172
Aaron Gable4db38df2017-11-03 14:59:07 -07004173@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004174@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004175def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004176 """Uploads the current changelist to codereview.
4177
4178 Can skip dependency patchset uploads for a branch by running:
4179 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004180 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004181 git config --unset branch.branch_name.skip-deps-uploads
4182 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004183
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004184 If the name of the checked out branch starts with "bug-" or "fix-" followed
4185 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004186 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004187
4188 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004189 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004190 [git-cl] add support for hashtags
4191 Foo bar: implement foo
4192 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004193 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004194 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4195 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004196 parser.add_option('--bypass-watchlists', action='store_true',
4197 dest='bypass_watchlists',
4198 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004199 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004200 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004201 parser.add_option('--message', '-m', dest='message',
4202 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004203 parser.add_option('-b', '--bug',
4204 help='pre-populate the bug number(s) for this issue. '
4205 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004206 parser.add_option('--message-file', dest='message_file',
4207 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004208 parser.add_option('--title', '-t', dest='title',
4209 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004210 parser.add_option('-T', '--skip-title', action='store_true',
4211 dest='skip_title',
4212 help='Use the most recent commit message as the title of '
4213 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004214 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004215 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004216 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004217 parser.add_option('--tbrs',
4218 action='append', default=[],
4219 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004220 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004221 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004222 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004223 parser.add_option('--hashtag', dest='hashtags',
4224 action='append', default=[],
4225 help=('Gerrit hashtag for new CL; '
4226 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004227 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004228 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004229 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004230 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004231 metavar='TARGET',
4232 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004233 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004234 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004235 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004236 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004237 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004238 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004239 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004240 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4241 const='TBR', help='add a set of OWNERS to TBR')
4242 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4243 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004244 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004245 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004246 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004247 'implies --send-mail')
4248 parser.add_option('-d', '--cq-dry-run',
4249 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004250 help='Send the patchset to do a CQ dry run right after '
4251 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004252 parser.add_option(
4253 '-q',
4254 '--cq-quick-run',
4255 action='store_true',
4256 default=False,
4257 help='Send the patchset to do a CQ quick run right after '
4258 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4259 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004260 parser.add_option('--set-bot-commit', action='store_true',
4261 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004262 parser.add_option('--preserve-tryjobs', action='store_true',
4263 help='instruct the CQ to let tryjobs running even after '
4264 'new patchsets are uploaded instead of canceling '
4265 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004266 parser.add_option('--dependencies', action='store_true',
4267 help='Uploads CLs of all the local branches that depend on '
4268 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004269 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4270 help='Sends your change to the CQ after an approval. Only '
4271 'works on repos that have the Auto-Submit label '
4272 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004273 parser.add_option('--parallel', action='store_true',
4274 help='Run all tests specified by input_api.RunTests in all '
4275 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004276 parser.add_option('--no-autocc', action='store_true',
4277 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004278 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004279 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004280 parser.add_option('-R', '--retry-failed', action='store_true',
4281 help='Retry failed tryjobs from old patchset immediately '
4282 'after uploading new patchset. Cannot be used with '
4283 '--use-commit-queue or --cq-dry-run.')
4284 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4285 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004286 parser.add_option('--fixed', '-x',
4287 help='List of bugs that will be commented on and marked '
4288 'fixed (pre-populates "Fixed:" tag). Same format as '
4289 '-b option / "Bug:" tag. If fixing several issues, '
4290 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004291 parser.add_option('--edit-description', action='store_true', default=False,
4292 help='Modify description before upload. Cannot be used '
4293 'with --force. It is a noop when --no-squash is set '
4294 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004295 parser.add_option('--git-completion-helper', action="store_true",
4296 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004297 parser.add_option('--resultdb', action='store_true',
4298 help='Run presubmit checks in the ResultSink environment '
4299 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004300 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004301 parser.add_option('-o',
4302 '--push-options',
4303 action='append',
4304 default=[],
4305 help='Transmit the given string to the server when '
4306 'performing git push (pass-through). See git-push '
4307 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004308 parser.add_option('--no-add-changeid',
4309 action='store_true',
4310 dest='no_add_changeid',
4311 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004312
rmistry@google.com2dd99862015-06-22 12:22:18 +00004313 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004314 (options, args) = parser.parse_args(args)
4315
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004316 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004317 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4318 if opt.help != optparse.SUPPRESS_HELP))
4319 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004320
sbc@chromium.org71437c02015-04-09 19:29:40 +00004321 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004322 return 1
4323
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004324 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004325 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004326 options.cc = cleanup_list(options.cc)
4327
Josipe827b0f2020-01-30 00:07:20 +00004328 if options.edit_description and options.force:
4329 parser.error('Only one of --force and --edit-description allowed')
4330
tandriib80458a2016-06-23 12:20:07 -07004331 if options.message_file:
4332 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004333 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004334 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004335
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004336 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004337 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004338 options.use_commit_queue,
4339 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004340 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4341 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004342
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004343 if options.skip_title and options.title:
4344 parser.error('Only one of --title and --skip-title allowed.')
4345
Aaron Gableedbc4132017-09-11 13:22:28 -07004346 if options.use_commit_queue:
4347 options.send_mail = True
4348
Edward Lesmes0dd54822020-03-26 18:24:25 +00004349 if options.squash is None:
4350 # Load default for user, repo, squash=true, in this order.
4351 options.squash = settings.GetSquashGerritUploads()
4352
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004353 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004354 # Warm change details cache now to avoid RPCs later, reducing latency for
4355 # developers.
4356 if cl.GetIssue():
4357 cl._GetChangeDetail(
4358 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4359
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004360 if options.retry_failed and not cl.GetIssue():
4361 print('No previous patchsets, so --retry-failed has no effect.')
4362 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004363
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004364 # cl.GetMostRecentPatchset uses cached information, and can return the last
4365 # patchset before upload. Calling it here makes it clear that it's the
4366 # last patchset before upload. Note that GetMostRecentPatchset will fail
4367 # if no CL has been uploaded yet.
4368 if options.retry_failed:
4369 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004370
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004371 ret = cl.CMDUpload(options, args, orig_args)
4372
4373 if options.retry_failed:
4374 if ret != 0:
4375 print('Upload failed, so --retry-failed has no effect.')
4376 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004377 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004378 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004379 jobs = _filter_failed_for_retry(builds)
4380 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004381 print('No failed tryjobs, so --retry-failed has no effect.')
4382 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004383 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004384
4385 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004386
4387
Francois Dorayd42c6812017-05-30 15:10:20 -04004388@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004389@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004390def CMDsplit(parser, args):
4391 """Splits a branch into smaller branches and uploads CLs.
4392
4393 Creates a branch and uploads a CL for each group of files modified in the
4394 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004395 comment, the string '$directory', is replaced with the directory containing
4396 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004397 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004398 parser.add_option('-d', '--description', dest='description_file',
4399 help='A text file containing a CL description in which '
4400 '$directory will be replaced by each CL\'s directory.')
4401 parser.add_option('-c', '--comment', dest='comment_file',
4402 help='A text file containing a CL comment.')
4403 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004404 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004405 help='List the files and reviewers for each CL that would '
4406 'be created, but don\'t create branches or CLs.')
4407 parser.add_option('--cq-dry-run', action='store_true',
4408 help='If set, will do a cq dry run for each uploaded CL. '
4409 'Please be careful when doing this; more than ~10 CLs '
4410 'has the potential to overload our build '
4411 'infrastructure. Try to upload these not during high '
4412 'load times (usually 11-3 Mountain View time). Email '
4413 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004414 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4415 default=True,
4416 help='Sends your change to the CQ after an approval. Only '
4417 'works on repos that have the Auto-Submit label '
4418 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004419 options, _ = parser.parse_args(args)
4420
4421 if not options.description_file:
4422 parser.error('No --description flag specified.')
4423
4424 def WrappedCMDupload(args):
4425 return CMDupload(OptionParser(), args)
4426
Edward Lemur2c62b332020-03-12 22:12:33 +00004427 return split_cl.SplitCl(
4428 options.description_file, options.comment_file, Changelist,
4429 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4430 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004431
4432
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004433@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004434@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004436 """DEPRECATED: Used to commit the current changelist via git-svn."""
4437 message = ('git-cl no longer supports committing to SVN repositories via '
4438 'git-svn. You probably want to use `git cl land` instead.')
4439 print(message)
4440 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441
4442
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004443@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004444@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004445def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004446 """Commits the current changelist via git.
4447
4448 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4449 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004450 """
4451 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4452 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004453 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004454 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004455 parser.add_option('--parallel', action='store_true',
4456 help='Run all tests specified by input_api.RunTests in all '
4457 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004458 parser.add_option('--resultdb', action='store_true',
4459 help='Run presubmit checks in the ResultSink environment '
4460 'and send results to the ResultDB database.')
4461 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004462 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004463
Edward Lemur934836a2019-09-09 20:16:54 +00004464 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004465
Robert Iannucci2e73d432018-03-14 01:10:47 -07004466 if not cl.GetIssue():
4467 DieWithError('You must upload the change first to Gerrit.\n'
4468 ' If you would rather have `git cl land` upload '
4469 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004470 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4471 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004472
4473
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004474@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004476def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004477 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478 parser.add_option('-b', dest='newbranch',
4479 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004480 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004481 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004482 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004483 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004484
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004485 group = optparse.OptionGroup(
4486 parser,
4487 'Options for continuing work on the current issue uploaded from a '
4488 'different clone (e.g. different machine). Must be used independently '
4489 'from the other options. No issue number should be specified, and the '
4490 'branch must have an issue number associated with it')
4491 group.add_option('--reapply', action='store_true', dest='reapply',
4492 help='Reset the branch and reapply the issue.\n'
4493 'CAUTION: This will undo any local changes in this '
4494 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004495
4496 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004497 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004498 parser.add_option_group(group)
4499
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004500 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004501
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004502 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004503 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004504 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004505 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004506 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004507
Edward Lemur934836a2019-09-09 20:16:54 +00004508 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004509 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004510 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004511
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004512 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004513 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004514 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004515
4516 RunGit(['reset', '--hard', upstream])
4517 if options.pull:
4518 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004519
Edward Lemur678a6842019-10-03 22:25:05 +00004520 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004521 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4522 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004523
4524 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004525 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004526
Edward Lemurf38bc172019-09-03 21:02:13 +00004527 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004528 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004529 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004530
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004531 # We don't want uncommitted changes mixed up with the patch.
4532 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004533 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004535 if options.newbranch:
4536 if options.force:
4537 RunGit(['branch', '-D', options.newbranch],
4538 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004539 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004540
Edward Lemur678a6842019-10-03 22:25:05 +00004541 cl = Changelist(
4542 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004543
Edward Lemur678a6842019-10-03 22:25:05 +00004544 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004545 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004546
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004547 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4548 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004549
4550
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004551def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004552 """Fetches the tree status and returns either 'open', 'closed',
4553 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004554 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004555 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004556 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004557 if status.find('closed') != -1 or status == '0':
4558 return 'closed'
4559 elif status.find('open') != -1 or status == '1':
4560 return 'open'
4561 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004562 return 'unset'
4563
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004564
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565def GetTreeStatusReason():
4566 """Fetches the tree status from a json url and returns the message
4567 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004568 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004569 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004570 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571 status = json.loads(connection.read())
4572 connection.close()
4573 return status['message']
4574
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004575
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004576@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004577def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004578 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004579 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004580 status = GetTreeStatus()
4581 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004582 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004583 return 2
4584
vapiera7fbd5a2016-06-16 09:17:49 -07004585 print('The tree is %s' % status)
4586 print()
4587 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 if status != 'open':
4589 return 1
4590 return 0
4591
4592
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004593@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004594def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004595 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4596 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004597 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004598 '-b', '--bot', action='append',
4599 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4600 'times to specify multiple builders. ex: '
4601 '"-b win_rel -b win_layout". See '
4602 'the try server waterfall for the builders name and the tests '
4603 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004604 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004605 '-B', '--bucket', default='',
4606 help=('Buildbucket bucket to send the try requests.'))
4607 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004608 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004609 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004610 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004611 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004612 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004613 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004614 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004615 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004616 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004617 '-q',
4618 '--quick-run',
4619 action='store_true',
4620 default=False,
4621 help='trigger in quick run mode '
4622 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4623 'uick_run.md) (chromium only).')
4624 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004625 '--category', default='git_cl_try', help='Specify custom build category.')
4626 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004627 '--project',
4628 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004629 'in recipe to determine to which repository or directory to '
4630 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004631 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004632 '-p', '--property', dest='properties', action='append', default=[],
4633 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004634 'key2=value2 etc. The value will be treated as '
4635 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004636 'NOTE: using this may make your tryjob not usable for CQ, '
4637 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4640 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004641 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004642 parser.add_option(
4643 '-R', '--retry-failed', action='store_true', default=False,
4644 help='Retry failed jobs from the latest set of tryjobs. '
4645 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004646 parser.add_option(
4647 '-i', '--issue', type=int,
4648 help='Operate on this issue instead of the current branch\'s implicit '
4649 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004650 options, args = parser.parse_args(args)
4651
machenbach@chromium.org45453142015-09-15 08:45:22 +00004652 # Make sure that all properties are prop=value pairs.
4653 bad_params = [x for x in options.properties if '=' not in x]
4654 if bad_params:
4655 parser.error('Got properties with missing "=": %s' % bad_params)
4656
maruel@chromium.org15192402012-09-06 12:38:29 +00004657 if args:
4658 parser.error('Unknown arguments: %s' % args)
4659
Edward Lemur934836a2019-09-09 20:16:54 +00004660 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004661 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004662 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004663
Edward Lemurf38bc172019-09-03 21:02:13 +00004664 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004665 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004666
tandriie113dfd2016-10-11 10:20:12 -07004667 error_message = cl.CannotTriggerTryJobReason()
4668 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004669 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004670
Edward Lemur45768512020-03-02 19:03:14 +00004671 if options.bot:
4672 if options.retry_failed:
4673 parser.error('--bot is not compatible with --retry-failed.')
4674 if not options.bucket:
4675 parser.error('A bucket (e.g. "chromium/try") is required.')
4676
4677 triggered = [b for b in options.bot if 'triggered' in b]
4678 if triggered:
4679 parser.error(
4680 'Cannot schedule builds on triggered bots: %s.\n'
4681 'This type of bot requires an initial job from a parent (usually a '
4682 'builder). Schedule a job on the parent instead.\n' % triggered)
4683
4684 if options.bucket.startswith('.master'):
4685 parser.error('Buildbot masters are not supported.')
4686
4687 project, bucket = _parse_bucket(options.bucket)
4688 if project is None or bucket is None:
4689 parser.error('Invalid bucket: %s.' % options.bucket)
4690 jobs = sorted((project, bucket, bot) for bot in options.bot)
4691 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004692 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004693 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004694 if options.verbose:
4695 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004696 jobs = _filter_failed_for_retry(builds)
4697 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004698 print('There are no failed jobs in the latest set of jobs '
4699 '(patchset #%d), doing nothing.' % patchset)
4700 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004701 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004702 if num_builders > 10:
4703 confirm_or_exit('There are %d builders with failed builds.'
4704 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004705 elif options.quick_run:
4706 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4707 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004708 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004709 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004710 print('git cl try with no bots now defaults to CQ dry run.')
4711 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4712 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004713
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004714 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004715 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004716 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004717 except BuildbucketResponseException as ex:
4718 print('ERROR: %s' % ex)
4719 return 1
4720 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004721
4722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004723@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004724def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004725 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004726 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004727 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004728 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004729 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004730 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004731 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004732 '--color', action='store_true', default=setup_color.IS_TTY,
4733 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004734 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004735 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4736 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004737 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004738 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004739 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004740 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004741 parser.add_option(
4742 '-i', '--issue', type=int,
4743 help='Operate on this issue instead of the current branch\'s implicit '
4744 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 options, args = parser.parse_args(args)
4746 if args:
4747 parser.error('Unrecognized args: %s' % ' '.join(args))
4748
Edward Lemur934836a2019-09-09 20:16:54 +00004749 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004750 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004751 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752
tandrii221ab252016-10-06 08:12:04 -07004753 patchset = options.patchset
4754 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004755 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004756 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004757 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004758 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004759 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004760 cl.GetIssue())
4761
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004762 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004763 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004764 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004765 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004766 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004767 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004768 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004769 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004770 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004771 return 0
4772
4773
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004774@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004775@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004776def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004777 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004778 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004779 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004780 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004781
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004782 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004783 if args:
4784 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004785 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004786 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004787 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004788 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004789
4790 # Clear configured merge-base, if there is one.
4791 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004792 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004793 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004794 return 0
4795
4796
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004797@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004798def CMDweb(parser, args):
4799 """Opens the current CL in the web browser."""
4800 _, args = parser.parse_args(args)
4801 if args:
4802 parser.error('Unrecognized args: %s' % ' '.join(args))
4803
4804 issue_url = Changelist().GetIssueURL()
4805 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004806 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004807 return 1
4808
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004809 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004810 # allows us to hide the "Created new window in existing browser session."
4811 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004812 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004813 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004814 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004815 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004816 os.open(os.devnull, os.O_RDWR)
4817 try:
4818 webbrowser.open(issue_url)
4819 finally:
4820 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004821 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004822 return 0
4823
4824
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004825@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004826def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004827 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004828 parser.add_option('-d', '--dry-run', action='store_true',
4829 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004830 parser.add_option(
4831 '-q',
4832 '--quick-run',
4833 action='store_true',
4834 help='trigger in quick run mode '
4835 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4836 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004837 parser.add_option('-c', '--clear', action='store_true',
4838 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004839 parser.add_option(
4840 '-i', '--issue', type=int,
4841 help='Operate on this issue instead of the current branch\'s implicit '
4842 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004843 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004844 if args:
4845 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004846 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4847 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004848
Edward Lemur934836a2019-09-09 20:16:54 +00004849 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004850 if not cl.GetIssue():
4851 parser.error('Must upload the issue first.')
4852
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004853 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004854 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004855 elif options.quick_run:
4856 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004857 elif options.dry_run:
4858 state = _CQState.DRY_RUN
4859 else:
4860 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004861 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004862 return 0
4863
4864
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004865@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004866def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004867 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004868 parser.add_option(
4869 '-i', '--issue', type=int,
4870 help='Operate on this issue instead of the current branch\'s implicit '
4871 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004872 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004873 if args:
4874 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004875 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004876 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004877 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004878 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004879 cl.CloseIssue()
4880 return 0
4881
4882
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004883@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004884def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004885 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004886 parser.add_option(
4887 '--stat',
4888 action='store_true',
4889 dest='stat',
4890 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004891 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004892 if args:
4893 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004894
Edward Lemur934836a2019-09-09 20:16:54 +00004895 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004896 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004897 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004898 if not issue:
4899 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004900
Aaron Gablea718c3e2017-08-28 17:47:28 -07004901 base = cl._GitGetBranchConfigValue('last-upload-hash')
4902 if not base:
4903 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4904 if not base:
4905 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4906 revision_info = detail['revisions'][detail['current_revision']]
4907 fetch_info = revision_info['fetch']['http']
4908 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4909 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004910
Aaron Gablea718c3e2017-08-28 17:47:28 -07004911 cmd = ['git', 'diff']
4912 if options.stat:
4913 cmd.append('--stat')
4914 cmd.append(base)
4915 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004916
4917 return 0
4918
4919
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004920@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004921def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004922 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004923 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004924 '--ignore-current',
4925 action='store_true',
4926 help='Ignore the CL\'s current reviewers and start from scratch.')
4927 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004928 '--ignore-self',
4929 action='store_true',
4930 help='Do not consider CL\'s author as an owners.')
4931 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004932 '--no-color',
4933 action='store_true',
4934 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004935 parser.add_option(
4936 '--batch',
4937 action='store_true',
4938 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004939 # TODO: Consider moving this to another command, since other
4940 # git-cl owners commands deal with owners for a given CL.
4941 parser.add_option(
4942 '--show-all',
4943 action='store_true',
4944 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004945 options, args = parser.parse_args(args)
4946
Edward Lemur934836a2019-09-09 20:16:54 +00004947 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004948 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004949
Yang Guo6e269a02019-06-26 11:17:02 +00004950 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004951 if len(args) == 0:
4952 print('No files specified for --show-all. Nothing to do.')
4953 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004954 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004955 for path in args:
4956 print('Owners for %s:' % path)
4957 print('\n'.join(
4958 ' - %s' % owner
4959 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004960 return 0
4961
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004962 if args:
4963 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004964 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004965 base_branch = args[0]
4966 else:
4967 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004968 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004969
Edward Lemur2c62b332020-03-12 22:12:33 +00004970 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004971
4972 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004973 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
4974 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07004975 return 0
4976
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004977 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004978 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01004979 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004980 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00004981 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004982 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004983 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004984
4985
Aiden Bennerc08566e2018-10-03 17:52:42 +00004986def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004987 """Generates a diff command."""
4988 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004989 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4990
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004991 if allow_prefix:
4992 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4993 # case that diff.noprefix is set in the user's git config.
4994 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4995 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004996 diff_cmd += ['--no-prefix']
4997
4998 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004999
5000 if args:
5001 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005002 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005003 diff_cmd.append(arg)
5004 else:
5005 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005006
5007 return diff_cmd
5008
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005009
Jamie Madill5e96ad12020-01-13 16:08:35 +00005010def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5011 """Runs clang-format-diff and sets a return value if necessary."""
5012
5013 if not clang_diff_files:
5014 return 0
5015
5016 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5017 # formatted. This is used to block during the presubmit.
5018 return_value = 0
5019
5020 # Locate the clang-format binary in the checkout
5021 try:
5022 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5023 except clang_format.NotFoundError as e:
5024 DieWithError(e)
5025
5026 if opts.full or settings.GetFormatFullByDefault():
5027 cmd = [clang_format_tool]
5028 if not opts.dry_run and not opts.diff:
5029 cmd.append('-i')
5030 if opts.dry_run:
5031 for diff_file in clang_diff_files:
5032 with open(diff_file, 'r') as myfile:
5033 code = myfile.read().replace('\r\n', '\n')
5034 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5035 stdout = stdout.replace('\r\n', '\n')
5036 if opts.diff:
5037 sys.stdout.write(stdout)
5038 if code != stdout:
5039 return_value = 2
5040 else:
5041 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5042 if opts.diff:
5043 sys.stdout.write(stdout)
5044 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005045 try:
5046 script = clang_format.FindClangFormatScriptInChromiumTree(
5047 'clang-format-diff.py')
5048 except clang_format.NotFoundError as e:
5049 DieWithError(e)
5050
Edward Lesmes89624cd2020-04-06 17:51:56 +00005051 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005052 if not opts.dry_run and not opts.diff:
5053 cmd.append('-i')
5054
5055 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005056 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005057
Edward Lesmes89624cd2020-04-06 17:51:56 +00005058 env = os.environ.copy()
5059 env['PATH'] = (
5060 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5061 stdout = RunCommand(
5062 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005063 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005064 if opts.diff:
5065 sys.stdout.write(stdout)
5066 if opts.dry_run and len(stdout) > 0:
5067 return_value = 2
5068
5069 return return_value
5070
5071
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005072def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5073 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5074 presubmit checks have failed (and returns 0 otherwise)."""
5075
5076 if not rust_diff_files:
5077 return 0
5078
5079 # Locate the rustfmt binary.
5080 try:
5081 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5082 except rustfmt.NotFoundError as e:
5083 DieWithError(e)
5084
5085 # TODO(crbug.com/1231317): Support formatting only the changed lines
5086 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5087 # https://github.com/emilio/rustfmt-format-diff
5088 cmd = [rustfmt_tool]
5089 if opts.dry_run:
5090 cmd.append('--check')
5091 cmd += rust_diff_files
5092 rustfmt_exitcode = subprocess2.call(cmd)
5093
5094 if opts.presubmit and rustfmt_exitcode != 0:
5095 return 2
5096 else:
5097 return 0
5098
5099
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005100def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005101 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005102 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005103
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005104
enne@chromium.org555cfe42014-01-29 18:21:39 +00005105@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005106@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005107def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005108 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005109 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005110 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005111 RUST_EXTS = ['.rs']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005112 parser.add_option('--full', action='store_true',
5113 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005114 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005115 parser.add_option('--dry-run', action='store_true',
5116 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005117 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005118 '--no-clang-format',
5119 dest='clang_format',
5120 action='store_false',
5121 default=True,
5122 help='Disables formatting of various file types using clang-format.')
5123 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005124 '--python',
5125 action='store_true',
5126 default=None,
5127 help='Enables python formatting on all python files.')
5128 parser.add_option(
5129 '--no-python',
5130 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005131 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005132 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005133 'If neither --python or --no-python are set, python files that have a '
5134 '.style.yapf file in an ancestor directory will be formatted. '
5135 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005136 parser.add_option(
5137 '--js',
5138 action='store_true',
5139 help='Format javascript code with clang-format. '
5140 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005141 parser.add_option('--diff', action='store_true',
5142 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005143 parser.add_option('--presubmit', action='store_true',
5144 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005145
5146 parser.add_option('--rust-fmt',
5147 dest='use_rust_fmt',
5148 action='store_true',
5149 default=rustfmt.IsRustfmtSupported(),
5150 help='Enables formatting of Rust file types using rustfmt.')
5151 parser.add_option(
5152 '--no-rust-fmt',
5153 dest='use_rust_fmt',
5154 action='store_false',
5155 help='Disables formatting of Rust file types using rustfmt.')
5156
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005157 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005158
Garrett Beaty91a6f332020-01-06 16:57:24 +00005159 if opts.python is not None and opts.no_python:
5160 raise parser.error('Cannot set both --python and --no-python')
5161 if opts.no_python:
5162 opts.python = False
5163
Daniel Chengc55eecf2016-12-30 03:11:02 -08005164 # Normalize any remaining args against the current path, so paths relative to
5165 # the current directory are still resolved as expected.
5166 args = [os.path.join(os.getcwd(), arg) for arg in args]
5167
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005168 # git diff generates paths against the root of the repository. Change
5169 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005170 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005171 if rel_base_path:
5172 os.chdir(rel_base_path)
5173
digit@chromium.org29e47272013-05-17 17:01:46 +00005174 # Grab the merge-base commit, i.e. the upstream commit of the current
5175 # branch when it was created or the last time it was rebased. This is
5176 # to cover the case where the user may have called "git fetch origin",
5177 # moving the origin branch to a newer commit, but hasn't rebased yet.
5178 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005179 upstream_branch = opts.upstream
5180 if not upstream_branch:
5181 cl = Changelist()
5182 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005183 if upstream_branch:
5184 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5185 upstream_commit = upstream_commit.strip()
5186
5187 if not upstream_commit:
5188 DieWithError('Could not find base commit for this branch. '
5189 'Are you in detached state?')
5190
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005191 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5192 diff_output = RunGit(changed_files_cmd)
5193 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005194 # Filter out files deleted by this CL
5195 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005196
Andreas Haas417d89c2020-02-06 10:24:27 +00005197 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005198 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005199
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005200 clang_diff_files = []
5201 if opts.clang_format:
5202 clang_diff_files = [
5203 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5204 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005205 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005206 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005207 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005208
Edward Lesmes50da7702020-03-30 19:23:43 +00005209 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005210
Jamie Madill5e96ad12020-01-13 16:08:35 +00005211 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5212 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005213
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005214 if opts.use_rust_fmt:
5215 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5216 upstream_commit)
5217 if rust_fmt_return_value == 2:
5218 return_value = 2
5219
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005220 # Similar code to above, but using yapf on .py files rather than clang-format
5221 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005222 py_explicitly_disabled = opts.python is not None and not opts.python
5223 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005224 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5225 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005226
Aiden Bennerc08566e2018-10-03 17:52:42 +00005227 # Used for caching.
5228 yapf_configs = {}
5229 for f in python_diff_files:
5230 # Find the yapf style config for the current file, defaults to depot
5231 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005232 _FindYapfConfigFile(f, yapf_configs, top_dir)
5233
5234 # Turn on python formatting by default if a yapf config is specified.
5235 # This breaks in the case of this repo though since the specified
5236 # style file is also the global default.
5237 if opts.python is None:
5238 filtered_py_files = []
5239 for f in python_diff_files:
5240 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5241 filtered_py_files.append(f)
5242 else:
5243 filtered_py_files = python_diff_files
5244
5245 # Note: yapf still seems to fix indentation of the entire file
5246 # even if line ranges are specified.
5247 # See https://github.com/google/yapf/issues/499
5248 if not opts.full and filtered_py_files:
5249 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5250
Brian Sheedyb4307d52019-12-02 19:18:17 +00005251 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5252 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5253 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005254
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005255 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005256 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5257 # Default to pep8 if not .style.yapf is found.
5258 if not yapf_style:
5259 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005260
Peter Wend9399922020-06-17 17:33:49 +00005261 with open(f, 'r') as py_f:
5262 if 'python3' in py_f.readline():
5263 vpython_script = 'vpython3'
5264 else:
5265 vpython_script = 'vpython'
5266
5267 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005268
5269 has_formattable_lines = False
5270 if not opts.full:
5271 # Only run yapf over changed line ranges.
5272 for diff_start, diff_len in py_line_diffs[f]:
5273 diff_end = diff_start + diff_len - 1
5274 # Yapf errors out if diff_end < diff_start but this
5275 # is a valid line range diff for a removal.
5276 if diff_end >= diff_start:
5277 has_formattable_lines = True
5278 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5279 # If all line diffs were removals we have nothing to format.
5280 if not has_formattable_lines:
5281 continue
5282
5283 if opts.diff or opts.dry_run:
5284 cmd += ['--diff']
5285 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005286 stdout = RunCommand(cmd,
5287 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005288 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005289 cwd=top_dir,
5290 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005291 if opts.diff:
5292 sys.stdout.write(stdout)
5293 elif len(stdout) > 0:
5294 return_value = 2
5295 else:
5296 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005297 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005298
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005299 # Format GN build files. Always run on full build files for canonical form.
5300 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005301 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005302 if opts.dry_run or opts.diff:
5303 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005304 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005305 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005306 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005307 cwd=top_dir)
5308 if opts.dry_run and gn_ret == 2:
5309 return_value = 2 # Not formatted.
5310 elif opts.diff and gn_ret == 2:
5311 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005312 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005313 elif gn_ret != 0:
5314 # For non-dry run cases (and non-2 return values for dry-run), a
5315 # nonzero error code indicates a failure, probably because the file
5316 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005317 DieWithError('gn format failed on ' + gn_diff_file +
5318 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005319
Ilya Shermane081cbe2017-08-15 17:51:04 -07005320 # Skip the metrics formatting from the global presubmit hook. These files have
5321 # a separate presubmit hook that issues an error if the files need formatting,
5322 # whereas the top-level presubmit script merely issues a warning. Formatting
5323 # these files is somewhat slow, so it's important not to duplicate the work.
5324 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005325 for diff_xml in GetDiffXMLs(diff_files):
5326 xml_dir = GetMetricsDir(diff_xml)
5327 if not xml_dir:
5328 continue
5329
Ilya Shermane081cbe2017-08-15 17:51:04 -07005330 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005331 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5332 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005333
5334 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5335 # command as histograms/pretty_print.py now needs a relative path argument
5336 # after splitting the histograms into multiple directories.
5337 # For example, in tools/metrics/ukm, pretty-print could be run using:
5338 # $ python pretty_print.py
5339 # But in tools/metrics/histogrmas, pretty-print should be run with an
5340 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005341 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005342 # $ python pretty_print.py enums.xml
5343
5344 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5345 # version of histograms/pretty_print.py is released.
5346 filepath_required = os.path.exists(
5347 os.path.join(tool_dir, 'validate_prefix.py'))
5348
Weilun Shib92c4b72020-08-27 17:45:11 +00005349 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5350 or diff_xml.endswith('histogram_suffixes_list.xml')
5351 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005352 cmd.append(diff_xml)
5353
Ilya Shermane081cbe2017-08-15 17:51:04 -07005354 if opts.dry_run or opts.diff:
5355 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005356
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005357 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5358 # `shell` param and instead replace `'vpython'` with
5359 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005360 stdout = RunCommand(cmd,
5361 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005362 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005363 if opts.diff:
5364 sys.stdout.write(stdout)
5365 if opts.dry_run and stdout:
5366 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005367
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005368 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005369
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005370
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005371def GetDiffXMLs(diff_files):
5372 return [
5373 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5374 ]
5375
5376
5377def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005378 metrics_xml_dirs = [
5379 os.path.join('tools', 'metrics', 'actions'),
5380 os.path.join('tools', 'metrics', 'histograms'),
5381 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005382 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005383 os.path.join('tools', 'metrics', 'ukm'),
5384 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005385 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005386 if diff_xml.startswith(xml_dir):
5387 return xml_dir
5388 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005389
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005390
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005391@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005392@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005393def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005394 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005395 _, args = parser.parse_args(args)
5396
5397 if len(args) != 1:
5398 parser.print_help()
5399 return 1
5400
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005401 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005402 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005403 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005404
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005405 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005406
Edward Lemur52969c92020-02-06 18:15:28 +00005407 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005408 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005409 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005410
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005411 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005412 for key, issue in [x.split() for x in output.splitlines()]:
5413 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005414 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005415
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005416 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005417 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005418 return 1
5419 if len(branches) == 1:
5420 RunGit(['checkout', branches[0]])
5421 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005422 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005423 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005424 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005425 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005426 try:
5427 RunGit(['checkout', branches[int(which)]])
5428 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005429 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005430 return 1
5431
5432 return 0
5433
5434
maruel@chromium.org29404b52014-09-08 22:58:00 +00005435def CMDlol(parser, args):
5436 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005437 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005438 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5439 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5440 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005441 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005442 return 0
5443
5444
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005445class OptionParser(optparse.OptionParser):
5446 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005447
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005448 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005449 optparse.OptionParser.__init__(
5450 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005451 self.add_option(
5452 '-v', '--verbose', action='count', default=0,
5453 help='Use 2 times for more debugging info')
5454
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005455 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005456 try:
5457 return self._parse_args(args)
5458 finally:
5459 # Regardless of success or failure of args parsing, we want to report
5460 # metrics, but only after logging has been initialized (if parsing
5461 # succeeded).
5462 global settings
5463 settings = Settings()
5464
Edward Lesmes9c349062021-05-06 20:02:39 +00005465 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005466 # GetViewVCUrl ultimately calls logging method.
5467 project_url = settings.GetViewVCUrl().strip('/+')
5468 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5469 metrics.collector.add('project_urls', [project_url])
5470
5471 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005472 # Create an optparse.Values object that will store only the actual passed
5473 # options, without the defaults.
5474 actual_options = optparse.Values()
5475 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5476 # Create an optparse.Values object with the default options.
5477 options = optparse.Values(self.get_default_values().__dict__)
5478 # Update it with the options passed by the user.
5479 options._update_careful(actual_options.__dict__)
5480 # Store the options passed by the user in an _actual_options attribute.
5481 # We store only the keys, and not the values, since the values can contain
5482 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005483 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005484
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005485 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005486 logging.basicConfig(
5487 level=levels[min(options.verbose, len(levels) - 1)],
5488 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5489 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005490
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005491 return options, args
5492
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005493
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005494def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005495 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005496 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005497 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005498 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005499
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005500 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005501 dispatcher = subcommand.CommandDispatcher(__name__)
5502 try:
5503 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005504 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005505 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005506 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005507 if e.code != 500:
5508 raise
5509 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005510 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005511 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005512 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005513
5514
5515if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005516 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5517 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005518 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005519 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005520 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005521 sys.exit(main(sys.argv[1:]))