blob: a51f8783c292a1c52300f0ef7a5db70224e82d7a [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
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
Josip Sokcevic7958e302023-03-01 23:02:21 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +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
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Joanna Wang892f2ce2023-03-14 21:39:47 +0000165# Environment variable to indicate if user is participating in the stcked
166# changes dogfood.
167DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
168
169
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000170class GitPushError(Exception):
171 pass
172
173
Christopher Lamf732cd52017-01-24 12:40:11 +1100174def DieWithError(message, change_desc=None):
175 if change_desc:
176 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000177 print('\n ** Content of CL description **\n' +
178 '='*72 + '\n' +
179 change_desc.description + '\n' +
180 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100181
vapiera7fbd5a2016-06-16 09:17:49 -0700182 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183 sys.exit(1)
184
185
Christopher Lamf732cd52017-01-24 12:40:11 +1100186def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000187 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000188 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000189 with open(backup_path, 'wb') as backup_file:
190 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100191
192
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000193def GetNoGitPagerEnv():
194 env = os.environ.copy()
195 # 'cat' is a magical git string that disables pagers on all platforms.
196 env['GIT_PAGER'] = 'cat'
197 return env
198
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000199
bsep@chromium.org627d9002016-04-29 00:00:52 +0000200def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000201 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
203 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000204 except subprocess2.CalledProcessError as e:
205 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000206 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000207 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
208 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000209 out = e.stdout.decode('utf-8', 'replace')
210 if e.stderr:
211 out += e.stderr.decode('utf-8', 'replace')
212 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000213
214
215def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000216 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000218
219
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000220def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000221 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700222 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000223 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700224 else:
225 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000226 try:
tandrii5d48c322016-08-18 16:19:37 -0700227 (out, _), code = subprocess2.communicate(['git'] + args,
228 env=GetNoGitPagerEnv(),
229 stdout=subprocess2.PIPE,
230 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000231 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700232 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900233 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000234 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000235
236
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000237def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000238 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000239 return RunGitWithCode(args, suppress_stderr=True)[1]
240
241
tandrii2a16b952016-10-19 07:09:44 -0700242def time_sleep(seconds):
243 # Use this so that it can be mocked in tests without interfering with python
244 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700245 return time.sleep(seconds)
246
247
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000248def time_time():
249 # Use this so that it can be mocked in tests without interfering with python
250 # system machinery.
251 return time.time()
252
253
Edward Lemur1b52d872019-05-09 21:12:12 +0000254def datetime_now():
255 # Use this so that it can be mocked in tests without interfering with python
256 # system machinery.
257 return datetime.datetime.now()
258
259
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260def confirm_or_exit(prefix='', action='confirm'):
261 """Asks user to press enter to continue or press Ctrl+C to abort."""
262 if not prefix or prefix.endswith('\n'):
263 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100264 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265 mid = ' Press'
266 elif prefix.endswith(' '):
267 mid = 'press'
268 else:
269 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000270 gclient_utils.AskForData(
271 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272
273
274def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000275 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000276 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100277 while True:
278 if 'yes'.startswith(result):
279 return True
280 if 'no'.startswith(result):
281 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000282 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100283
284
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000286 prop_list = getattr(options, 'properties', [])
287 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000288 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000289 try:
290 properties[key] = json.loads(val)
291 except ValueError:
292 pass # If a value couldn't be evaluated, treat it as a string.
293 return properties
294
295
Edward Lemur4c707a22019-09-24 21:13:43 +0000296def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000297 """Calls a buildbucket v2 method and returns the parsed json response."""
298 headers = {
299 'Accept': 'application/json',
300 'Content-Type': 'application/json',
301 }
302 request = json.dumps(request)
303 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
304
305 logging.info('POST %s with %s' % (url, request))
306
307 attempts = 1
308 time_to_sleep = 1
309 while True:
310 response, content = http.request(url, 'POST', body=request, headers=headers)
311 if response.status == 200:
312 return json.loads(content[4:])
313 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
314 msg = '%s error when calling POST %s with %s: %s' % (
315 response.status, url, request, content)
316 raise BuildbucketResponseException(msg)
317 logging.debug(
318 '%s error when calling POST %s with %s. '
319 'Sleeping for %d seconds and retrying...' % (
320 response.status, url, request, time_to_sleep))
321 time.sleep(time_to_sleep)
322 time_to_sleep *= 2
323 attempts += 1
324
325 assert False, 'unreachable'
326
327
Edward Lemur6215c792019-10-03 21:59:05 +0000328def _parse_bucket(raw_bucket):
329 legacy = True
330 project = bucket = None
331 if '/' in raw_bucket:
332 legacy = False
333 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000335 elif raw_bucket.startswith('luci.'):
336 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000338 elif '.' in raw_bucket:
339 project = raw_bucket.split('.')[0]
340 bucket = raw_bucket
341 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000342 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000343 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
344 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000345
346
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000347def _canonical_git_googlesource_host(host):
348 """Normalizes Gerrit hosts (with '-review') to Git host."""
349 assert host.endswith(_GOOGLESOURCE)
350 # Prefix doesn't include '.' at the end.
351 prefix = host[:-(1 + len(_GOOGLESOURCE))]
352 if prefix.endswith('-review'):
353 prefix = prefix[:-len('-review')]
354 return prefix + '.' + _GOOGLESOURCE
355
356
357def _canonical_gerrit_googlesource_host(host):
358 git_host = _canonical_git_googlesource_host(host)
359 prefix = git_host.split('.', 1)[0]
360 return prefix + '-review.' + _GOOGLESOURCE
361
362
363def _get_counterpart_host(host):
364 assert host.endswith(_GOOGLESOURCE)
365 git = _canonical_git_googlesource_host(host)
366 gerrit = _canonical_gerrit_googlesource_host(git)
367 return git if gerrit == host else gerrit
368
369
Quinten Yearsley777660f2020-03-04 23:37:06 +0000370def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000371 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
373 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000374 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000375 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700376 options: Command-line options.
377 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000378 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000379 for project, bucket, builder in jobs:
380 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 print('To see results here, run: git cl try-results')
382 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700383
Quinten Yearsley777660f2020-03-04 23:37:06 +0000384 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 if not requests:
386 return
387
Edward Lemur5b929a42019-10-21 17:57:39 +0000388 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000389 http.force_exception_to_status_code = True
390
391 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000392 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
393 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000394
395 errors = [
396 ' ' + response['error']['message']
397 for response in batch_response.get('responses', [])
398 if 'error' in response
399 ]
400 if errors:
401 raise BuildbucketResponseException(
402 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
403
404
Quinten Yearsley777660f2020-03-04 23:37:06 +0000405def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000406 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000407 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000408 shared_properties = {
409 'category': options.ensure_value('category', 'git_cl_try')
410 }
411 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000412 shared_properties['clobber'] = True
413 shared_properties.update(_get_properties_from_options(options) or {})
414
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000415 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 shared_tags.append({'key': 'retry_failed',
418 'value': '1'})
419
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000421 for (project, bucket, builder) in jobs:
422 properties = shared_properties.copy()
423 if 'presubmit' in builder.lower():
424 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426 requests.append({
427 'scheduleBuild': {
428 'requestId': str(uuid.uuid4()),
429 'builder': {
430 'project': getattr(options, 'project', None) or project,
431 'bucket': bucket,
432 'builder': builder,
433 },
434 'gerritChanges': gerrit_changes,
435 'properties': properties,
436 'tags': [
437 {'key': 'builder', 'value': builder},
438 ] + shared_tags,
439 }
440 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000442 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000444 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000446 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000447 'id': options.revision,
448 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000449 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000450
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000451 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000452
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000453
Quinten Yearsley777660f2020-03-04 23:37:06 +0000454def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000456
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000457 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000458 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 request = {
461 'predicate': {
462 'gerritChanges': [changelist.GetGerritChange(patchset)],
463 },
464 'fields': ','.join('builds.*.' + field for field in fields),
465 }
tandrii221ab252016-10-06 08:12:04 -0700466
Edward Lemur5b929a42019-10-21 17:57:39 +0000467 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000468 if authenticator.has_cached_credentials():
469 http = authenticator.authorize(httplib2.Http())
470 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700471 print('Warning: Some results might be missing because %s' %
472 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000473 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 http.force_exception_to_status_code = True
476
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000477 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
478 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479
Edward Lemur45768512020-03-02 19:03:14 +0000480
Edward Lemur5b929a42019-10-21 17:57:39 +0000481def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 """Fetches builds from the latest patchset that has builds (within
483 the last few patchsets).
484
485 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 changelist (Changelist): The CL to fetch builds for
487 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000488 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
489 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000491 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
492 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """
494 assert buildbucket_host
495 assert changelist.GetIssue(), 'CL must be uploaded first'
496 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000497 if latest_patchset is None:
498 assert changelist.GetMostRecentPatchset()
499 ps = changelist.GetMostRecentPatchset()
500 else:
501 assert latest_patchset > 0, latest_patchset
502 ps = latest_patchset
503
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 min_ps = max(1, ps - 5)
505 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000506 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 if len(builds):
508 return builds, ps
509 ps -= 1
510 return [], 0
511
512
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000513def _filter_failed_for_retry(all_builds):
514 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515
516 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000518 i.e. a list of buildbucket.v2.Builds which includes status and builder
519 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520
521 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000522 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 """
Edward Lemur45768512020-03-02 19:03:14 +0000525 grouped = {}
526 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000527 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000528 key = (builder['project'], builder['bucket'], builder['builder'])
529 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530
Edward Lemur45768512020-03-02 19:03:14 +0000531 jobs = []
532 for (project, bucket, builder), builds in grouped.items():
533 if 'triggered' in builder:
534 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
535 'from a parent. Please schedule a manual job for the parent '
536 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537 continue
538 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
539 # Don't retry if any are running.
540 continue
Edward Lemur45768512020-03-02 19:03:14 +0000541 # If builder had several builds, retry only if the last one failed.
542 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
543 # build, but in case of retrying failed jobs retrying a flaky one makes
544 # sense.
545 builds = sorted(builds, key=lambda b: b['createTime'])
546 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
547 continue
548 # Don't retry experimental build previously triggered by CQ.
549 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
550 for t in builds[-1]['tags']):
551 continue
552 jobs.append((project, bucket, builder))
553
554 # Sort the jobs to make testing easier.
555 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556
557
Quinten Yearsley777660f2020-03-04 23:37:06 +0000558def _print_tryjobs(options, builds):
559 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 return
563
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 longest_builder = max(len(b['builder']['builder']) for b in builds)
565 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
568 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 builds_by_status = {}
571 for b in builds:
572 builds_by_status.setdefault(b['status'], []).append({
573 'id': b['id'],
574 'name': name_fmt.format(
575 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
576 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 sort_key = lambda b: (b['name'], b['id'])
579
580 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 if not builds:
583 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000586 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 else:
589 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 print(colorize(title))
592 for b in sorted(builds, key=sort_key):
593 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594
595 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 print_builds(
597 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
598 print_builds(
599 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
600 color=Fore.MAGENTA)
601 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
602 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
603 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000604 print_builds('Started:', builds_by_status.pop('STARTED', []),
605 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000606 print_builds(
607 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 print_builds(
610 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000611 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612
613
Aiden Bennerc08566e2018-10-03 17:52:42 +0000614def _ComputeDiffLineRanges(files, upstream_commit):
615 """Gets the changed line ranges for each file since upstream_commit.
616
617 Parses a git diff on provided files and returns a dict that maps a file name
618 to an ordered list of range tuples in the form (start_line, count).
619 Ranges are in the same format as a git diff.
620 """
621 # If files is empty then diff_output will be a full diff.
622 if len(files) == 0:
623 return {}
624
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000625 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000626 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 diff_output = RunGit(diff_cmd)
628
629 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
630 # 2 capture groups
631 # 0 == fname of diff file
632 # 1 == 'diff_start,diff_count' or 'diff_start'
633 # will match each of
634 # diff --git a/foo.foo b/foo.py
635 # @@ -12,2 +14,3 @@
636 # @@ -12,2 +17 @@
637 # running re.findall on the above string with pattern will give
638 # [('foo.py', ''), ('', '14,3'), ('', '17')]
639
640 curr_file = None
641 line_diffs = {}
642 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
643 if match[0] != '':
644 # Will match the second filename in diff --git a/a.py b/b.py.
645 curr_file = match[0]
646 line_diffs[curr_file] = []
647 else:
648 # Matches +14,3
649 if ',' in match[1]:
650 diff_start, diff_count = match[1].split(',')
651 else:
652 # Single line changes are of the form +12 instead of +12,1.
653 diff_start = match[1]
654 diff_count = 1
655
656 diff_start = int(diff_start)
657 diff_count = int(diff_count)
658
659 # If diff_count == 0 this is a removal we can ignore.
660 line_diffs[curr_file].append((diff_start, diff_count))
661
662 return line_diffs
663
664
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 """Checks if a yapf file is in any parent directory of fpath until top_dir.
667
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000669 is found returns None. Uses yapf_config_cache as a cache for previously found
670 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 # Return result if we've already computed it.
674 if fpath in yapf_config_cache:
675 return yapf_config_cache[fpath]
676
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 parent_dir = os.path.dirname(fpath)
678 if os.path.isfile(fpath):
679 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 # Otherwise fpath is a directory
682 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
683 if os.path.isfile(yapf_file):
684 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000685 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # If we're at the top level directory, or if we're at root
687 # there is no provided style.
688 ret = None
689 else:
690 # Otherwise recurse on the current directory.
691 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 yapf_config_cache[fpath] = ret
693 return ret
694
695
Brian Sheedyb4307d52019-12-02 19:18:17 +0000696def _GetYapfIgnorePatterns(top_dir):
697 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000698
699 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
700 but this functionality appears to break when explicitly passing files to
701 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000702 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703 the .yapfignore file should be in the directory that yapf is invoked from,
704 which we assume to be the top level directory in this case.
705
706 Args:
707 top_dir: The top level directory for the repository being formatted.
708
709 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000710 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711 """
712 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000714 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716
Anthony Politoc64e3902021-04-30 21:55:25 +0000717 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
718 stripped_line = line.strip()
719 # Comments and blank lines should be ignored.
720 if stripped_line.startswith('#') or stripped_line == '':
721 continue
722 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 return ignore_patterns
724
725
726def _FilterYapfIgnoredFiles(filepaths, patterns):
727 """Filters out any filepaths that match any of the given patterns.
728
729 Args:
730 filepaths: An iterable of strings containing filepaths to filter.
731 patterns: An iterable of strings containing fnmatch patterns to filter on.
732
733 Returns:
734 A list of strings containing all the elements of |filepaths| that did not
735 match any of the patterns in |patterns|.
736 """
737 # Not inlined so that tests can use the same implementation.
738 return [f for f in filepaths
739 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000740
741
Aaron Gable13101a62018-02-09 13:20:41 -0800742def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000743 """Prints statistics about the change to the user."""
744 # --no-ext-diff is broken in some versions of Git, so try to work around
745 # this by overriding the environment (but there is still a problem if the
746 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000747 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 if 'GIT_EXTERNAL_DIFF' in env:
749 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800752 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000753 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754
755
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000756class BuildbucketResponseException(Exception):
757 pass
758
759
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000760class Settings(object):
761 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000763 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 self.tree_status_url = None
765 self.viewvc_url = None
766 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000767 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000768 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000769 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000770 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000771 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000772 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773
Edward Lemur26964072020-02-19 19:18:51 +0000774 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000776 if self.updated:
777 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000778
Edward Lemur26964072020-02-19 19:18:51 +0000779 # The only value that actually changes the behavior is
780 # autoupdate = "false". Everything else means "true".
781 autoupdate = (
782 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
783
784 cr_settings_file = FindCodereviewSettingsFile()
785 if autoupdate != 'false' and cr_settings_file:
786 LoadCodereviewSettingsFromFile(cr_settings_file)
787 cr_settings_file.close()
788
789 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000791 @staticmethod
792 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000793 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 if self.root is None:
797 self.root = os.path.abspath(self.GetRelativeRoot())
798 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetTreeStatusUrl(self, error_ok=False):
801 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
803 if self.tree_status_url is None and not error_ok:
804 DieWithError(
805 'You must configure your tree status URL by running '
806 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 return self.tree_status_url
808
809 def GetViewVCUrl(self):
810 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000811 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.viewvc_url
813
rmistry@google.com90752582014-01-14 21:04:50 +0000814 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000815 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000816
rmistry@google.com5626a922015-02-26 14:03:30 +0000817 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000819 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000820 return run_post_upload_hook == "True"
821
Joanna Wangc8f23e22023-01-19 21:18:10 +0000822 def GetDefaultCCList(self):
823 return self._GetConfig('rietveld.cc')
824
Dirk Pranke6f0df682021-06-25 00:42:33 +0000825 def GetUsePython3(self):
826 return self._GetConfig('rietveld.use-python3')
827
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000828 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000829 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000830 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000831 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
832 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000833 # Default is squash now (http://crbug.com/611892#c23).
834 self.squash_gerrit_uploads = self._GetConfig(
835 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 return self.squash_gerrit_uploads
837
Edward Lesmes4de54132020-05-05 19:41:33 +0000838 def GetSquashGerritUploadsOverride(self):
839 """Return True or False if codereview.settings should be overridden.
840
841 Returns None if no override has been defined.
842 """
843 # See also http://crbug.com/611892#c23
844 result = self._GetConfig('gerrit.override-squash-uploads').lower()
845 if result == 'true':
846 return True
847 if result == 'false':
848 return False
849 return None
850
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000851 def GetIsGerrit(self):
852 """Return True if gerrit.host is set."""
853 if self.is_gerrit is None:
854 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
855 return self.is_gerrit
856
tandrii@chromium.org28253532016-04-14 13:46:56 +0000857 def GetGerritSkipEnsureAuthenticated(self):
858 """Return True if EnsureAuthenticated should not be done for Gerrit
859 uploads."""
860 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000861 self.gerrit_skip_ensure_authenticated = self._GetConfig(
862 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000863 return self.gerrit_skip_ensure_authenticated
864
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000865 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000866 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000868 # Git requires single quotes for paths with spaces. We need to replace
869 # them with double quotes for Windows to treat such paths as a single
870 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000871 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 return self.git_editor or None
873
thestig@chromium.org44202a22014-03-11 19:22:18 +0000874 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000875 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876
877 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000878 return self._GetConfig(
879 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000880
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000881 def GetFormatFullByDefault(self):
882 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000883 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000884 result = (
885 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
886 error_ok=True).strip())
887 self.format_full_by_default = (result == 'true')
888 return self.format_full_by_default
889
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000890 def IsStatusCommitOrderByDate(self):
891 if self.is_status_commit_order_by_date is None:
892 result = (RunGit(['config', '--bool', 'cl.date-order'],
893 error_ok=True).strip())
894 self.is_status_commit_order_by_date = (result == 'true')
895 return self.is_status_commit_order_by_date
896
Edward Lemur26964072020-02-19 19:18:51 +0000897 def _GetConfig(self, key, default=''):
898 self._LazyUpdateIfNeeded()
899 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000900
901
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000902class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000903 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000904 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000905 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906 DRY_RUN = 'dry_run'
907 COMMIT = 'commit'
908
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000909 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000910
911
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000912class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000913 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000914 self.issue = issue
915 self.patchset = patchset
916 self.hostname = hostname
917
918 @property
919 def valid(self):
920 return self.issue is not None
921
922
Edward Lemurf38bc172019-09-03 21:02:13 +0000923def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
925 fail_result = _ParsedIssueNumberArgument()
926
Edward Lemur678a6842019-10-03 22:25:05 +0000927 if isinstance(arg, int):
928 return _ParsedIssueNumberArgument(issue=arg)
929 if not isinstance(arg, basestring):
930 return fail_result
931
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000933 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000936 if not url.startswith('http'):
937 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000938 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
939 if url.startswith(short_url):
940 url = gerrit_url + url[len(short_url):]
941 break
942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000944 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000945 except ValueError:
946 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200947
Alex Turner30ae6372022-01-04 02:32:52 +0000948 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
949 # URL.
950 if not arg.startswith('http') and '.' not in parsed_url.netloc:
951 return fail_result
952
Edward Lemur678a6842019-10-03 22:25:05 +0000953 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
954 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
955 # Short urls like https://domain/<issue_number> can be used, but don't allow
956 # specifying the patchset (you'd 404), but we allow that here.
957 if parsed_url.path == '/':
958 part = parsed_url.fragment
959 else:
960 part = parsed_url.path
961
962 match = re.match(
963 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
964 if not match:
965 return fail_result
966
967 issue = int(match.group('issue'))
968 patchset = match.group('patchset')
969 return _ParsedIssueNumberArgument(
970 issue=issue,
971 patchset=int(patchset) if patchset else None,
972 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000973
974
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975def _create_description_from_log(args):
976 """Pulls out the commit log to use as a base for the CL description."""
977 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000978 if len(args) == 1 and args[0] == None:
979 # Handle the case where None is passed as the branch.
980 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000981 if len(args) == 1 and not args[0].endswith('.'):
982 log_args = [args[0] + '..']
983 elif len(args) == 1 and args[0].endswith('...'):
984 log_args = [args[0][:-1]]
985 elif len(args) == 2:
986 log_args = [args[0] + '..' + args[1]]
987 else:
988 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000989 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000990
991
Aaron Gablea45ee112016-11-22 15:14:38 -0800992class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700993 def __init__(self, issue, url):
994 self.issue = issue
995 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700997
998 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800999 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001000 self.issue, self.url)
1001
1002
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001003_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001004 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005 # TODO(tandrii): these two aren't known in Gerrit.
1006 'approval', 'disapproval'])
1007
1008
Joanna Wang6215dd02023-02-07 15:58:03 +00001009# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001010_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001011 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001012 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001013])
1014
1015
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001016class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 """Changelist works with one changelist in local branch.
1018
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001019 Notes:
1020 * Not safe for concurrent multi-{thread,process} use.
1021 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001022 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001023 """
1024
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001025 def __init__(self,
1026 branchref=None,
1027 issue=None,
1028 codereview_host=None,
1029 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """Create a new ChangeList instance.
1031
Edward Lemurf38bc172019-09-03 21:02:13 +00001032 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001033 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001035 global settings
1036 if not settings:
1037 # Happens when git_cl.py is used as a utility library.
1038 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001039
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.branchref = branchref
1041 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001042 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001043 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 else:
1045 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001046 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001048 self.lookedup_issue = False
1049 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001051 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001053 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001054 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001055 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001056 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001057
Edward Lemur125d60a2019-09-13 18:25:41 +00001058 # Lazily cached values.
1059 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1060 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001061 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001062 # Map from change number (issue) to its detail cache.
1063 self._detail_cache = {}
1064
1065 if codereview_host is not None:
1066 assert not codereview_host.startswith('https://'), codereview_host
1067 self._gerrit_host = codereview_host
1068 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069
Edward Lesmese1576912021-02-16 21:53:34 +00001070 @property
1071 def owners_client(self):
1072 if self._owners_client is None:
1073 remote, remote_branch = self.GetRemoteBranch()
1074 branch = GetTargetRef(remote, remote_branch, None)
1075 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001076 host=self.GetGerritHost(),
1077 project=self.GetGerritProject(),
1078 branch=branch)
1079 return self._owners_client
1080
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001081 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001082 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001083
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001084 The return value is a string suitable for passing to git cl with the --cc
1085 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001086 """
1087 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001088 base_cc = settings.GetDefaultCCList()
1089 more_cc = ','.join(self.more_cc)
1090 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001091 return self.cc
1092
Daniel Cheng7227d212017-11-17 08:12:37 -08001093 def ExtendCC(self, more_cc):
1094 """Extends the list of users to cc on this CL based on the changed files."""
1095 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001097 def GetCommitDate(self):
1098 """Returns the commit date as provided in the constructor"""
1099 return self.commit_date
1100
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001102 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001104 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001105 if not branchref:
1106 return None
1107 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001108 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 return self.branch
1110
1111 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001112 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 self.GetBranch() # Poke the lazy loader.
1114 return self.branchref
1115
Edward Lemur85153282020-02-14 22:06:29 +00001116 def _GitGetBranchConfigValue(self, key, default=None):
1117 return scm.GIT.GetBranchConfig(
1118 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001119
Edward Lemur85153282020-02-14 22:06:29 +00001120 def _GitSetBranchConfigValue(self, key, value):
1121 action = 'set %s to %r' % (key, value)
1122 if not value:
1123 action = 'unset %s' % key
1124 assert self.GetBranch(), 'a branch is needed to ' + action
1125 return scm.GIT.SetBranchConfig(
1126 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001127
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001128 @staticmethod
1129 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001130 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001131 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001133 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1134 settings.GetRoot(), branch)
1135 if not remote or not upstream_branch:
1136 DieWithError(
1137 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001138 'Verify this branch is set up to track another \n'
1139 '(via the --track argument to "git checkout -b ..."). \n'
1140 'or pass complete "git diff"-style arguments if supported, like\n'
1141 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142
1143 return remote, upstream_branch
1144
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001145 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001146 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001147 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001148 DieWithError('The upstream for the current branch (%s) does not exist '
1149 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001150 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001151 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 def GetUpstreamBranch(self):
1154 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001156 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001157 upstream_branch = upstream_branch.replace('refs/heads/',
1158 'refs/remotes/%s/' % remote)
1159 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1160 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161 self.upstream_branch = upstream_branch
1162 return self.upstream_branch
1163
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001164 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001165 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 remote, branch = None, self.GetBranch()
1167 seen_branches = set()
1168 while branch not in seen_branches:
1169 seen_branches.add(branch)
1170 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001171 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 if remote != '.' or branch.startswith('refs/remotes'):
1173 break
1174 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 remotes = RunGit(['remote'], error_ok=True).split()
1176 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001177 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001180 logging.warning('Could not determine which remote this change is '
1181 'associated with, so defaulting to "%s".' %
1182 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001183 else:
Gavin Make6a62332020-12-04 21:57:10 +00001184 logging.warning('Could not determine which remote this change is '
1185 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 branch = 'HEAD'
1187 if branch.startswith('refs/remotes'):
1188 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001189 elif branch.startswith('refs/branch-heads/'):
1190 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001191 else:
1192 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001193 return self._remote
1194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001195 def GetRemoteUrl(self):
1196 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1197
1198 Returns None if there is no remote.
1199 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001200 is_cached, value = self._cached_remote_url
1201 if is_cached:
1202 return value
1203
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001204 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001205 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001206
Edward Lemur298f2cf2019-02-22 21:40:39 +00001207 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001208 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 if host:
1210 self._cached_remote_url = (True, url)
1211 return url
1212
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001213 # If it cannot be parsed as an url, assume it is a local directory,
1214 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001215 logging.warning('"%s" doesn\'t appear to point to a git host. '
1216 'Interpreting it as a local directory.', url)
1217 if not os.path.isdir(url):
1218 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001219 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1220 'but it doesn\'t exist.',
1221 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 return None
1223
1224 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001225 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001226
Edward Lemur79d4f992019-11-11 23:49:02 +00001227 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001228 if not host:
1229 logging.error(
1230 'Remote "%(remote)s" for branch "%(branch)s" points to '
1231 '"%(cache_path)s", but it is misconfigured.\n'
1232 '"%(cache_path)s" must be a git repo and must have a remote named '
1233 '"%(remote)s" pointing to the git host.', {
1234 'remote': remote,
1235 'cache_path': cache_path,
1236 'branch': self.GetBranch()})
1237 return None
1238
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001239 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001240 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001242 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001243 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001244 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001245 if self.GetBranch():
1246 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001247 if self.issue is not None:
1248 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001249 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 return self.issue
1251
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001252 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001254 issue = self.GetIssue()
1255 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001256 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001257 server = self.GetCodereviewServer()
1258 if short:
1259 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1260 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261
Dirk Pranke6f0df682021-06-25 00:42:33 +00001262 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001263 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001264
Edward Lemur6c6827c2020-02-06 21:15:18 +00001265 def FetchDescription(self, pretty=False):
1266 assert self.GetIssue(), 'issue is required to query Gerrit'
1267
Edward Lemur9aa1a962020-02-25 00:58:38 +00001268 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001269 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1270 current_rev = data['current_revision']
1271 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272
1273 if not pretty:
1274 return self.description
1275
1276 # Set width to 72 columns + 2 space indent.
1277 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1278 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1279 lines = self.description.splitlines()
1280 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001281
1282 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001283 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001284 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001285 if self.GetBranch():
1286 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001287 if self.patchset is not None:
1288 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001289 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 return self.patchset
1291
Edward Lemur9aa1a962020-02-25 00:58:38 +00001292 def GetAuthor(self):
1293 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001296 """Set this branch's patchset. If patchset=0, clears the patchset."""
1297 assert self.GetBranch()
1298 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001300 else:
1301 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001302 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001304 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001305 """Set this branch's issue. If issue isn't given, clears the issue."""
1306 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001308 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001310 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001311 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001312 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001313 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001314 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 else:
tandrii5d48c322016-08-18 16:19:37 -07001316 # Reset all of these just to be clean.
1317 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001318 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001319 ISSUE_CONFIG_KEY,
1320 PATCHSET_CONFIG_KEY,
1321 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001322 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001323 ]
tandrii5d48c322016-08-18 16:19:37 -07001324 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001325 try:
1326 self._GitSetBranchConfigValue(prop, None)
1327 except subprocess2.CalledProcessError:
1328 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001329 msg = RunGit(['log', '-1', '--format=%B']).strip()
1330 if msg and git_footers.get_footer_change_id(msg):
1331 print('WARNING: The change patched into this branch has a Change-Id. '
1332 'Removing it.')
1333 RunGit(['commit', '--amend', '-m',
1334 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001335 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001336 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001337 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001338
Joanna Wangb46232e2023-01-21 01:58:46 +00001339 def GetAffectedFiles(self, upstream, end_commit=None):
1340 # type: (str, Optional[str]) -> Sequence[str]
1341 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001342 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001343 return [
1344 f for _, f in scm.GIT.CaptureStatus(
1345 settings.GetRoot(), upstream, end_commit=end_commit)
1346 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001347 except subprocess2.CalledProcessError:
1348 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001349 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001350 'This branch probably doesn\'t exist anymore. To reset the\n'
1351 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001352 ' git branch --set-upstream-to origin/main %s\n'
1353 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001354 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001355
dsansomee2d6fd92016-09-08 00:10:47 -07001356 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001357 assert self.GetIssue(), 'issue is required to update description'
1358
1359 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001360 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001361 if not force:
1362 confirm_or_exit(
1363 'The description cannot be modified while the issue has a pending '
1364 'unpublished edit. Either publish the edit in the Gerrit web UI '
1365 'or delete it.\n\n', action='delete the unpublished edit')
1366
1367 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001368 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001369 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001370 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001371 description, notify='NONE')
1372
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001373 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001374
Edward Lemur75526302020-02-27 22:31:05 +00001375 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001376 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001377 '--root', settings.GetRoot(),
1378 '--upstream', upstream,
1379 ]
1380
1381 args.extend(['--verbose'] * verbose)
1382
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001383 remote, remote_branch = self.GetRemoteBranch()
1384 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001385 if settings.GetIsGerrit():
1386 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1387 args.extend(['--gerrit_project', self.GetGerritProject()])
1388 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001389
Edward Lemur99df04e2020-03-05 19:39:43 +00001390 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001391 issue = self.GetIssue()
1392 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001393 if author:
1394 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001395 if issue:
1396 args.extend(['--issue', str(issue)])
1397 if patchset:
1398 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001399
Edward Lemur75526302020-02-27 22:31:05 +00001400 return args
1401
Josip Sokcevic017544d2022-03-31 23:47:53 +00001402 def RunHook(self,
1403 committing,
1404 may_prompt,
1405 verbose,
1406 parallel,
1407 upstream,
1408 description,
1409 all_files,
1410 files=None,
1411 resultdb=False,
1412 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001413 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1414 args = self._GetCommonPresubmitArgs(verbose, upstream)
1415 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001416 if may_prompt:
1417 args.append('--may_prompt')
1418 if parallel:
1419 args.append('--parallel')
1420 if all_files:
1421 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001422 if files:
1423 args.extend(files.split(';'))
1424 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001425 if files or all_files:
1426 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001427
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001428 if resultdb and not realm:
1429 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1430 # it is not required to pass the realm flag
1431 print('Note: ResultDB reporting will NOT be performed because --realm'
1432 ' was not specified. To enable ResultDB, please run the command'
1433 ' again with the --realm argument to specify the LUCI realm.')
1434
Josip Sokcevic967cf672023-05-10 17:09:58 +00001435 py3_results = self._RunPresubmit(args,
1436 description,
1437 use_python3=True,
1438 resultdb=resultdb,
1439 realm=realm)
1440 if py3_results.get('skipped_presubmits', 1) == 0:
1441 print('No more presubmits to run - skipping Python 2 presubmits.')
1442 return py3_results
1443
1444 py2_results = self._RunPresubmit(args,
1445 description,
1446 use_python3=False,
1447 resultdb=resultdb,
1448 realm=realm)
1449 return self._MergePresubmitResults(py2_results, py3_results)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001450
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001451 def _RunPresubmit(self,
1452 args,
1453 description,
1454 use_python3,
1455 resultdb=None,
1456 realm=None):
1457 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1458 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001459 args = args[:]
1460 vpython = 'vpython3' if use_python3 else 'vpython'
1461
Edward Lemur227d5102020-02-25 23:45:35 +00001462 with gclient_utils.temporary_file() as description_file:
1463 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001464 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001465 args.extend(['--json_output', json_output])
1466 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001467 if self.GetUsePython3():
1468 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001469 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001470 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001471 if resultdb and realm:
1472 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001473
1474 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001475 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001476
Edward Lemur227d5102020-02-25 23:45:35 +00001477 metrics.collector.add_repeated('sub_commands', {
1478 'command': 'presubmit',
1479 'execution_time': time_time() - start,
1480 'exit_code': exit_code,
1481 })
1482
1483 if exit_code:
1484 sys.exit(exit_code)
1485
1486 json_results = gclient_utils.FileRead(json_output)
1487 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001488
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001489 def _MergePresubmitResults(self, py2_results, py3_results):
1490 return {
1491 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1492 py3_results.get('more_cc', []))),
1493 'errors': (
1494 py2_results.get('errors', []) + py3_results.get('errors', [])),
1495 'notifications': (
1496 py2_results.get('notifications', []) +
1497 py3_results.get('notifications', [])),
1498 'warnings': (
1499 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1500 }
1501
Brian Sheedy7326ca22022-11-02 18:36:17 +00001502 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001503 args = self._GetCommonPresubmitArgs(verbose, upstream)
1504 args.append('--post_upload')
1505
1506 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001507 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001508 args.extend(['--description_file', description_file])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001509 run_py2 = not py3_only and os.getenv('LUCI_OMIT_PYTHON2') != 'true'
1510 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001511 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1512 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1513 ['--use-python3'])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001514 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001515 p_py2.wait()
1516 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001517
Edward Lemur5a644f82020-03-18 16:44:57 +00001518 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001519 # type: (optparse.Values, Sequence[str], Sequence[str]
1520 # ) -> ChangeDescription
1521 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001522 if self.GetIssue():
1523 description = self.FetchDescription()
1524 elif options.message:
1525 description = options.message
1526 else:
1527 description = _create_description_from_log(git_diff_args)
1528 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001529 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001530
Edward Lemur5a644f82020-03-18 16:44:57 +00001531 bug = options.bug
1532 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001533 if not self.GetIssue():
1534 # Extract bug number from branch name, but only if issue is being created.
1535 # It must start with bug or fix, followed by _ or - and number.
1536 # Optionally, it may contain _ or - after number with arbitrary text.
1537 # Examples:
1538 # bug-123
1539 # bug_123
1540 # fix-123
1541 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001542 branch = self.GetBranch()
1543 if branch is not None:
1544 match = re.match(
1545 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1546 if not bug and not fixed and match:
1547 if match.group('type') == 'bug':
1548 bug = match.group('bugnum')
1549 else:
1550 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001551
1552 change_description = ChangeDescription(description, bug, fixed)
1553
Joanna Wang39811b12023-01-20 23:09:48 +00001554 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001555 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001556 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001557 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001558 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001559 missing_files = [
1560 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001561 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001563 owners = self.owners_client.SuggestOwners(
1564 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001565 assert isinstance(options.reviewers, list), options.reviewers
1566 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001567
Edward Lemur5a644f82020-03-18 16:44:57 +00001568 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001569 if options.reviewers:
1570 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001571
1572 return change_description
1573
Joanna Wanga1abbed2023-01-24 01:41:05 +00001574 def _GetTitleForUpload(self, options, multi_change_upload=False):
1575 # type: (optparse.Values, Optional[bool]) -> str
1576
1577 # Getting titles for multipl commits is not supported so we return the
1578 # default.
1579 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001580 return options.title
1581
1582 # On first upload, patchset title is always this string, while options.title
1583 # gets converted to first line of message.
1584 if not self.GetIssue():
1585 return 'Initial upload'
1586
1587 # When uploading subsequent patchsets, options.message is taken as the title
1588 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001589 if options.message:
1590 return options.message.strip()
1591
1592 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001593 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001594 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001595 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001596 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001597
1598 # Use the default title if the user confirms the default with a 'y'.
1599 if user_title.lower() == 'y':
1600 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001601 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001602
Joanna Wang562481d2023-01-26 21:57:14 +00001603 def _GetRefSpecOptions(self,
1604 options,
1605 change_desc,
1606 multi_change_upload=False,
1607 dogfood_path=False):
1608 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1609 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001610
1611 # Extra options that can be specified at push time. Doc:
1612 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1613 refspec_opts = []
1614
1615 # By default, new changes are started in WIP mode, and subsequent patchsets
1616 # don't send email. At any time, passing --send-mail or --send-email will
1617 # mark the change ready and send email for that particular patch.
1618 if options.send_mail:
1619 refspec_opts.append('ready')
1620 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001621 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001622 refspec_opts.append('wip')
1623 else:
1624 refspec_opts.append('notify=NONE')
1625
1626 # TODO(tandrii): options.message should be posted as a comment if
1627 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1628 # to do it.
1629
1630 # Set options.title in case user was prompted in _GetTitleForUpload and
1631 # _CMDUploadChange needs to be called again.
1632 options.title = self._GetTitleForUpload(
1633 options, multi_change_upload=multi_change_upload)
1634
1635 if options.title:
1636 # Punctuation and whitespace in |title| must be percent-encoded.
1637 refspec_opts.append('m=' +
1638 gerrit_util.PercentEncodeForGitRef(options.title))
1639
1640 if options.private:
1641 refspec_opts.append('private')
1642
1643 if options.topic:
1644 # Documentation on Gerrit topics is here:
1645 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1646 refspec_opts.append('topic=%s' % options.topic)
1647
1648 if options.enable_auto_submit:
1649 refspec_opts.append('l=Auto-Submit+1')
1650 if options.set_bot_commit:
1651 refspec_opts.append('l=Bot-Commit+1')
1652 if options.use_commit_queue:
1653 refspec_opts.append('l=Commit-Queue+2')
1654 elif options.cq_dry_run:
1655 refspec_opts.append('l=Commit-Queue+1')
1656 elif options.cq_quick_run:
1657 refspec_opts.append('l=Commit-Queue+1')
1658 refspec_opts.append('l=Quick-Run+1')
1659
1660 if change_desc.get_reviewers(tbr_only=True):
1661 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1662 self.GetGerritProject())
1663 refspec_opts.append('l=Code-Review+%s' % score)
1664
Joanna Wang40497912023-01-24 21:18:16 +00001665 # Gerrit sorts hashtags, so order is not important.
1666 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1667 # We check GetIssue because we only add hashtags from the
1668 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001669 # TODO(b/265929888): When we fully launch the new path:
1670 # 1) remove fetching hashtags from description alltogether
1671 # 2) Or use descrtiption hashtags for:
1672 # `not (self.GetIssue() and multi_change_upload)`
1673 # 3) Or enabled change description tags for multi and single changes
1674 # by adding them post `git push`.
1675 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001676 hashtags.update(change_desc.get_hash_tags())
1677 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001678
1679 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001680 # branch/change.
1681 return refspec_opts
1682
Joanna Wang05b60342023-03-29 20:25:57 +00001683 def PrepareSquashedCommit(self,
1684 options,
1685 parent,
1686 orig_parent,
1687 end_commit=None):
1688 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1689 """Create a squashed commit to upload.
1690
1691
1692 Args:
1693 parent: The commit to use as the parent for the new squashed.
1694 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1695 is part of the same original tree as end_commit, which does not
1696 contain squashed commits. This is used to create the change
1697 description for the new squashed commit with:
1698 `git log orig_parent..end_commit`.
1699 end_commit: The commit to use as the end of the new squashed commit.
1700 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001701
1702 if end_commit is None:
1703 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1704
Joanna Wang05b60342023-03-29 20:25:57 +00001705 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001706 end_commit)
1707 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1708 with gclient_utils.temporary_file() as desc_tempfile:
1709 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1710 commit_to_push = RunGit(
1711 ['commit-tree', latest_tree, '-p', parent, '-F',
1712 desc_tempfile]).strip()
1713
Joanna Wang7603f042023-03-01 22:17:36 +00001714 # Gerrit may or may not update fast enough to return the correct patchset
1715 # number after we push. Get the pre-upload patchset and increment later.
1716 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001717 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001718 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001719
Joanna Wang6215dd02023-02-07 15:58:03 +00001720 def PrepareCherryPickSquashedCommit(self, options, parent):
1721 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001722 """Create a commit cherry-picked on parent to push."""
1723
Joanna Wang6215dd02023-02-07 15:58:03 +00001724 # The `parent` is what we will cherry-pick on top of.
1725 # The `cherry_pick_base` is the beginning range of what
1726 # we are cherry-picking.
1727 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1728 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001729 self.branchref)
1730
1731 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1732 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1733 with gclient_utils.temporary_file() as desc_tempfile:
1734 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001735 commit_to_cp = RunGit([
1736 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1737 desc_tempfile
1738 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001739
Joanna Wang6215dd02023-02-07 15:58:03 +00001740 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001741 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1742 if ret:
1743 RunGit(['cherry-pick', '--abort'])
1744 RunGit(['checkout', '-q', self.branch])
1745 DieWithError('Could not cleanly cherry-pick')
1746
Joanna Wang6215dd02023-02-07 15:58:03 +00001747 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001748 RunGit(['checkout', '-q', self.branch])
1749
Joanna Wang7603f042023-03-01 22:17:36 +00001750 # Gerrit may or may not update fast enough to return the correct patchset
1751 # number after we push. Get the pre-upload patchset and increment later.
1752 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001753 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001754 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001755
Joanna Wangb46232e2023-01-21 01:58:46 +00001756 def _PrepareChange(self, options, parent, end_commit):
1757 # type: (optparse.Values, str, str) ->
1758 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1759 """Prepares the change to be uploaded."""
1760 self.EnsureCanUploadPatchset(options.force)
1761
1762 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1763 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1764 files)
1765
1766 watchlist = watchlists.Watchlists(settings.GetRoot())
1767 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1768 if not options.bypass_hooks:
1769 hook_results = self.RunHook(committing=False,
1770 may_prompt=not options.force,
1771 verbose=options.verbose,
1772 parallel=options.parallel,
1773 upstream=parent,
1774 description=change_desc.description,
1775 all_files=False)
1776 self.ExtendCC(hook_results['more_cc'])
1777
1778 # Update the change description and ensure we have a Change Id.
1779 if self.GetIssue():
1780 if options.edit_description:
1781 change_desc.prompt()
1782 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1783 change_id = change_detail['change_id']
1784 change_desc.ensure_change_id(change_id)
1785
Joanna Wangb46232e2023-01-21 01:58:46 +00001786 else: # No change issue. First time uploading
1787 if not options.force and not options.message_file:
1788 change_desc.prompt()
1789
1790 # Check if user added a change_id in the descripiton.
1791 change_ids = git_footers.get_footer_change_id(change_desc.description)
1792 if len(change_ids) == 1:
1793 change_id = change_ids[0]
1794 else:
1795 change_id = GenerateGerritChangeId(change_desc.description)
1796 change_desc.ensure_change_id(change_id)
1797
1798 if options.preserve_tryjobs:
1799 change_desc.set_preserve_tryjobs()
1800
1801 SaveDescriptionBackup(change_desc)
1802
1803 # Add ccs
1804 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001805 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001806 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001807 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001808 ccs = self.GetCCList().split(',')
1809 if len(ccs) > 100:
1810 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1811 'process/lsc/lsc_workflow.md')
1812 print('WARNING: This will auto-CC %s users.' % len(ccs))
1813 print('LSC may be more appropriate: %s' % lsc)
1814 print('You can also use the --no-autocc flag to disable auto-CC.')
1815 confirm_or_exit(action='continue')
1816
1817 # Add ccs from the --cc flag.
1818 if options.cc:
1819 ccs.extend(options.cc)
1820
1821 ccs = [email.strip() for email in ccs if email.strip()]
1822 if change_desc.get_cced():
1823 ccs.extend(change_desc.get_cced())
1824
1825 return change_desc.get_reviewers(), ccs, change_desc
1826
Joanna Wang40497912023-01-24 21:18:16 +00001827 def PostUploadUpdates(self, options, new_upload, change_number):
1828 # type: (optparse.Values, _NewUpload, change_number) -> None
1829 """Makes necessary post upload changes to the local and remote cl."""
1830 if not self.GetIssue():
1831 self.SetIssue(change_number)
1832
Joanna Wang7603f042023-03-01 22:17:36 +00001833 self.SetPatchset(new_upload.prev_patchset + 1)
1834
Joanna Wang40497912023-01-24 21:18:16 +00001835 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1836 new_upload.commit_to_push)
1837 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1838 new_upload.new_last_uploaded_commit)
1839
1840 if settings.GetRunPostUploadHook():
1841 self.RunPostUploadHook(options.verbose, new_upload.parent,
1842 new_upload.change_desc.description,
1843 options.no_python2_post_upload_hooks)
1844
1845 if new_upload.reviewers or new_upload.ccs:
1846 gerrit_util.AddReviewers(self.GetGerritHost(),
1847 self._GerritChangeIdentifier(),
1848 reviewers=new_upload.reviewers,
1849 ccs=new_upload.ccs,
1850 notify=bool(options.send_mail))
1851
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001852 def CMDUpload(self, options, git_diff_args, orig_args):
1853 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001854 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001855 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001856 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001857 else:
1858 if self.GetBranch() is None:
1859 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1860
1861 # Default to diffing against common ancestor of upstream branch
1862 base_branch = self.GetCommonAncestorWithUpstream()
1863 git_diff_args = [base_branch, 'HEAD']
1864
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001865 # Fast best-effort checks to abort before running potentially expensive
1866 # hooks if uploading is likely to fail anyway. Passing these checks does
1867 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001868 self.EnsureAuthenticated(force=options.force)
1869 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001870
1871 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001872 watchlist = watchlists.Watchlists(settings.GetRoot())
1873 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001874 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001875 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876
Edward Lemur5a644f82020-03-18 16:44:57 +00001877 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001878 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001879 hook_results = self.RunHook(committing=False,
1880 may_prompt=not options.force,
1881 verbose=options.verbose,
1882 parallel=options.parallel,
1883 upstream=base_branch,
1884 description=change_desc.description,
1885 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001886 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001887
Aaron Gable13101a62018-02-09 13:20:41 -08001888 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001889 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001890 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001891 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001892 if self.GetBranch() is not None:
1893 self._GitSetBranchConfigValue(
1894 LAST_UPLOAD_HASH_CONFIG_KEY,
1895 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001896 # Run post upload hooks, if specified.
1897 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001898 self.RunPostUploadHook(options.verbose, base_branch,
1899 change_desc.description,
1900 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001901
1902 # Upload all dependencies if specified.
1903 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001904 print()
1905 print('--dependencies has been specified.')
1906 print('All dependent local branches will be re-uploaded.')
1907 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001908 # Remove the dependencies flag from args so that we do not end up in a
1909 # loop.
1910 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001911 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001912 return ret
1913
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001914 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001915 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001916
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001917 Issue must have been already uploaded and known. Optionally allows for
1918 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001919 """
1920 assert new_state in _CQState.ALL_STATES
1921 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001922 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001923 vote_map = {
1924 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001925 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001926 _CQState.DRY_RUN: 1,
1927 _CQState.COMMIT: 2,
1928 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001929 if new_state == _CQState.QUICK_RUN:
1930 labels = {
1931 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1932 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1933 }
1934 else:
1935 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001936 notify = False if new_state == _CQState.DRY_RUN else None
1937 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001938 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001939 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001940 return 0
1941 except KeyboardInterrupt:
1942 raise
1943 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001944 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001945 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001946 ' * Your project has no CQ,\n'
1947 ' * You don\'t have permission to change the CQ state,\n'
1948 ' * There\'s a bug in this code (see stack trace below).\n'
1949 'Consider specifying which bots to trigger manually or asking your '
1950 'project owners for permissions or contacting Chrome Infra at:\n'
1951 'https://www.chromium.org/infra\n\n' %
1952 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001953 # Still raise exception so that stack trace is printed.
1954 raise
1955
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001956 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001957 # Lazy load of configs.
1958 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001959 if self._gerrit_host and '.' not in self._gerrit_host:
1960 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1961 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001962 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001963 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001964 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001965 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001966 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1967 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 return self._gerrit_host
1969
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001970 def _GetGitHost(self):
1971 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001972 remote_url = self.GetRemoteUrl()
1973 if not remote_url:
1974 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001975 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001976
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001977 def GetCodereviewServer(self):
1978 if not self._gerrit_server:
1979 # If we're on a branch then get the server potentially associated
1980 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001981 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001982 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001983 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001984 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001985 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001986 if not self._gerrit_server:
1987 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1988 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001989 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001990 parts[0] = parts[0] + '-review'
1991 self._gerrit_host = '.'.join(parts)
1992 self._gerrit_server = 'https://%s' % self._gerrit_host
1993 return self._gerrit_server
1994
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001995 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001996 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001997 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001998 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001999 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002000 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002001 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002002 if project.endswith('.git'):
2003 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002004 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2005 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2006 # gitiles/git-over-https protocol. E.g.,
2007 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2008 # as
2009 # https://chromium.googlesource.com/v8/v8
2010 if project.startswith('a/'):
2011 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002012 return project
2013
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002014 def _GerritChangeIdentifier(self):
2015 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2016
2017 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002018 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002019 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002020 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002021 if project:
2022 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2023 # Fall back on still unique, but less efficient change number.
2024 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002025
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002026 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002027 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002028 if settings.GetGerritSkipEnsureAuthenticated():
2029 # For projects with unusual authentication schemes.
2030 # See http://crbug.com/603378.
2031 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002032
2033 # Check presence of cookies only if using cookies-based auth method.
2034 cookie_auth = gerrit_util.Authenticator.get()
2035 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002036 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002037
Florian Mayerae510e82020-01-30 21:04:48 +00002038 remote_url = self.GetRemoteUrl()
2039 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002040 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002041 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002042 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2043 logging.warning(
2044 'Ignoring branch %(branch)s with non-https/sso remote '
2045 '%(remote)s', {
2046 'branch': self.branch,
2047 'remote': self.GetRemoteUrl()
2048 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002049 return
2050
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002051 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 self.GetCodereviewServer()
2053 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002054 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002055
2056 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2057 git_auth = cookie_auth.get_auth_header(git_host)
2058 if gerrit_auth and git_auth:
2059 if gerrit_auth == git_auth:
2060 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002061 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002062 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002063 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002064 ' %s\n'
2065 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002066 ' Consider running the following command:\n'
2067 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002068 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002069 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002070 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002071 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002072 cookie_auth.get_new_password_message(git_host)))
2073 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002074 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002075 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002076
2077 missing = (
2078 ([] if gerrit_auth else [self._gerrit_host]) +
2079 ([] if git_auth else [git_host]))
2080 DieWithError('Credentials for the following hosts are required:\n'
2081 ' %s\n'
2082 'These are read from %s (or legacy %s)\n'
2083 '%s' % (
2084 '\n '.join(missing),
2085 cookie_auth.get_gitcookies_path(),
2086 cookie_auth.get_netrc_path(),
2087 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002088
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002089 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002090 if not self.GetIssue():
2091 return
2092
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002093 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002094 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002095 DieWithError(
2096 'Change %s has been abandoned, new uploads are not allowed' %
2097 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002098 if status == 'MERGED':
2099 answer = gclient_utils.AskForData(
2100 'Change %s has been submitted, new uploads are not allowed. '
2101 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2102 ).lower()
2103 if answer not in ('y', ''):
2104 DieWithError('New uploads are not allowed.')
2105 self.SetIssue()
2106 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002107
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002108 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2109 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2110 # Apparently this check is not very important? Otherwise get_auth_email
2111 # could have been added to other implementations of Authenticator.
2112 cookies_auth = gerrit_util.Authenticator.get()
2113 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002114 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002115
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002116 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002117 if self.GetIssueOwner() == cookies_user:
2118 return
2119 logging.debug('change %s owner is %s, cookies user is %s',
2120 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002122 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002123 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002124 if details['email'] == self.GetIssueOwner():
2125 return
2126 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002127 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002128 'as %s.\n'
2129 'Uploading may fail due to lack of permissions.' %
2130 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2131 confirm_or_exit(action='upload')
2132
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002133 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002134 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002135 or CQ status, assuming adherence to a common workflow.
2136
2137 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002138 * 'error' - error from review tool (including deleted issues)
2139 * 'unsent' - no reviewers added
2140 * 'waiting' - waiting for review
2141 * 'reply' - waiting for uploader to reply to review
2142 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002143 * 'dry-run' - dry-running in the CQ
2144 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002145 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002146 """
2147 if not self.GetIssue():
2148 return None
2149
2150 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002151 data = self._GetChangeDetail([
2152 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002153 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002154 return 'error'
2155
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002156 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002157 return 'closed'
2158
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002159 cq_label = data['labels'].get('Commit-Queue', {})
2160 max_cq_vote = 0
2161 for vote in cq_label.get('all', []):
2162 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2163 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002164 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002165 if max_cq_vote == 1:
2166 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002167
Aaron Gable9ab38c62017-04-06 14:36:33 -07002168 if data['labels'].get('Code-Review', {}).get('approved'):
2169 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002170
2171 if not data.get('reviewers', {}).get('REVIEWER', []):
2172 return 'unsent'
2173
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002174 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002175 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002176 while messages:
2177 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002178 if (m.get('tag', '').startswith('autogenerated:cq') or
2179 m.get('tag', '').startswith('autogenerated:cv')):
2180 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002181 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002182 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002183 # Most recent message was by owner.
2184 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002185
2186 # Some reply from non-owner.
2187 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002188
2189 # Somehow there are no messages even though there are reviewers.
2190 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002191
Gavin Mak4e5e3992022-11-14 22:40:12 +00002192 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002193 if not self.GetIssue():
2194 return None
2195
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002196 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002197 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002198 if update:
2199 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002200 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002201
Gavin Makf35a9eb2022-11-17 18:34:36 +00002202 def _IsPatchsetRangeSignificant(self, lower, upper):
2203 """Returns True if the inclusive range of patchsets contains any reworks or
2204 rebases."""
2205 if not self.GetIssue():
2206 return False
2207
2208 data = self._GetChangeDetail(['ALL_REVISIONS'])
2209 ps_kind = {}
2210 for rev_info in data.get('revisions', {}).values():
2211 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2212
2213 for ps in range(lower, upper + 1):
2214 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2215 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2216 return True
2217 return False
2218
Gavin Make61ccc52020-11-13 00:12:57 +00002219 def GetMostRecentDryRunPatchset(self):
2220 """Get patchsets equivalent to the most recent patchset and return
2221 the patchset with the latest dry run. If none have been dry run, return
2222 the latest patchset."""
2223 if not self.GetIssue():
2224 return None
2225
2226 data = self._GetChangeDetail(['ALL_REVISIONS'])
2227 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002228 dry_run = {int(m['_revision_number'])
2229 for m in data.get('messages', [])
2230 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002231
2232 for revision_info in sorted(data.get('revisions', {}).values(),
2233 key=lambda c: c['_number'], reverse=True):
2234 if revision_info['_number'] in dry_run:
2235 patchset = revision_info['_number']
2236 break
2237 if revision_info.get('kind', '') not in \
2238 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2239 break
2240 self.SetPatchset(patchset)
2241 return patchset
2242
Aaron Gable636b13f2017-07-14 10:42:48 -07002243 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002244 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002245 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002246 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002247
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002248 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002249 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002250 # CURRENT_REVISION is included to get the latest patchset so that
2251 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002252 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002253 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2254 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002255 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002256 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002257 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002258 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002259
2260 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002261 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002262 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002263 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002264 line_comments = file_comments.setdefault(path, [])
2265 line_comments.extend(
2266 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002267
2268 # Build dictionary of file comments for easy access and sorting later.
2269 # {author+date: {path: {patchset: {line: url+message}}}}
2270 comments = collections.defaultdict(
2271 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002272
2273 server = self.GetCodereviewServer()
2274 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2275 # /c/ is automatically added by short URL server.
2276 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2277 self.GetIssue())
2278 else:
2279 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2280
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002281 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002282 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002283 tag = comment.get('tag', '')
2284 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002285 continue
2286 key = (comment['author']['email'], comment['updated'])
2287 if comment.get('side', 'REVISION') == 'PARENT':
2288 patchset = 'Base'
2289 else:
2290 patchset = 'PS%d' % comment['patch_set']
2291 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002292 url = ('%s/%s/%s#%s%s' %
2293 (url_prefix, comment['patch_set'], path,
2294 'b' if comment.get('side') == 'PARENT' else '',
2295 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002296 comments[key][path][patchset][line] = (url, comment['message'])
2297
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002298 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002299 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002300 summary = self._BuildCommentSummary(msg, comments, readable)
2301 if summary:
2302 summaries.append(summary)
2303 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002304
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002305 @staticmethod
2306 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002307 if 'email' not in msg['author']:
2308 # Some bot accounts may not have an email associated.
2309 return None
2310
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002311 key = (msg['author']['email'], msg['date'])
2312 # Don't bother showing autogenerated messages that don't have associated
2313 # file or line comments. this will filter out most autogenerated
2314 # messages, but will keep robot comments like those from Tricium.
2315 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2316 if is_autogenerated and not comments.get(key):
2317 return None
2318 message = msg['message']
2319 # Gerrit spits out nanoseconds.
2320 assert len(msg['date'].split('.')[-1]) == 9
2321 date = datetime.datetime.strptime(msg['date'][:-3],
2322 '%Y-%m-%d %H:%M:%S.%f')
2323 if key in comments:
2324 message += '\n'
2325 for path, patchsets in sorted(comments.get(key, {}).items()):
2326 if readable:
2327 message += '\n%s' % path
2328 for patchset, lines in sorted(patchsets.items()):
2329 for line, (url, content) in sorted(lines.items()):
2330 if line:
2331 line_str = 'Line %d' % line
2332 path_str = '%s:%d:' % (path, line)
2333 else:
2334 line_str = 'File comment'
2335 path_str = '%s:0:' % path
2336 if readable:
2337 message += '\n %s, %s: %s' % (patchset, line_str, url)
2338 message += '\n %s\n' % content
2339 else:
2340 message += '\n%s ' % path_str
2341 message += '\n%s\n' % content
2342
2343 return _CommentSummary(
2344 date=date,
2345 message=message,
2346 sender=msg['author']['email'],
2347 autogenerated=is_autogenerated,
2348 # These could be inferred from the text messages and correlated with
2349 # Code-Review label maximum, however this is not reliable.
2350 # Leaving as is until the need arises.
2351 approval=False,
2352 disapproval=False,
2353 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002354
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002355 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002356 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002357 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002358
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002359 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002360 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002361 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002362
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002363 def _GetChangeDetail(self, options=None):
2364 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002365 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002366 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002367
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002368 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002369 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002370 options.append('CURRENT_COMMIT')
2371
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002372 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002373 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002374 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002375
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002376 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2377 # Assumption: data fetched before with extra options is suitable
2378 # for return for a smaller set of options.
2379 # For example, if we cached data for
2380 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2381 # and request is for options=[CURRENT_REVISION],
2382 # THEN we can return prior cached data.
2383 if options_set.issubset(cached_options_set):
2384 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002385
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002386 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002387 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002388 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002389 except gerrit_util.GerritError as e:
2390 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002391 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002392 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002393
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002394 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002395 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002396
Gavin Mak4e5e3992022-11-14 22:40:12 +00002397 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002398 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002399 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002400 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2401 self._GerritChangeIdentifier(),
2402 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002403 except gerrit_util.GerritError as e:
2404 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002405 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002406 raise
agable32978d92016-11-01 12:55:02 -07002407 return data
2408
Karen Qian40c19422019-03-13 21:28:29 +00002409 def _IsCqConfigured(self):
2410 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002411 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002412
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002413 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 if git_common.is_dirty_git_tree('land'):
2415 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002416
tandriid60367b2016-06-22 05:25:12 -07002417 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002418 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002419 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002420 'which can test and land changes for you. '
2421 'Are you sure you wish to bypass it?\n',
2422 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002423 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002424 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002425 # Note: git diff outputs nothing if there is no diff.
2426 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002427 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002428 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002429 if detail['current_revision'] == last_upload:
2430 differs = False
2431 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002432 print('WARNING: Local branch contents differ from latest uploaded '
2433 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002434 if differs:
2435 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002436 confirm_or_exit(
2437 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2438 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002439 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002440 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002441 upstream = self.GetCommonAncestorWithUpstream()
2442 if self.GetIssue():
2443 description = self.FetchDescription()
2444 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002445 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002446 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002447 committing=True,
2448 may_prompt=not force,
2449 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002450 parallel=parallel,
2451 upstream=upstream,
2452 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002453 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002454 resultdb=resultdb,
2455 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002456
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002457 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002458 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002459 links = self._GetChangeCommit().get('web_links', [])
2460 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002461 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002462 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002463 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002464 return 0
2465
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002466 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2467 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002468 assert parsed_issue_arg.valid
2469
Edward Lemur125d60a2019-09-13 18:25:41 +00002470 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002471
2472 if parsed_issue_arg.hostname:
2473 self._gerrit_host = parsed_issue_arg.hostname
2474 self._gerrit_server = 'https://%s' % self._gerrit_host
2475
tandriic2405f52016-10-10 08:13:15 -07002476 try:
2477 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002478 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002479 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002480
2481 if not parsed_issue_arg.patchset:
2482 # Use current revision by default.
2483 revision_info = detail['revisions'][detail['current_revision']]
2484 patchset = int(revision_info['_number'])
2485 else:
2486 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002487 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002488 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2489 break
2490 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002491 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002492 (parsed_issue_arg.patchset, self.GetIssue()))
2493
Edward Lemur125d60a2019-09-13 18:25:41 +00002494 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002495 if remote_url.endswith('.git'):
2496 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002497 remote_url = remote_url.rstrip('/')
2498
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002499 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002500 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002501
2502 if remote_url != fetch_info['url']:
2503 DieWithError('Trying to patch a change from %s but this repo appears '
2504 'to be %s.' % (fetch_info['url'], remote_url))
2505
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002506 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002507
Joanna Wangc023a632023-01-26 17:59:25 +00002508 # Set issue immediately in case the cherry-pick fails, which happens
2509 # when resolving conflicts.
2510 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002511 self.SetIssue(parsed_issue_arg.issue)
2512
Aaron Gable62619a32017-06-16 08:22:09 -07002513 if force:
2514 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2515 print('Checked out commit for change %i patchset %i locally' %
2516 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002517 elif nocommit:
2518 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2519 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002520 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002521 RunGit(['cherry-pick', 'FETCH_HEAD'])
2522 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002523 (parsed_issue_arg.issue, patchset))
2524 print('Note: this created a local commit which does not have '
2525 'the same hash as the one uploaded for review. This will make '
2526 'uploading changes based on top of this branch difficult.\n'
2527 'If you want to do that, use "git cl patch --force" instead.')
2528
Stefan Zagerd08043c2017-10-12 12:07:02 -07002529 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002530 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002531 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002532 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2533 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002534 else:
2535 print('WARNING: You are in detached HEAD state.\n'
2536 'The patch has been applied to your checkout, but you will not be '
2537 'able to upload a new patch set to the gerrit issue.\n'
2538 'Try using the \'-b\' option if you would like to work on a '
2539 'branch and/or upload a new patch set.')
2540
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002541 return 0
2542
Joanna Wang18de1f62023-01-21 01:24:24 +00002543 @staticmethod
2544 def _GerritCommitMsgHookCheck(offer_removal):
2545 # type: (bool) -> None
2546 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002547 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2548 if not os.path.exists(hook):
2549 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002550 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2551 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002552 data = gclient_utils.FileRead(hook)
2553 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2554 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002555 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002556 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002557 'and may interfere with it in subtle ways.\n'
2558 'We recommend you remove the commit-msg hook.')
2559 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002560 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002561 gclient_utils.rm_file_or_tree(hook)
2562 print('Gerrit commit-msg hook removed.')
2563 else:
2564 print('OK, will keep Gerrit commit-msg hook in place.')
2565
Edward Lemur1b52d872019-05-09 21:12:12 +00002566 def _CleanUpOldTraces(self):
2567 """Keep only the last |MAX_TRACES| traces."""
2568 try:
2569 traces = sorted([
2570 os.path.join(TRACES_DIR, f)
2571 for f in os.listdir(TRACES_DIR)
2572 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2573 and not f.startswith('tmp'))
2574 ])
2575 traces_to_delete = traces[:-MAX_TRACES]
2576 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002577 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002578 except OSError:
2579 print('WARNING: Failed to remove old git traces from\n'
2580 ' %s'
2581 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002582
Edward Lemur5737f022019-05-17 01:24:00 +00002583 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002584 """Zip and write the git push traces stored in traces_dir."""
2585 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002586 traces_zip = trace_name + '-traces'
2587 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002588 # Create a temporary dir to store git config and gitcookies in. It will be
2589 # compressed and stored next to the traces.
2590 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002591 git_info_zip = trace_name + '-git-info'
2592
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002593 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002594
Edward Lemur1b52d872019-05-09 21:12:12 +00002595 git_push_metadata['trace_name'] = trace_name
2596 gclient_utils.FileWrite(
2597 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2598
2599 # Keep only the first 6 characters of the git hashes on the packet
2600 # trace. This greatly decreases size after compression.
2601 packet_traces = os.path.join(traces_dir, 'trace-packet')
2602 if os.path.isfile(packet_traces):
2603 contents = gclient_utils.FileRead(packet_traces)
2604 gclient_utils.FileWrite(
2605 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2606 shutil.make_archive(traces_zip, 'zip', traces_dir)
2607
2608 # Collect and compress the git config and gitcookies.
2609 git_config = RunGit(['config', '-l'])
2610 gclient_utils.FileWrite(
2611 os.path.join(git_info_dir, 'git-config'),
2612 git_config)
2613
2614 cookie_auth = gerrit_util.Authenticator.get()
2615 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2616 gitcookies_path = cookie_auth.get_gitcookies_path()
2617 if os.path.isfile(gitcookies_path):
2618 gitcookies = gclient_utils.FileRead(gitcookies_path)
2619 gclient_utils.FileWrite(
2620 os.path.join(git_info_dir, 'gitcookies'),
2621 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2622 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2623
Edward Lemur1b52d872019-05-09 21:12:12 +00002624 gclient_utils.rmtree(git_info_dir)
2625
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002626 def _RunGitPushWithTraces(self,
2627 refspec,
2628 refspec_opts,
2629 git_push_metadata,
2630 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002631 """Run git push and collect the traces resulting from the execution."""
2632 # Create a temporary directory to store traces in. Traces will be compressed
2633 # and stored in a 'traces' dir inside depot_tools.
2634 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002635 trace_name = os.path.join(
2636 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002637
2638 env = os.environ.copy()
2639 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2640 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002641 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002642 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2643 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2644 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2645
2646 try:
2647 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002648 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002649 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002650 push_cmd = ['git', 'push', remote_url, refspec]
2651 if git_push_options:
2652 for opt in git_push_options:
2653 push_cmd.extend(['-o', opt])
2654
Edward Lemur0f58ae42019-04-30 17:24:12 +00002655 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002656 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002657 env=env,
2658 print_stdout=True,
2659 # Flush after every line: useful for seeing progress when running as
2660 # recipe.
2661 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002662 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002663 except subprocess2.CalledProcessError as e:
2664 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002665 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002666 raise GitPushError(
2667 'Failed to create a change, very likely due to blocked keyword. '
2668 'Please examine output above for the reason of the failure.\n'
2669 'If this is a false positive, you can try to bypass blocked '
2670 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002671 '-o banned-words~skip, e.g.:\n'
2672 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002673 'If git-cl is not working correctly, file a bug under the '
2674 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002675 if 'git push -o nokeycheck' in str(e.stdout):
2676 raise GitPushError(
2677 'Failed to create a change, very likely due to a private key being '
2678 'detected. Please examine output above for the reason of the '
2679 'failure.\n'
2680 'If this is a false positive, you can try to bypass private key '
2681 'detection by using push option '
2682 '-o nokeycheck, e.g.:\n'
2683 'git cl upload -o nokeycheck\n\n'
2684 'If git-cl is not working correctly, file a bug under the '
2685 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002686
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002687 raise GitPushError(
2688 'Failed to create a change. Please examine output above for the '
2689 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002690 'For emergencies, Googlers can escalate to '
2691 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002692 'Hint: run command below to diagnose common Git/Gerrit '
2693 'credential problems:\n'
2694 ' git cl creds-check\n'
2695 '\n'
2696 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2697 'component including the files below.\n'
2698 'Review the files before upload, since they might contain sensitive '
2699 'information.\n'
2700 'Set the Restrict-View-Google label so that they are not publicly '
2701 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002702 finally:
2703 execution_time = time_time() - before_push
2704 metrics.collector.add_repeated('sub_commands', {
2705 'command': 'git push',
2706 'execution_time': execution_time,
2707 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002708 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002709 })
2710
Edward Lemur1b52d872019-05-09 21:12:12 +00002711 git_push_metadata['execution_time'] = execution_time
2712 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002713 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002714
Edward Lemur1b52d872019-05-09 21:12:12 +00002715 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002716 gclient_utils.rmtree(traces_dir)
2717
2718 return push_stdout
2719
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002720 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2721 change_desc):
2722 """Upload the current branch to Gerrit, retry if new remote HEAD is
2723 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002724 remote, remote_branch = self.GetRemoteBranch()
2725 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2726
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002727 try:
2728 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002729 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002730 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002731 # Repository might be in the middle of transition to main branch as
2732 # default, and uploads to old default might be blocked.
2733 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002734 DieWithError(str(e), change_desc)
2735
Josip Sokcevicb631a882021-01-06 18:18:10 +00002736 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2737 self.GetGerritProject())
2738 if project_head == branch:
2739 DieWithError(str(e), change_desc)
2740 branch = project_head
2741
2742 print("WARNING: Fetching remote state and retrying upload to default "
2743 "branch...")
2744 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002745 options.edit_description = False
2746 options.force = True
2747 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002748 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2749 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002750 except GitPushError as e:
2751 DieWithError(str(e), change_desc)
2752
2753 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002754 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002755 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002757 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002758 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002759 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002760 # User requested to change description
2761 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002762 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002763 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2764 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002765 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002766
2767 # Check if changes outside of this workspace have been uploaded.
2768 current_rev = change_detail['current_revision']
2769 last_uploaded_rev = self._GitGetBranchConfigValue(
2770 GERRIT_SQUASH_HASH_CONFIG_KEY)
2771 if last_uploaded_rev and current_rev != last_uploaded_rev:
2772 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002773 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002774 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002775 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002776 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002777 if len(change_ids) == 1:
2778 change_id = change_ids[0]
2779 else:
2780 change_id = GenerateGerritChangeId(change_desc.description)
2781 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002782
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002783 if options.preserve_tryjobs:
2784 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002785
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002786 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002787 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002788 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002789 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002790 with gclient_utils.temporary_file() as desc_tempfile:
2791 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2792 ref_to_push = RunGit(
2793 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002794 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002795 if options.no_add_changeid:
2796 pass
2797 else: # adding Change-Ids is okay.
2798 if not git_footers.get_footer_change_id(change_desc.description):
2799 DownloadGerritHook(False)
2800 change_desc.set_description(
2801 self._AddChangeIdToCommitMessage(change_desc.description,
2802 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002803 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002804 # For no-squash mode, we assume the remote called "origin" is the one we
2805 # want. It is not worthwhile to support different workflows for
2806 # no-squash mode.
2807 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002808 # attempt to extract the changeid from the current description
2809 # fail informatively if not possible.
2810 change_id_candidates = git_footers.get_footer_change_id(
2811 change_desc.description)
2812 if not change_id_candidates:
2813 DieWithError("Unable to extract change-id from message.")
2814 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002815
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002816 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2818 ref_to_push)]).splitlines()
2819 if len(commits) > 1:
2820 print('WARNING: This will upload %d commits. Run the following command '
2821 'to see which commits will be uploaded: ' % len(commits))
2822 print('git log %s..%s' % (parent, ref_to_push))
2823 print('You can also use `git squash-branch` to squash these into a '
2824 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002825 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002826
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002827 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002828 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002829 # Add default, watchlist, presubmit ccs if this is the initial upload
2830 # and CL is not private and auto-ccing has not been disabled.
2831 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002832 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002833 if len(cc) > 100:
2834 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2835 'process/lsc/lsc_workflow.md')
2836 print('WARNING: This will auto-CC %s users.' % len(cc))
2837 print('LSC may be more appropriate: %s' % lsc)
2838 print('You can also use the --no-autocc flag to disable auto-CC.')
2839 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002840 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002841 if options.cc:
2842 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002843 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002844 if change_desc.get_cced():
2845 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002846 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002847 valid_accounts = set(reviewers + cc)
2848 # TODO(crbug/877717): relax this for all hosts.
2849 else:
2850 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002851 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002852 logging.info('accounts %s are recognized, %s invalid',
2853 sorted(valid_accounts),
2854 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002855
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002856 # Extra options that can be specified at push time. Doc:
2857 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002858 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002859
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002860 for r in sorted(reviewers):
2861 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002862 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002863 reviewers.remove(r)
2864 else:
2865 # TODO(tandrii): this should probably be a hard failure.
2866 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2867 % r)
2868 for c in sorted(cc):
2869 # refspec option will be rejected if cc doesn't correspond to an
2870 # account, even though REST call to add such arbitrary cc may succeed.
2871 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002872 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002873 cc.remove(c)
2874
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002875 refspec_suffix = ''
2876 if refspec_opts:
2877 refspec_suffix = '%' + ','.join(refspec_opts)
2878 assert ' ' not in refspec_suffix, (
2879 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2880 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002881
Edward Lemur1b52d872019-05-09 21:12:12 +00002882 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002883 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002884 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002885 'change_id': change_id,
2886 'description': change_desc.description,
2887 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002888
Gavin Mak4e5e3992022-11-14 22:40:12 +00002889 # Gerrit may or may not update fast enough to return the correct patchset
2890 # number after we push. Get the pre-upload patchset and increment later.
2891 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2892
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002893 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002894 git_push_metadata,
2895 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896
2897 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002898 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899 change_numbers = [m.group(1)
2900 for m in map(regex.match, push_stdout.splitlines())
2901 if m]
2902 if len(change_numbers) != 1:
2903 DieWithError(
2904 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002905 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002907 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002908 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002909
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002910 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002911 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002912 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002913 gerrit_util.AddReviewers(self.GetGerritHost(),
2914 self._GerritChangeIdentifier(),
2915 reviewers,
2916 cc,
2917 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002918
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 return 0
2920
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002921 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2922 change_desc):
2923 """Computes parent of the generated commit to be uploaded to Gerrit.
2924
2925 Returns revision or a ref name.
2926 """
2927 if custom_cl_base:
2928 # Try to avoid creating additional unintended CLs when uploading, unless
2929 # user wants to take this risk.
2930 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2931 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2932 local_ref_of_target_remote])
2933 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002934 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002935 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2936 'If you proceed with upload, more than 1 CL may be created by '
2937 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2938 'If you are certain that specified base `%s` has already been '
2939 'uploaded to Gerrit as another CL, you may proceed.\n' %
2940 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2941 if not force:
2942 confirm_or_exit(
2943 'Do you take responsibility for cleaning up potential mess '
2944 'resulting from proceeding with upload?',
2945 action='upload')
2946 return custom_cl_base
2947
Aaron Gablef97e33d2017-03-30 15:44:27 -07002948 if remote != '.':
2949 return self.GetCommonAncestorWithUpstream()
2950
2951 # If our upstream branch is local, we base our squashed commit on its
2952 # squashed version.
2953 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2954
Aaron Gablef97e33d2017-03-30 15:44:27 -07002955 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002956 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002957 if upstream_branch_name == 'main':
2958 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002959
2960 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002961 # TODO(tandrii): consider checking parent change in Gerrit and using its
2962 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2963 # the tree hash of the parent branch. The upside is less likely bogus
2964 # requests to reupload parent change just because it's uploadhash is
2965 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002966 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2967 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002968 # Verify that the upstream branch has been uploaded too, otherwise
2969 # Gerrit will create additional CLs when uploading.
2970 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2971 RunGitSilent(['rev-parse', parent + ':'])):
2972 DieWithError(
2973 '\nUpload upstream branch %s first.\n'
2974 'It is likely that this branch has been rebased since its last '
2975 'upload, so you just need to upload it again.\n'
2976 '(If you uploaded it with --no-squash, then branch dependencies '
2977 'are not supported, and you should reupload with --squash.)'
2978 % upstream_branch_name,
2979 change_desc)
2980 return parent
2981
Gavin Mak4e5e3992022-11-14 22:40:12 +00002982 def _UpdateWithExternalChanges(self):
2983 """Updates workspace with external changes.
2984
2985 Returns the commit hash that should be used as the merge base on upload.
2986 """
2987 local_ps = self.GetPatchset()
2988 if local_ps is None:
2989 return
2990
2991 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002992 if external_ps is None or local_ps == external_ps or \
2993 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002994 return
2995
2996 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002997 if num_changes > 1:
2998 change_words = 'changes were'
2999 else:
3000 change_words = 'change was'
3001 print('\n%d external %s published to %s:\n' %
3002 (num_changes, change_words, self.GetIssueURL(short=True)))
3003
3004 # Print an overview of external changes.
3005 ps_to_commit = {}
3006 ps_to_info = {}
3007 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
3008 for commit_id, revision_info in revisions.get('revisions', {}).items():
3009 ps_num = revision_info['_number']
3010 ps_to_commit[ps_num] = commit_id
3011 ps_to_info[ps_num] = revision_info
3012
3013 for ps in range(external_ps, local_ps, -1):
3014 commit = ps_to_commit[ps][:8]
3015 desc = ps_to_info[ps].get('description', '')
3016 print('Patchset %d [%s] %s' % (ps, commit, desc))
3017
3018 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3019 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003020 return
3021
3022 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3023 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3024 external_base = external_parent['commit']
3025
3026 branch = git_common.current_branch()
3027 local_base = self.GetCommonAncestorWithUpstream()
3028 if local_base != external_base:
3029 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3030 (local_base, external_base))
3031 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00003032 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3033 'Continue with upload and override the latest changes?')
3034 return
3035 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003036
3037 # Fetch Gerrit's CL base if it doesn't exist locally.
3038 remote, _ = self.GetRemoteBranch()
3039 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3040 RunGitSilent(['fetch', remote, external_base])
3041
3042 # Get the diff between local_ps and external_ps.
3043 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003044 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003045 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3046 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3047 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3048 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3049 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3050
3051 # Diff can be empty in the case of trivial rebases.
3052 if not diff:
3053 return external_base
3054
3055 # Apply the diff.
3056 with gclient_utils.temporary_file() as diff_tempfile:
3057 gclient_utils.FileWrite(diff_tempfile, diff)
3058 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3059 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3060 if not clean_patch:
3061 # Normally patchset is set after upload. But because we exit, that never
3062 # happens. Updating here makes sure that subsequent uploads don't need
3063 # to fetch/apply the same diff again.
3064 self.SetPatchset(external_ps)
3065 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3066 'conflicts and reupload.')
3067
3068 message = 'Incorporate external changes from '
3069 if num_changes == 1:
3070 message += 'patchset %d' % external_ps
3071 else:
3072 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3073 RunGitSilent(['commit', '-am', message])
3074 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3075 # patchset title instead of this 'Incorporate' message.
3076 return external_base
3077
Edward Lemura12175c2020-03-09 16:58:26 +00003078 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003079 """Re-commits using the current message, assumes the commit hook is in
3080 place.
3081 """
Edward Lemura12175c2020-03-09 16:58:26 +00003082 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003083 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003084 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003085 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003086 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003087
3088 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003089
tandriie113dfd2016-10-11 10:20:12 -07003090 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003091 try:
3092 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003093 except GerritChangeNotExists:
3094 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003095
3096 if data['status'] in ('ABANDONED', 'MERGED'):
3097 return 'CL %s is closed' % self.GetIssue()
3098
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003099 def GetGerritChange(self, patchset=None):
3100 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003101 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003102 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003103 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003104 data = self._GetChangeDetail(['ALL_REVISIONS'])
3105
3106 assert host and issue and patchset, 'CL must be uploaded first'
3107
3108 has_patchset = any(
3109 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003110 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003111 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003112 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003113 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003114
tandrii8c5a3532016-11-04 07:52:02 -07003115 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003116 'host': host,
3117 'change': issue,
3118 'project': data['project'],
3119 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003120 }
tandriie113dfd2016-10-11 10:20:12 -07003121
tandriide281ae2016-10-12 06:02:30 -07003122 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003123 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003124
Edward Lemur707d70b2018-02-07 00:50:14 +01003125 def GetReviewers(self):
3126 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003127 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003128
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003129
Lei Zhang8a0efc12020-08-05 19:58:45 +00003130def _get_bug_line_values(default_project_prefix, bugs):
3131 """Given default_project_prefix and comma separated list of bugs, yields bug
3132 line values.
tandriif9aefb72016-07-01 09:06:51 -07003133
3134 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003135 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003136 * string, which is left as is.
3137
3138 This function may produce more than one line, because bugdroid expects one
3139 project per line.
3140
Lei Zhang8a0efc12020-08-05 19:58:45 +00003141 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003142 ['v8:123', 'chromium:789']
3143 """
3144 default_bugs = []
3145 others = []
3146 for bug in bugs.split(','):
3147 bug = bug.strip()
3148 if bug:
3149 try:
3150 default_bugs.append(int(bug))
3151 except ValueError:
3152 others.append(bug)
3153
3154 if default_bugs:
3155 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003156 if default_project_prefix:
3157 if not default_project_prefix.endswith(':'):
3158 default_project_prefix += ':'
3159 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003160 else:
3161 yield default_bugs
3162 for other in sorted(others):
3163 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3164 yield other
3165
3166
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003167class ChangeDescription(object):
3168 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003169 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003170 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003171 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003172 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003173 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003174 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3175 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003176 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003177 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003178
Dan Beamd8b04ca2019-10-10 21:23:26 +00003179 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003180 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003181 if bug:
3182 regexp = re.compile(self.BUG_LINE)
3183 prefix = settings.GetBugPrefix()
3184 if not any((regexp.match(line) for line in self._description_lines)):
3185 values = list(_get_bug_line_values(prefix, bug))
3186 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003187 if fixed:
3188 regexp = re.compile(self.FIXED_LINE)
3189 prefix = settings.GetBugPrefix()
3190 if not any((regexp.match(line) for line in self._description_lines)):
3191 values = list(_get_bug_line_values(prefix, fixed))
3192 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003193
agable@chromium.org42c20792013-09-12 17:34:49 +00003194 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003195 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003196 return '\n'.join(self._description_lines)
3197
3198 def set_description(self, desc):
3199 if isinstance(desc, basestring):
3200 lines = desc.splitlines()
3201 else:
3202 lines = [line.rstrip() for line in desc]
3203 while lines and not lines[0]:
3204 lines.pop(0)
3205 while lines and not lines[-1]:
3206 lines.pop(-1)
3207 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003208
Edward Lemur5a644f82020-03-18 16:44:57 +00003209 def ensure_change_id(self, change_id):
3210 description = self.description
3211 footer_change_ids = git_footers.get_footer_change_id(description)
3212 # Make sure that the Change-Id in the description matches the given one.
3213 if footer_change_ids != [change_id]:
3214 if footer_change_ids:
3215 # Remove any existing Change-Id footers since they don't match the
3216 # expected change_id footer.
3217 description = git_footers.remove_footer(description, 'Change-Id')
3218 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3219 'if you want to set a new one.')
3220 # Add the expected Change-Id footer.
3221 description = git_footers.add_footer_change_id(description, change_id)
3222 self.set_description(description)
3223
Joanna Wang39811b12023-01-20 23:09:48 +00003224 def update_reviewers(self, reviewers):
3225 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003226
3227 Args:
3228 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003229 """
Joanna Wang39811b12023-01-20 23:09:48 +00003230 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003231 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003232
3233 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234
Joanna Wang39811b12023-01-20 23:09:48 +00003235 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003236 regexp = re.compile(self.R_LINE)
3237 matches = [regexp.match(line) for line in self._description_lines]
3238 new_desc = [l for i, l in enumerate(self._description_lines)
3239 if not matches[i]]
3240 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003241
Joanna Wang39811b12023-01-20 23:09:48 +00003242 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003243
Joanna Wang39811b12023-01-20 23:09:48 +00003244 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 for match in matches:
3246 if not match:
3247 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003248 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003249
Joanna Wang39811b12023-01-20 23:09:48 +00003250 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003251
3252 # Put the new lines in the description where the old first R= line was.
3253 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3254 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003255 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003256 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003257 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003258
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003259 def set_preserve_tryjobs(self):
3260 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3261 footers = git_footers.parse_footers(self.description)
3262 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3263 if v.lower() == 'true':
3264 return
3265 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3266
Anthony Polito8b955342019-09-24 19:01:36 +00003267 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003268 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003269 self.set_description([
3270 '# Enter a description of the change.',
3271 '# This will be displayed on the codereview site.',
3272 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003273 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003274 '--------------------',
3275 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003276 bug_regexp = re.compile(self.BUG_LINE)
3277 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003278 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003279 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003280
Dan Beamd8b04ca2019-10-10 21:23:26 +00003281 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003282 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003283
Bruce Dawsonfc487042020-10-27 19:11:37 +00003284 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003285 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003286 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003287 if not content:
3288 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003289 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003290
Bruce Dawson2377b012018-01-11 16:46:49 -08003291 # Strip off comments and default inserted "Bug:" line.
3292 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003293 (line.startswith('#') or
3294 line.rstrip() == "Bug:" or
3295 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003296 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003297 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003298 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003299
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003300 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003301 """Adds a footer line to the description.
3302
3303 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3304 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3305 that Gerrit footers are always at the end.
3306 """
3307 parsed_footer_line = git_footers.parse_footer(line)
3308 if parsed_footer_line:
3309 # Line is a gerrit footer in the form: Footer-Key: any value.
3310 # Thus, must be appended observing Gerrit footer rules.
3311 self.set_description(
3312 git_footers.add_footer(self.description,
3313 key=parsed_footer_line[0],
3314 value=parsed_footer_line[1]))
3315 return
3316
3317 if not self._description_lines:
3318 self._description_lines.append(line)
3319 return
3320
3321 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3322 if gerrit_footers:
3323 # git_footers.split_footers ensures that there is an empty line before
3324 # actual (gerrit) footers, if any. We have to keep it that way.
3325 assert top_lines and top_lines[-1] == ''
3326 top_lines, separator = top_lines[:-1], top_lines[-1:]
3327 else:
3328 separator = [] # No need for separator if there are no gerrit_footers.
3329
3330 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003331 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3332 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003333 top_lines.append('')
3334 top_lines.append(line)
3335 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003336
tandrii99a72f22016-08-17 14:33:24 -07003337 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003338 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003339 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003340 reviewers = [match.group(2).strip()
3341 for match in matches
3342 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003343 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003344
bradnelsond975b302016-10-23 12:20:23 -07003345 def get_cced(self):
3346 """Retrieves the list of reviewers."""
3347 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3348 cced = [match.group(2).strip() for match in matches if match]
3349 return cleanup_list(cced)
3350
Nodir Turakulov23b82142017-11-16 11:04:25 -08003351 def get_hash_tags(self):
3352 """Extracts and sanitizes a list of Gerrit hashtags."""
3353 subject = (self._description_lines or ('',))[0]
3354 subject = re.sub(
3355 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3356
3357 tags = []
3358 start = 0
3359 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3360 while True:
3361 m = bracket_exp.match(subject, start)
3362 if not m:
3363 break
3364 tags.append(self.sanitize_hash_tag(m.group(1)))
3365 start = m.end()
3366
3367 if not tags:
3368 # Try "Tag: " prefix.
3369 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3370 if m:
3371 tags.append(self.sanitize_hash_tag(m.group(1)))
3372 return tags
3373
3374 @classmethod
3375 def sanitize_hash_tag(cls, tag):
3376 """Returns a sanitized Gerrit hash tag.
3377
3378 A sanitized hashtag can be used as a git push refspec parameter value.
3379 """
3380 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3381
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003382
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003383def FindCodereviewSettingsFile(filename='codereview.settings'):
3384 """Finds the given file starting in the cwd and going up.
3385
3386 Only looks up to the top of the repository unless an
3387 'inherit-review-settings-ok' file exists in the root of the repository.
3388 """
3389 inherit_ok_file = 'inherit-review-settings-ok'
3390 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003391 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003392 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003393 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003394 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003395 if os.path.isfile(os.path.join(cwd, filename)):
3396 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397 if cwd == root:
3398 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003399 parent_dir = os.path.dirname(cwd)
3400 if parent_dir == cwd:
3401 # We hit the system root directory.
3402 break
3403 cwd = parent_dir
3404 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003405
3406
3407def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003408 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003409 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003410
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003411 def SetProperty(name, setting, unset_error_ok=False):
3412 fullname = 'rietveld.' + name
3413 if setting in keyvals:
3414 RunGit(['config', fullname, keyvals[setting]])
3415 else:
3416 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3417
tandrii48df5812016-10-17 03:55:37 -07003418 if not keyvals.get('GERRIT_HOST', False):
3419 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003420 # Only server setting is required. Other settings can be absent.
3421 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003422 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003423 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3424 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003425 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003426 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3427 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003428 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3429 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003430 SetProperty(
3431 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003432 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003433
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003434 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003435 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003436
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003437 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003438 RunGit(['config', 'gerrit.squash-uploads',
3439 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003440
tandrii@chromium.org28253532016-04-14 13:46:56 +00003441 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003442 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003443 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3444
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003445 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003446 # should be of the form
3447 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3448 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003449 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3450 keyvals['ORIGIN_URL_CONFIG']])
3451
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003453def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003454 """Downloads a network object to a local file, like urllib.urlretrieve.
3455
3456 This is necessary because urllib is broken for SSL connections via a proxy.
3457 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003458 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003459 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003460
3461
ukai@chromium.org712d6102013-11-27 00:52:58 +00003462def hasSheBang(fname):
3463 """Checks fname is a #! script."""
3464 with open(fname) as f:
3465 return f.read(2).startswith('#!')
3466
3467
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003468def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003469 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470
3471 Args:
3472 force: True to update hooks. False to install hooks if not present.
3473 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003474 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003475 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3476 if not os.access(dst, os.X_OK):
3477 if os.path.exists(dst):
3478 if not force:
3479 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003480 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003481 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003482 if not hasSheBang(dst):
3483 DieWithError('Not a script: %s\n'
3484 'You need to download from\n%s\n'
3485 'into .git/hooks/commit-msg and '
3486 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003487 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3488 except Exception:
3489 if os.path.exists(dst):
3490 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003491 DieWithError('\nFailed to download hooks.\n'
3492 'You need to download from\n%s\n'
3493 'into .git/hooks/commit-msg and '
3494 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003495
3496
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003497class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003498 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003499
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003500 def __init__(self):
3501 # Cached list of [host, identity, source], where source is either
3502 # .gitcookies or .netrc.
3503 self._all_hosts = None
3504
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003505 def ensure_configured_gitcookies(self):
3506 """Runs checks and suggests fixes to make git use .gitcookies from default
3507 path."""
3508 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3509 configured_path = RunGitSilent(
3510 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003511 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003512 if configured_path:
3513 self._ensure_default_gitcookies_path(configured_path, default)
3514 else:
3515 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003516
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003517 @staticmethod
3518 def _ensure_default_gitcookies_path(configured_path, default_path):
3519 assert configured_path
3520 if configured_path == default_path:
3521 print('git is already configured to use your .gitcookies from %s' %
3522 configured_path)
3523 return
3524
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003525 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003526 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3527 (configured_path, default_path))
3528
3529 if not os.path.exists(configured_path):
3530 print('However, your configured .gitcookies file is missing.')
3531 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3532 action='reconfigure')
3533 RunGit(['config', '--global', 'http.cookiefile', default_path])
3534 return
3535
3536 if os.path.exists(default_path):
3537 print('WARNING: default .gitcookies file already exists %s' %
3538 default_path)
3539 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3540 default_path)
3541
3542 confirm_or_exit('Move existing .gitcookies to default location?',
3543 action='move')
3544 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003545 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003546 print('Moved and reconfigured git to use .gitcookies from %s' %
3547 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003548
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003549 @staticmethod
3550 def _configure_gitcookies_path(default_path):
3551 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3552 if os.path.exists(netrc_path):
3553 print('You seem to be using outdated .netrc for git credentials: %s' %
3554 netrc_path)
3555 print('This tool will guide you through setting up recommended '
3556 '.gitcookies store for git credentials.\n'
3557 '\n'
3558 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3559 ' git config --global --unset http.cookiefile\n'
3560 ' mv %s %s.backup\n\n' % (default_path, default_path))
3561 confirm_or_exit(action='setup .gitcookies')
3562 RunGit(['config', '--global', 'http.cookiefile', default_path])
3563 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003564
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003565 def get_hosts_with_creds(self, include_netrc=False):
3566 if self._all_hosts is None:
3567 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003568 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3569 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3570 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3571 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003572
3573 if include_netrc:
3574 return self._all_hosts
3575 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3576
3577 def print_current_creds(self, include_netrc=False):
3578 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3579 if not hosts:
3580 print('No Git/Gerrit credentials found')
3581 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003582 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003583 header = [('Host', 'User', 'Which file'),
3584 ['=' * l for l in lengths]]
3585 for row in (header + hosts):
3586 print('\t'.join((('%%+%ds' % l) % s)
3587 for l, s in zip(lengths, row)))
3588
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003589 @staticmethod
3590 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003591 """Parses identity "git-<username>.domain" into <username> and domain."""
3592 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003593 # distinguishable from sub-domains. But we do know typical domains:
3594 if identity.endswith('.chromium.org'):
3595 domain = 'chromium.org'
3596 username = identity[:-len('.chromium.org')]
3597 else:
3598 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003599 if username.startswith('git-'):
3600 username = username[len('git-'):]
3601 return username, domain
3602
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003603 def has_generic_host(self):
3604 """Returns whether generic .googlesource.com has been configured.
3605
3606 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3607 """
3608 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003609 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003610 return True
3611 return False
3612
3613 def _get_git_gerrit_identity_pairs(self):
3614 """Returns map from canonic host to pair of identities (Git, Gerrit).
3615
3616 One of identities might be None, meaning not configured.
3617 """
3618 host_to_identity_pairs = {}
3619 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003620 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003621 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3622 idx = 0 if canonical == host else 1
3623 pair[idx] = identity
3624 return host_to_identity_pairs
3625
3626 def get_partially_configured_hosts(self):
3627 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003628 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003629 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003630 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003631
3632 def get_conflicting_hosts(self):
3633 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003635 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003636 if None not in (i1, i2) and i1 != i2)
3637
3638 def get_duplicated_hosts(self):
3639 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003640 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003641
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003642
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003644 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003645 hosts = sorted(hosts)
3646 assert hosts
3647 if extra_column_func is None:
3648 extras = [''] * len(hosts)
3649 else:
3650 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003651 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3652 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003653 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003654 lines.append(tmpl % he)
3655 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003656
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003658 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 yield ('.googlesource.com wildcard record detected',
3660 ['Chrome Infrastructure team recommends to list full host names '
3661 'explicitly.'],
3662 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003663
3664 dups = self.get_duplicated_hosts()
3665 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 yield ('The following hosts were defined twice',
3667 self._format_hosts(dups),
3668 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003669
3670 partial = self.get_partially_configured_hosts()
3671 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003672 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3673 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003674 self._format_hosts(
3675 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3676 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003677
3678 conflicting = self.get_conflicting_hosts()
3679 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003680 yield ('The following Git hosts have differing credentials from their '
3681 'Gerrit counterparts',
3682 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3683 tuple(self._get_git_gerrit_identity_pairs()[host])),
3684 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003685
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003686 def find_and_report_problems(self):
3687 """Returns True if there was at least one problem, else False."""
3688 found = False
3689 bad_hosts = set()
3690 for title, sublines, hosts in self._find_problems():
3691 if not found:
3692 found = True
3693 print('\n\n.gitcookies problem report:\n')
3694 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003695 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003696 if sublines:
3697 print()
3698 print(' %s' % '\n '.join(sublines))
3699 print()
3700
3701 if bad_hosts:
3702 assert found
3703 print(' You can manually remove corresponding lines in your %s file and '
3704 'visit the following URLs with correct account to generate '
3705 'correct credential lines:\n' %
3706 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003707 print(' %s' % '\n '.join(
3708 sorted(
3709 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3710 _canonical_git_googlesource_host(host))
3711 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003712 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003713
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003714
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003715@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003716def CMDcreds_check(parser, args):
3717 """Checks credentials and suggests changes."""
3718 _, _ = parser.parse_args(args)
3719
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003720 # Code below checks .gitcookies. Abort if using something else.
3721 authn = gerrit_util.Authenticator.get()
3722 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003723 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003724 'This command is not designed for bot environment. It checks '
3725 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003726 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3727 if isinstance(authn, gerrit_util.GceAuthenticator):
3728 message += (
3729 '\n'
3730 'If you need to run this on GCE or a cloudtop instance, '
3731 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3732 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003733
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003734 checker = _GitCookiesChecker()
3735 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003736
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003737 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003738 checker.print_current_creds(include_netrc=True)
3739
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003740 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003741 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003742 return 0
3743 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003744
3745
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003746@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003747def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003748 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003749 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003750 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003751 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003752 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003754 return RunGit(['config', 'branch.%s.base-url' % branch],
3755 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003756
3757 print('Setting base-url to %s' % args[0])
3758 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3759 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003760
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003761
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003762def color_for_status(status):
3763 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003764 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003765 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003766 'unsent': BOLD + Fore.YELLOW,
3767 'waiting': BOLD + Fore.RED,
3768 'reply': BOLD + Fore.YELLOW,
3769 'not lgtm': BOLD + Fore.RED,
3770 'lgtm': BOLD + Fore.GREEN,
3771 'commit': BOLD + Fore.MAGENTA,
3772 'closed': BOLD + Fore.CYAN,
3773 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003774 }.get(status, Fore.WHITE)
3775
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003776
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003777def get_cl_statuses(changes, fine_grained, max_processes=None):
3778 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003779
3780 If fine_grained is true, this will fetch CL statuses from the server.
3781 Otherwise, simply indicate if there's a matching url for the given branches.
3782
3783 If max_processes is specified, it is used as the maximum number of processes
3784 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3785 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003786
3787 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003788 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003789 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003790 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003791
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003792 if not fine_grained:
3793 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003794 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003795 for cl in changes:
3796 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003797 return
3798
3799 # First, sort out authentication issues.
3800 logging.debug('ensuring credentials exist')
3801 for cl in changes:
3802 cl.EnsureAuthenticated(force=False, refresh=True)
3803
3804 def fetch(cl):
3805 try:
3806 return (cl, cl.GetStatus())
3807 except:
3808 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003809 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003810 raise
3811
3812 threads_count = len(changes)
3813 if max_processes:
3814 threads_count = max(1, min(threads_count, max_processes))
3815 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3816
Edward Lemur61bf4172020-02-24 23:22:37 +00003817 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003818 fetched_cls = set()
3819 try:
3820 it = pool.imap_unordered(fetch, changes).__iter__()
3821 while True:
3822 try:
3823 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003824 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003825 break
3826 fetched_cls.add(cl)
3827 yield cl, status
3828 finally:
3829 pool.close()
3830
3831 # Add any branches that failed to fetch.
3832 for cl in set(changes) - fetched_cls:
3833 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003834
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835
Jose Lopes3863fc52020-04-07 17:00:25 +00003836def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003837 """Uploads CLs of local branches that are dependents of the current branch.
3838
3839 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003840
3841 test1 -> test2.1 -> test3.1
3842 -> test3.2
3843 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844
3845 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3846 run on the dependent branches in this order:
3847 test2.1, test3.1, test3.2, test2.2, test3.3
3848
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003849 Note: This function does not rebase your local dependent branches. Use it
3850 when you make a change to the parent branch that will not conflict
3851 with its dependent branches, and you would like their dependencies
3852 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003853 """
3854 if git_common.is_dirty_git_tree('upload-branch-deps'):
3855 return 1
3856
3857 root_branch = cl.GetBranch()
3858 if root_branch is None:
3859 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3860 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003861 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003862 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3863 'patchset dependencies without an uploaded CL.')
3864
3865 branches = RunGit(['for-each-ref',
3866 '--format=%(refname:short) %(upstream:short)',
3867 'refs/heads'])
3868 if not branches:
3869 print('No local branches found.')
3870 return 0
3871
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003872 # Create a dictionary of all local branches to the branches that are
3873 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003874 tracked_to_dependents = collections.defaultdict(list)
3875 for b in branches.splitlines():
3876 tokens = b.split()
3877 if len(tokens) == 2:
3878 branch_name, tracked = tokens
3879 tracked_to_dependents[tracked].append(branch_name)
3880
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print()
3882 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003884
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 def traverse_dependents_preorder(branch, padding=''):
3886 dependents_to_process = tracked_to_dependents.get(branch, [])
3887 padding += ' '
3888 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 dependents.append(dependent)
3891 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003892
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895
3896 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 return 0
3899
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 # Record all dependents that failed to upload.
3901 failures = {}
3902 # Go through all dependents, checkout the branch and upload.
3903 try:
3904 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print()
3906 print('--------------------------------------')
3907 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003909 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003910 try:
3911 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003913 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003914 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003915 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003917 finally:
3918 # Swap back to the original root branch.
3919 RunGit(['checkout', '-q', root_branch])
3920
vapiera7fbd5a2016-06-16 09:17:49 -07003921 print()
3922 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003923 for dependent_branch in dependents:
3924 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003925 print(' %s : %s' % (dependent_branch, upload_status))
3926 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003927
3928 return 0
3929
3930
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003931def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003932 """Given a proposed tag name, returns a tag name that is guaranteed to be
3933 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3934 or 'foo-3', and so on."""
3935
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003936 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003937 for suffix_num in itertools.count(1):
3938 if suffix_num == 1:
3939 to_check = proposed_tag
3940 else:
3941 to_check = '%s-%d' % (proposed_tag, suffix_num)
3942
3943 if to_check not in existing_tags:
3944 return to_check
3945
3946
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003947@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003948def CMDarchive(parser, args):
3949 """Archives and deletes branches associated with closed changelists."""
3950 parser.add_option(
3951 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003952 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003953 parser.add_option(
3954 '-f', '--force', action='store_true',
3955 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003956 parser.add_option(
3957 '-d', '--dry-run', action='store_true',
3958 help='Skip the branch tagging and removal steps.')
3959 parser.add_option(
3960 '-t', '--notags', action='store_true',
3961 help='Do not tag archived branches. '
3962 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003963 parser.add_option(
3964 '-p',
3965 '--pattern',
3966 default='git-cl-archived-{issue}-{branch}',
3967 help='Format string for archive tags. '
3968 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003969
kmarshall3bff56b2016-06-06 18:31:47 -07003970 options, args = parser.parse_args(args)
3971 if args:
3972 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003973
3974 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3975 if not branches:
3976 return 0
3977
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003978 tags = RunGit(['for-each-ref', '--format=%(refname)',
3979 'refs/tags']).splitlines() or []
3980 tags = [t.split('/')[-1] for t in tags]
3981
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003983 changes = [Changelist(branchref=b)
3984 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003985 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3986 statuses = get_cl_statuses(changes,
3987 fine_grained=True,
3988 max_processes=options.maxjobs)
3989 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003990 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3991 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003992 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003993 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003994 proposal.sort()
3995
3996 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003997 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003998 return 0
3999
Edward Lemur85153282020-02-14 22:06:29 +00004000 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07004001
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004003 if options.notags:
4004 for next_item in proposal:
4005 print(' ' + next_item[0])
4006 else:
4007 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4008 for next_item in proposal:
4009 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004010
kmarshall9249e012016-08-23 12:02:16 -07004011 # Quit now on precondition failure or if instructed by the user, either
4012 # via an interactive prompt or by command line flags.
4013 if options.dry_run:
4014 print('\nNo changes were made (dry run).\n')
4015 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004016
4017 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004018 print('You are currently on a branch \'%s\' which is associated with a '
4019 'closed codereview issue, so archive cannot proceed. Please '
4020 'checkout another branch and run this command again.' %
4021 current_branch)
4022 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004023
4024 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004025 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004026 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004028 return 1
4029
4030 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004031 if not options.notags:
4032 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004033
4034 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4035 # Clean up the tag if we failed to delete the branch.
4036 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004037
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004039
4040 return 0
4041
4042
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004043@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004044def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004045 """Show status of changelists.
4046
4047 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004048 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004049 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004050 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004051 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004052 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004053 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004054 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004055
4056 Also see 'git cl comments'.
4057 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004058 parser.add_option(
4059 '--no-branch-color',
4060 action='store_true',
4061 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004063 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004064 parser.add_option('-f', '--fast', action='store_true',
4065 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004066 parser.add_option(
4067 '-j', '--maxjobs', action='store', type=int,
4068 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004069 parser.add_option(
4070 '-i', '--issue', type=int,
4071 help='Operate on this issue instead of the current branch\'s implicit '
4072 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004073 parser.add_option('-d',
4074 '--date-order',
4075 action='store_true',
4076 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004077 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004078 if args:
4079 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080
iannuccie53c9352016-08-17 14:40:40 -07004081 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004082 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004083
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004085 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004087 if cl.GetIssue():
4088 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004089 elif options.field == 'id':
4090 issueid = cl.GetIssue()
4091 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004092 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004093 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004094 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004095 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004097 elif options.field == 'status':
4098 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004099 elif options.field == 'url':
4100 url = cl.GetIssueURL()
4101 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004103 return 0
4104
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004105 branches = RunGit([
4106 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4107 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004108 if not branches:
4109 print('No local branch found.')
4110 return 0
4111
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004112 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004113 Changelist(branchref=b, commit_date=ct)
4114 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4115 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004116 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004117 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004118 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004119 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004120
Edward Lemur85153282020-02-14 22:06:29 +00004121 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004122
4123 def FormatBranchName(branch, colorize=False):
4124 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4125 an asterisk when it is the current branch."""
4126
4127 asterisk = ""
4128 color = Fore.RESET
4129 if branch == current_branch:
4130 asterisk = "* "
4131 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004132 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004133
4134 if colorize:
4135 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004136 return asterisk + branch_name
4137
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004138 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004139
4140 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004141
4142 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004143 sorted_changes = sorted(changes,
4144 key=lambda c: c.GetCommitDate(),
4145 reverse=True)
4146 else:
4147 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4148 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004149 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004150 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004151 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004152 branch_statuses[c.GetBranch()] = status
4153 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004154 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004155 if url and (not status or status == 'error'):
4156 # The issue probably doesn't exist anymore.
4157 url += ' (broken)'
4158
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004159 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004160 # Turn off bold as well as colors.
4161 END = '\033[0m'
4162 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004163 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004164 color = ''
4165 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004166 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004167
Alan Cuttera3be9a52019-03-04 18:50:33 +00004168 branch_display = FormatBranchName(branch)
4169 padding = ' ' * (alignment - len(branch_display))
4170 if not options.no_branch_color:
4171 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004172
Alan Cuttera3be9a52019-03-04 18:50:33 +00004173 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4174 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004175
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004177 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004178 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004179 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004180 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004181 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004183 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004185 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004186 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004187 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188 return 0
4189
4190
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004191def colorize_CMDstatus_doc():
4192 """To be called once in main() to add colors to git cl status help."""
4193 colors = [i for i in dir(Fore) if i[0].isupper()]
4194
4195 def colorize_line(line):
4196 for color in colors:
4197 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004198 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004199 indent = len(line) - len(line.lstrip(' ')) + 1
4200 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4201 return line
4202
4203 lines = CMDstatus.__doc__.splitlines()
4204 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4205
4206
phajdan.jre328cf92016-08-22 04:12:17 -07004207def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004208 if path == '-':
4209 json.dump(contents, sys.stdout)
4210 else:
4211 with open(path, 'w') as f:
4212 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004213
4214
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004215@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004216@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004217def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004218 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219
4220 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004221 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004222 parser.add_option('-r', '--reverse', action='store_true',
4223 help='Lookup the branch(es) for the specified issues. If '
4224 'no issues are specified, all branches with mapped '
4225 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004226 parser.add_option('--json',
4227 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004228 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004229
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004231 branches = RunGit(['for-each-ref', 'refs/heads',
4232 '--format=%(refname)']).splitlines()
4233 # Reverse issue lookup.
4234 issue_branch_map = {}
4235
4236 git_config = {}
4237 for config in RunGit(['config', '--get-regexp',
4238 r'branch\..*issue']).splitlines():
4239 name, _space, val = config.partition(' ')
4240 git_config[name] = val
4241
4242 for branch in branches:
4243 issue = git_config.get(
4244 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4245 if issue:
4246 issue_branch_map.setdefault(int(issue), []).append(branch)
4247 if not args:
4248 args = sorted(issue_branch_map.keys())
4249 result = {}
4250 for issue in args:
4251 try:
4252 issue_num = int(issue)
4253 except ValueError:
4254 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4255 continue
4256 result[issue_num] = issue_branch_map.get(issue_num)
4257 print('Branch for issue number %s: %s' %
4258 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4259 if options.json:
4260 write_json(options.json, result)
4261 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004262
4263 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004264 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004265 if not issue.valid:
4266 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4267 'or no argument to list it.\n'
4268 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004269 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004270 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004271 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004272 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004273 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4274 if options.json:
4275 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004276 'gerrit_host': cl.GetGerritHost(),
4277 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004278 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004279 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004280 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004281 return 0
4282
4283
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004284@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004285def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004286 """Shows or posts review comments for any changelist."""
4287 parser.add_option('-a', '--add-comment', dest='comment',
4288 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004289 parser.add_option('-p', '--publish', action='store_true',
4290 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004291 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004292 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004293 parser.add_option('-m', '--machine-readable', dest='readable',
4294 action='store_false', default=True,
4295 help='output comments in a format compatible with '
4296 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004297 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004298 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004299 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004300
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004301 issue = None
4302 if options.issue:
4303 try:
4304 issue = int(options.issue)
4305 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004306 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307
Edward Lemur934836a2019-09-09 20:16:54 +00004308 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004309
4310 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004311 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004312 return 0
4313
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004314 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4315 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004316 for comment in summary:
4317 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004318 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004319 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004320 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004321 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004322 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004323 elif comment.autogenerated:
4324 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004325 else:
4326 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004327 print('\n%s%s %s%s\n%s' % (
4328 color,
4329 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4330 comment.sender,
4331 Fore.RESET,
4332 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4333
smut@google.comc85ac942015-09-15 16:34:43 +00004334 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004335 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004336 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004337 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4338 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004339 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004340 return 0
4341
4342
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004343@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004344@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004345def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004346 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004347 parser.add_option('-d', '--display', action='store_true',
4348 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004349 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004350 help='New description to set for this issue (- for stdin, '
4351 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004352 parser.add_option('-f', '--force', action='store_true',
4353 help='Delete any unpublished Gerrit edits for this issue '
4354 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004355
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004356 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004357
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004358 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004359 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004360 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004361 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004362 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004363
Edward Lemur934836a2019-09-09 20:16:54 +00004364 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004365 if target_issue_arg:
4366 kwargs['issue'] = target_issue_arg.issue
4367 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004368
4369 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004370 if not cl.GetIssue():
4371 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004372
Edward Lemur678a6842019-10-03 22:25:05 +00004373 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004374 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004375
Edward Lemur6c6827c2020-02-06 21:15:18 +00004376 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004377
smut@google.com34fb6b12015-07-13 20:03:26 +00004378 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004379 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004380 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004381
4382 if options.new_description:
4383 text = options.new_description
4384 if text == '-':
4385 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004386 elif text == '+':
4387 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004388 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004389
4390 description.set_description(text)
4391 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004392 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004393 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004394 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004395 return 0
4396
4397
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004398@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399def CMDlint(parser, args):
4400 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004401 parser.add_option('--filter', action='append', metavar='-x,+y',
4402 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004403 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004404
4405 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004406 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 try:
4408 import cpplint
4409 import cpplint_chromium
4410 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004411 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004412 return 1
4413
4414 # Change the current working directory before calling lint so that it
4415 # shows the correct base.
4416 previous_cwd = os.getcwd()
4417 os.chdir(settings.GetRoot())
4418 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004419 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004420 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004421 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004422 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004423 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004424
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004425 # Process cpplint arguments, if any.
4426 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4427 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004428 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004429
Lei Zhang379d1ad2020-07-15 19:40:06 +00004430 include_regex = re.compile(settings.GetLintRegex())
4431 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004432 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4433 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004434 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004435 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004436 continue
4437
4438 if ignore_regex.match(filename):
4439 print('Ignoring file %s' % filename)
4440 continue
4441
4442 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4443 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004444 finally:
4445 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004446 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004447 if cpplint._cpplint_state.error_count != 0:
4448 return 1
4449 return 0
4450
4451
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004452@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004453def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004454 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004455 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004456 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004457 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004458 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004459 parser.add_option('--all', action='store_true',
4460 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004461 parser.add_option('--files',
4462 nargs=1,
4463 help='Semicolon-separated list of files to be marked as '
4464 'modified when executing presubmit or post-upload hooks. '
4465 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004466 parser.add_option('--parallel', action='store_true',
4467 help='Run all tests specified by input_api.RunTests in all '
4468 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004469 parser.add_option('--resultdb', action='store_true',
4470 help='Run presubmit checks in the ResultSink environment '
4471 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004472 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004473 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004474
sbc@chromium.org71437c02015-04-09 19:29:40 +00004475 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004476 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004477 return 1
4478
Edward Lemur934836a2019-09-09 20:16:54 +00004479 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480 if args:
4481 base_branch = args[0]
4482 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004483 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004484 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004486 start = time.time()
4487 try:
4488 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4489 description = cl.FetchDescription()
4490 else:
4491 description = _create_description_from_log([base_branch])
4492 except Exception as e:
4493 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004494 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004495 elapsed = time.time() - start
4496 if elapsed > 5:
4497 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004498
Bruce Dawson13acea32022-05-03 22:13:08 +00004499 if not base_branch:
4500 if not options.force:
4501 print('use --force to check even when not on a branch.')
4502 return 1
4503 base_branch = 'HEAD'
4504
Josip Sokcevic017544d2022-03-31 23:47:53 +00004505 cl.RunHook(committing=not options.upload,
4506 may_prompt=False,
4507 verbose=options.verbose,
4508 parallel=options.parallel,
4509 upstream=base_branch,
4510 description=description,
4511 all_files=options.all,
4512 files=options.files,
4513 resultdb=options.resultdb,
4514 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004515 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004516
4517
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004518def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004519 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004520
4521 Works the same way as
4522 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4523 but can be called on demand on all platforms.
4524
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004525 The basic idea is to generate git hash of a state of the tree, original
4526 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004527 """
4528 lines = []
4529 tree_hash = RunGitSilent(['write-tree'])
4530 lines.append('tree %s' % tree_hash.strip())
4531 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4532 if code == 0:
4533 lines.append('parent %s' % parent.strip())
4534 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4535 lines.append('author %s' % author.strip())
4536 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4537 lines.append('committer %s' % committer.strip())
4538 lines.append('')
4539 # Note: Gerrit's commit-hook actually cleans message of some lines and
4540 # whitespace. This code is not doing this, but it clearly won't decrease
4541 # entropy.
4542 lines.append(message)
4543 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004544 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004545 return 'I%s' % change_hash.strip()
4546
4547
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004548def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004549 """Computes the remote branch ref to use for the CL.
4550
4551 Args:
4552 remote (str): The git remote for the CL.
4553 remote_branch (str): The git remote branch for the CL.
4554 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004555 """
4556 if not (remote and remote_branch):
4557 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004558
wittman@chromium.org455dc922015-01-26 20:15:50 +00004559 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004560 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004561 # refs, which are then translated into the remote full symbolic refs
4562 # below.
4563 if '/' not in target_branch:
4564 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4565 else:
4566 prefix_replacements = (
4567 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4568 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4569 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4570 )
4571 match = None
4572 for regex, replacement in prefix_replacements:
4573 match = re.search(regex, target_branch)
4574 if match:
4575 remote_branch = target_branch.replace(match.group(0), replacement)
4576 break
4577 if not match:
4578 # This is a branch path but not one we recognize; use as-is.
4579 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004580 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004581 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004582 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004583 # Handle the refs that need to land in different refs.
4584 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004585
wittman@chromium.org455dc922015-01-26 20:15:50 +00004586 # Create the true path to the remote branch.
4587 # Does the following translation:
4588 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004589 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004590 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4591 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4592 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4593 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4594 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4595 'refs/heads/')
4596 elif remote_branch.startswith('refs/remotes/branch-heads'):
4597 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004598
wittman@chromium.org455dc922015-01-26 20:15:50 +00004599 return remote_branch
4600
4601
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004602def cleanup_list(l):
4603 """Fixes a list so that comma separated items are put as individual items.
4604
4605 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4606 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4607 """
4608 items = sum((i.split(',') for i in l), [])
4609 stripped_items = (i.strip() for i in items)
4610 return sorted(filter(None, stripped_items))
4611
4612
Aaron Gable4db38df2017-11-03 14:59:07 -07004613@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004614@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004615def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004616 """Uploads the current changelist to codereview.
4617
4618 Can skip dependency patchset uploads for a branch by running:
4619 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004620 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004621 git config --unset branch.branch_name.skip-deps-uploads
4622 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004623
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004624 If the name of the checked out branch starts with "bug-" or "fix-" followed
4625 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004626 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004627
4628 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004629 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004630 [git-cl] add support for hashtags
4631 Foo bar: implement foo
4632 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004633 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004634 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4635 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004636 parser.add_option('--bypass-watchlists', action='store_true',
4637 dest='bypass_watchlists',
4638 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004639 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004640 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004641 parser.add_option('--message', '-m', dest='message',
4642 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004643 parser.add_option('-b', '--bug',
4644 help='pre-populate the bug number(s) for this issue. '
4645 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004646 parser.add_option('--message-file', dest='message_file',
4647 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004648 parser.add_option('--title', '-t', dest='title',
4649 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004650 parser.add_option('-T', '--skip-title', action='store_true',
4651 dest='skip_title',
4652 help='Use the most recent commit message as the title of '
4653 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004654 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004655 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004656 help='reviewer email addresses')
4657 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004658 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004659 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004660 parser.add_option('--hashtag', dest='hashtags',
4661 action='append', default=[],
4662 help=('Gerrit hashtag for new CL; '
4663 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004664 parser.add_option('-s',
4665 '--send-mail',
4666 '--send-email',
4667 dest='send_mail',
4668 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004669 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004670 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004671 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004672 metavar='TARGET',
4673 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004674 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004675 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004676 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004677 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004678 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004679 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004680 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004681 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4682 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004683 parser.add_option('-c',
4684 '--use-commit-queue',
4685 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004686 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004687 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004688 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004689 parser.add_option('-d', '--cq-dry-run',
4690 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004691 help='Send the patchset to do a CQ dry run right after '
4692 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004693 parser.add_option(
4694 '-q',
4695 '--cq-quick-run',
4696 action='store_true',
4697 default=False,
4698 help='Send the patchset to do a CQ quick run right after '
4699 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4700 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004701 parser.add_option('--set-bot-commit', action='store_true',
4702 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004703 parser.add_option('--preserve-tryjobs', action='store_true',
4704 help='instruct the CQ to let tryjobs running even after '
4705 'new patchsets are uploaded instead of canceling '
4706 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004707 parser.add_option('--dependencies', action='store_true',
4708 help='Uploads CLs of all the local branches that depend on '
4709 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004710 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4711 help='Sends your change to the CQ after an approval. Only '
4712 'works on repos that have the Auto-Submit label '
4713 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004714 parser.add_option('--parallel', action='store_true',
4715 help='Run all tests specified by input_api.RunTests in all '
4716 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004717 parser.add_option('--no-autocc', action='store_true',
4718 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004719 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004720 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004721 parser.add_option('-R', '--retry-failed', action='store_true',
4722 help='Retry failed tryjobs from old patchset immediately '
4723 'after uploading new patchset. Cannot be used with '
4724 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004725 parser.add_option('--fixed', '-x',
4726 help='List of bugs that will be commented on and marked '
4727 'fixed (pre-populates "Fixed:" tag). Same format as '
4728 '-b option / "Bug:" tag. If fixing several issues, '
4729 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004730 parser.add_option('--edit-description', action='store_true', default=False,
4731 help='Modify description before upload. Cannot be used '
4732 'with --force. It is a noop when --no-squash is set '
4733 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004734 parser.add_option('--git-completion-helper', action="store_true",
4735 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004736 parser.add_option('-o',
4737 '--push-options',
4738 action='append',
4739 default=[],
4740 help='Transmit the given string to the server when '
4741 'performing git push (pass-through). See git-push '
4742 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004743 parser.add_option('--no-add-changeid',
4744 action='store_true',
4745 dest='no_add_changeid',
4746 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004747 parser.add_option('--no-python2-post-upload-hooks',
4748 action='store_true',
4749 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004750 parser.add_option('--cherry-pick-stacked',
4751 '--cp',
4752 dest='cherry_pick_stacked',
4753 action='store_true',
4754 help='If parent branch has un-uploaded updates, '
4755 'automatically skip parent branches and just upload '
4756 'the current branch cherry-pick on its parent\'s last '
4757 'uploaded commit. Allows users to skip the potential '
4758 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004759 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004760
rmistry@google.com2dd99862015-06-22 12:22:18 +00004761 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004762 (options, args) = parser.parse_args(args)
4763
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004764 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004765 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4766 if opt.help != optparse.SUPPRESS_HELP))
4767 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004768
sbc@chromium.org71437c02015-04-09 19:29:40 +00004769 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004770 return 1
4771
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004772 options.reviewers = cleanup_list(options.reviewers)
4773 options.cc = cleanup_list(options.cc)
4774
Josipe827b0f2020-01-30 00:07:20 +00004775 if options.edit_description and options.force:
4776 parser.error('Only one of --force and --edit-description allowed')
4777
tandriib80458a2016-06-23 12:20:07 -07004778 if options.message_file:
4779 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004780 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004781 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004782
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004783 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004784 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004785 options.use_commit_queue,
4786 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004787 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4788 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004789
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004790 if options.skip_title and options.title:
4791 parser.error('Only one of --title and --skip-title allowed.')
4792
Aaron Gableedbc4132017-09-11 13:22:28 -07004793 if options.use_commit_queue:
4794 options.send_mail = True
4795
Edward Lesmes0dd54822020-03-26 18:24:25 +00004796 if options.squash is None:
4797 # Load default for user, repo, squash=true, in this order.
4798 options.squash = settings.GetSquashGerritUploads()
4799
Joanna Wang5051ffe2023-03-01 22:24:07 +00004800 cl = Changelist(branchref=options.target_branch)
4801
4802 # Warm change details cache now to avoid RPCs later, reducing latency for
4803 # developers.
4804 if cl.GetIssue():
4805 cl._GetChangeDetail(
4806 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4807
4808 if options.retry_failed and not cl.GetIssue():
4809 print('No previous patchsets, so --retry-failed has no effect.')
4810 options.retry_failed = False
4811
Joanna Wangddd85782023-04-28 13:23:29 +00004812 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) != '0'
Joanna Wang5051ffe2023-03-01 22:24:07 +00004813
4814 if dogfood_stacked_changes:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004815 print(
4816 'This repo has been enrolled in the stacked changes dogfood.\n'
4817 '`git cl upload` now uploads the current branch and all upstream '
4818 'branches that have un-uploaded updates.\n'
4819 'Patches can now be reapplied with --force:\n'
4820 '`git cl patch --reapply --force`.\n'
4821 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
4822 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4823 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004824
Joanna Wangddd85782023-04-28 13:23:29 +00004825 if options.squash and dogfood_stacked_changes:
Brian Ryner8d19d862023-04-12 13:32:49 +00004826 print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4827 '"Set new changes to "work in progress" by default" checkbox at\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004828 'https://<host>-review.googlesource.com/settings/\n')
Joanna Wangdd12deb2023-01-26 20:43:28 +00004829 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004830 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004831
Joanna Wangd75fc882023-03-01 21:53:34 +00004832 if options.cherry_pick_stacked:
4833 try:
4834 orig_args.remove('--cherry-pick-stacked')
4835 except ValueError:
4836 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004837 UploadAllSquashed(options, orig_args)
4838 return 0
4839
Joanna Wangd75fc882023-03-01 21:53:34 +00004840 if options.cherry_pick_stacked:
4841 parser.error('--cherry-pick-stacked is not available for this workflow.')
4842
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004843 # cl.GetMostRecentPatchset uses cached information, and can return the last
4844 # patchset before upload. Calling it here makes it clear that it's the
4845 # last patchset before upload. Note that GetMostRecentPatchset will fail
4846 # if no CL has been uploaded yet.
4847 if options.retry_failed:
4848 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004849
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004850 ret = cl.CMDUpload(options, args, orig_args)
4851
4852 if options.retry_failed:
4853 if ret != 0:
4854 print('Upload failed, so --retry-failed has no effect.')
4855 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004856 builds, _ = _fetch_latest_builds(cl,
4857 DEFAULT_BUILDBUCKET_HOST,
4858 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004859 jobs = _filter_failed_for_retry(builds)
4860 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004861 print('No failed tryjobs, so --retry-failed has no effect.')
4862 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004863 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004864
4865 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004866
4867
Joanna Wang18de1f62023-01-21 01:24:24 +00004868def UploadAllSquashed(options, orig_args):
4869 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4870 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004871 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004872
Joanna Wangc710e2d2023-01-25 14:53:22 +00004873 # Create commits.
4874 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4875 if cherry_pick_current:
4876 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4877 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4878 uploads_by_cl.append((cls[0], new_upload))
4879 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004880 ordered_cls = list(reversed(cls))
4881
Joanna Wang6215dd02023-02-07 15:58:03 +00004882 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004883 # We can only support external changes when we're only uploading one
4884 # branch.
4885 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004886 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004887 if parent is None:
4888 origin = '.'
4889 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004890
Joanna Wang7603f042023-03-01 22:17:36 +00004891 while origin == '.':
4892 # Search for cl's closest ancestor with a gerrit hash.
4893 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4894 if origin == '.':
4895 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4896
4897 # Support the `git merge` and `git pull` workflow.
4898 if upstream_branch in ['master', 'main']:
4899 parent = cl.GetCommonAncestorWithUpstream()
4900 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004901 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4902 upstream_branch,
4903 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004904 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4905 upstream_branch,
4906 GERRIT_SQUASH_HASH_CONFIG_KEY)
4907 if parent:
4908 break
4909 branch = upstream_branch
4910 else:
4911 # Either the root of the tree is the cl's direct parent and the while
4912 # loop above only found empty branches between cl and the root of the
4913 # tree.
4914 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004915
Joanna Wang05b60342023-03-29 20:25:57 +00004916 if orig_parent is None:
4917 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004918 for i, cl in enumerate(ordered_cls):
4919 # If we're in the middle of the stack, set end_commit to downstream's
4920 # direct ancestor.
4921 if i + 1 < len(ordered_cls):
4922 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4923 else:
4924 child_base_commit = None
4925 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004926 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004927 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004928 end_commit=child_base_commit)
4929 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004930 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004931 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004932
4933 # Create refspec options
4934 cl, new_upload = uploads_by_cl[-1]
4935 refspec_opts = cl._GetRefSpecOptions(
4936 options,
4937 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004938 multi_change_upload=len(uploads_by_cl) > 1,
4939 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004940 refspec_suffix = ''
4941 if refspec_opts:
4942 refspec_suffix = '%' + ','.join(refspec_opts)
4943 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4944 refspec_suffix)
4945
4946 remote, remote_branch = cl.GetRemoteBranch()
4947 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4948 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4949 refspec_suffix)
4950
4951 # Git push
4952 git_push_metadata = {
4953 'gerrit_host':
4954 cl.GetGerritHost(),
4955 'title':
4956 options.title or '<untitled>',
4957 'change_id':
4958 git_footers.get_footer_change_id(new_upload.change_desc.description),
4959 'description':
4960 new_upload.change_desc.description,
4961 }
4962 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004963 git_push_metadata,
4964 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004965
4966 # Post push updates
4967 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4968 change_numbers = [
4969 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4970 ]
4971
4972 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4973 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4974
4975 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004976
4977
4978def _UploadAllPrecheck(options, orig_args):
4979 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4980 """Checks the state of the tree and gives the user uploading options
4981
4982 Returns: A tuple of the ordered list of changes that have new commits
4983 since their last upload and a boolean of whether the user wants to
4984 cherry-pick and upload the current branch instead of uploading all cls.
4985 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004986 cl = Changelist()
4987 if cl.GetBranch() is None:
4988 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4989
Joanna Wang18de1f62023-01-21 01:24:24 +00004990 branch_ref = None
4991 cls = []
4992 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004993 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004994
4995 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4996
4997 while True:
4998 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4999 DieWithError(
5000 'More than %s branches in the stack have not been uploaded.\n'
5001 'Are your branches in a misconfigured state?\n'
5002 'If not, please upload some upstream changes first.' %
5003 (_MAX_STACKED_BRANCHES_UPLOAD))
5004
5005 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005006
Joanna Wang6215dd02023-02-07 15:58:03 +00005007 # Only add CL if it has anything to commit.
5008 base_commit = cl.GetCommonAncestorWithUpstream()
5009 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5010
5011 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
5012 if diff:
5013 cls.append(cl)
5014 if (not first_pass and
5015 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5016 # We are mid-stack and the user must upload their upstream branches.
5017 must_upload_upstream = True
5018 elif first_pass: # The current branch has nothing to commit. Exit.
5019 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5020 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5021 first_pass = False
5022
5023 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005024 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005025 branch_ref = upstream_branch_ref # set branch for next run.
5026
Joanna Wang6215dd02023-02-07 15:58:03 +00005027 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5028 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5029 upstream_branch,
5030 LAST_UPLOAD_HASH_CONFIG_KEY)
5031
Joanna Wang18de1f62023-01-21 01:24:24 +00005032 # Case 1: We've reached the beginning of the tree.
5033 if origin != '.':
5034 break
5035
Joanna Wang18de1f62023-01-21 01:24:24 +00005036 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005037 # the user MUST upload them unless they are empty. Continue to
5038 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005039 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005040 continue
5041
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 # Case 3: If upstream's last_upload == cl.base_commit we do
5043 # not need to upload any more upstreams from this point on.
5044 # (Even if there may be diverged branches higher up the tree)
5045 if base_commit == upstream_last_upload:
5046 break
5047
5048 # Case 4: If upstream's last_upload < cl.base_commit we are
5049 # uploading cl and upstream_cl.
5050 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005051 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005052 continue
5053
5054 # Case 5: If cl.base_commit < upstream's last_upload the user
5055 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005056 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005057 DieWithError(
5058 'At least one branch in the stack has diverged from its upstream '
5059 'branch and does not contain its upstream\'s last upload.\n'
5060 'Please rebase the stack with `git rebase-update` before uploading.')
5061
5062 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5063 # any relation to commits in the tree. Continue up the tree until we hit
5064 # the root.
5065
5066 # We assume all cls in the stack have the same auth requirements and only
5067 # check this once.
5068 cls[0].EnsureAuthenticated(force=options.force)
5069
5070 cherry_pick = False
5071 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005072 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005073 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005074 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005075 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005076 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005077 msg = ('At least one parent branch in `%s` has never been uploaded '
5078 'and must be uploaded before/with `%s`.\n' %
5079 (branches, cls[1].branch))
5080 if options.cherry_pick_stacked:
5081 DieWithError(msg)
5082 if not options.force:
5083 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005084 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005085 if options.cherry_pick_stacked:
5086 print('cherry-picking `%s` on %s\'s last upload' %
5087 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005088 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005089 elif not options.force:
5090 answer = gclient_utils.AskForData(
5091 '\n' + opt_message +
5092 'Press enter to update branches %s.\nOr type `n` to upload only '
5093 '`%s` cherry-picked on %s\'s last upload:' %
5094 (branches, cls[0].branch, cls[1].branch))
5095 if answer.lower() == 'n':
5096 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005097 return cls, cherry_pick
5098
5099
Francois Dorayd42c6812017-05-30 15:10:20 -04005100@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005101@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005102def CMDsplit(parser, args):
5103 """Splits a branch into smaller branches and uploads CLs.
5104
5105 Creates a branch and uploads a CL for each group of files modified in the
5106 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005107 comment, the string '$directory', is replaced with the directory containing
5108 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005109 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005110 parser.add_option('-d', '--description', dest='description_file',
5111 help='A text file containing a CL description in which '
5112 '$directory will be replaced by each CL\'s directory.')
5113 parser.add_option('-c', '--comment', dest='comment_file',
5114 help='A text file containing a CL comment.')
5115 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005116 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005117 help='List the files and reviewers for each CL that would '
5118 'be created, but don\'t create branches or CLs.')
5119 parser.add_option('--cq-dry-run', action='store_true',
5120 help='If set, will do a cq dry run for each uploaded CL. '
5121 'Please be careful when doing this; more than ~10 CLs '
5122 'has the potential to overload our build '
5123 'infrastructure. Try to upload these not during high '
5124 'load times (usually 11-3 Mountain View time). Email '
5125 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005126 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5127 default=True,
5128 help='Sends your change to the CQ after an approval. Only '
5129 'works on repos that have the Auto-Submit label '
5130 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005131 parser.add_option('--max-depth',
5132 type='int',
5133 default=0,
5134 help='The max depth to look for OWNERS files. Useful for '
5135 'controlling the granularity of the split CLs, e.g. '
5136 '--max-depth=1 will only split by top-level '
5137 'directory. Specifying a value less than 1 means no '
5138 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005139 options, _ = parser.parse_args(args)
5140
5141 if not options.description_file:
5142 parser.error('No --description flag specified.')
5143
5144 def WrappedCMDupload(args):
5145 return CMDupload(OptionParser(), args)
5146
Daniel Cheng403c44e2022-10-05 22:24:58 +00005147 return split_cl.SplitCl(options.description_file, options.comment_file,
5148 Changelist, WrappedCMDupload, options.dry_run,
5149 options.cq_dry_run, options.enable_auto_submit,
5150 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005151
5152
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005153@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005154@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005155def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005156 """DEPRECATED: Used to commit the current changelist via git-svn."""
5157 message = ('git-cl no longer supports committing to SVN repositories via '
5158 'git-svn. You probably want to use `git cl land` instead.')
5159 print(message)
5160 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005161
5162
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005163@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005164@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005165def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005166 """Commits the current changelist via git.
5167
5168 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5169 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005170 """
5171 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5172 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005173 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005174 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005175 parser.add_option('--parallel', action='store_true',
5176 help='Run all tests specified by input_api.RunTests in all '
5177 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005178 parser.add_option('--resultdb', action='store_true',
5179 help='Run presubmit checks in the ResultSink environment '
5180 'and send results to the ResultDB database.')
5181 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005182 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005183
Edward Lemur934836a2019-09-09 20:16:54 +00005184 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005185
Robert Iannucci2e73d432018-03-14 01:10:47 -07005186 if not cl.GetIssue():
5187 DieWithError('You must upload the change first to Gerrit.\n'
5188 ' If you would rather have `git cl land` upload '
5189 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005190 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5191 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192
5193
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005194@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005195@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005196def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005197 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198 parser.add_option('-b', dest='newbranch',
5199 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005200 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005201 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005202 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005203 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005204
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005205 group = optparse.OptionGroup(
5206 parser,
5207 'Options for continuing work on the current issue uploaded from a '
5208 'different clone (e.g. different machine). Must be used independently '
5209 'from the other options. No issue number should be specified, and the '
5210 'branch must have an issue number associated with it')
5211 group.add_option('--reapply', action='store_true', dest='reapply',
5212 help='Reset the branch and reapply the issue.\n'
5213 'CAUTION: This will undo any local changes in this '
5214 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215
5216 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005217 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005218 parser.add_option_group(group)
5219
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005220 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005221
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005222 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005223 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005224 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005225 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005226 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005227
Edward Lemur934836a2019-09-09 20:16:54 +00005228 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005229 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005230 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005231
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005232 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005233 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005234 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005235
5236 RunGit(['reset', '--hard', upstream])
5237 if options.pull:
5238 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005239
Edward Lemur678a6842019-10-03 22:25:05 +00005240 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005241 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5242 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005243
5244 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005245 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005246
Edward Lemurf38bc172019-09-03 21:02:13 +00005247 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005248 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005249 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005250
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005251 # We don't want uncommitted changes mixed up with the patch.
5252 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005253 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005255 if options.newbranch:
5256 if options.force:
5257 RunGit(['branch', '-D', options.newbranch],
5258 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005259 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005260
Edward Lemur678a6842019-10-03 22:25:05 +00005261 cl = Changelist(
5262 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005263
Edward Lemur678a6842019-10-03 22:25:05 +00005264 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005265 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005266
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005267 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5268 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005269
5270
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005271def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272 """Fetches the tree status and returns either 'open', 'closed',
5273 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005274 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005275 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005276 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005277 if status.find('closed') != -1 or status == '0':
5278 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005279
5280 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005281 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005282
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 return 'unset'
5285
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005286
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287def GetTreeStatusReason():
5288 """Fetches the tree status from a json url and returns the message
5289 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005290 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005291 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005292 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293 status = json.loads(connection.read())
5294 connection.close()
5295 return status['message']
5296
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005297
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005298@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005300 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005301 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302 status = GetTreeStatus()
5303 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005304 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005305 return 2
5306
vapiera7fbd5a2016-06-16 09:17:49 -07005307 print('The tree is %s' % status)
5308 print()
5309 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005310 if status != 'open':
5311 return 1
5312 return 0
5313
5314
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005315@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005316def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005317 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5318 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005319 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005320 '-b', '--bot', action='append',
5321 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5322 'times to specify multiple builders. ex: '
5323 '"-b win_rel -b win_layout". See '
5324 'the try server waterfall for the builders name and the tests '
5325 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005326 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005327 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005328 help=('Buildbucket bucket to send the try requests. Format: '
5329 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005330 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005331 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005332 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005333 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005334 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005335 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005336 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005337 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005338 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005339 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005340 '-q',
5341 '--quick-run',
5342 action='store_true',
5343 default=False,
5344 help='trigger in quick run mode '
5345 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5346 'uick_run.md) (chromium only).')
5347 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005348 '--category', default='git_cl_try', help='Specify custom build category.')
5349 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005350 '--project',
5351 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005352 'in recipe to determine to which repository or directory to '
5353 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005354 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005355 '-p', '--property', dest='properties', action='append', default=[],
5356 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005357 'key2=value2 etc. The value will be treated as '
5358 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005359 'NOTE: using this may make your tryjob not usable for CQ, '
5360 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5363 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005364 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005365 parser.add_option(
5366 '-R', '--retry-failed', action='store_true', default=False,
5367 help='Retry failed jobs from the latest set of tryjobs. '
5368 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005369 parser.add_option(
5370 '-i', '--issue', type=int,
5371 help='Operate on this issue instead of the current branch\'s implicit '
5372 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005373 options, args = parser.parse_args(args)
5374
machenbach@chromium.org45453142015-09-15 08:45:22 +00005375 # Make sure that all properties are prop=value pairs.
5376 bad_params = [x for x in options.properties if '=' not in x]
5377 if bad_params:
5378 parser.error('Got properties with missing "=": %s' % bad_params)
5379
maruel@chromium.org15192402012-09-06 12:38:29 +00005380 if args:
5381 parser.error('Unknown arguments: %s' % args)
5382
Edward Lemur934836a2019-09-09 20:16:54 +00005383 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005384 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005385 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005386
Edward Lemurf38bc172019-09-03 21:02:13 +00005387 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005388 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005389
tandriie113dfd2016-10-11 10:20:12 -07005390 error_message = cl.CannotTriggerTryJobReason()
5391 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005392 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005393
Edward Lemur45768512020-03-02 19:03:14 +00005394 if options.bot:
5395 if options.retry_failed:
5396 parser.error('--bot is not compatible with --retry-failed.')
5397 if not options.bucket:
5398 parser.error('A bucket (e.g. "chromium/try") is required.')
5399
5400 triggered = [b for b in options.bot if 'triggered' in b]
5401 if triggered:
5402 parser.error(
5403 'Cannot schedule builds on triggered bots: %s.\n'
5404 'This type of bot requires an initial job from a parent (usually a '
5405 'builder). Schedule a job on the parent instead.\n' % triggered)
5406
5407 if options.bucket.startswith('.master'):
5408 parser.error('Buildbot masters are not supported.')
5409
5410 project, bucket = _parse_bucket(options.bucket)
5411 if project is None or bucket is None:
5412 parser.error('Invalid bucket: %s.' % options.bucket)
5413 jobs = sorted((project, bucket, bot) for bot in options.bot)
5414 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005415 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005416 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005417 if options.verbose:
5418 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005419 jobs = _filter_failed_for_retry(builds)
5420 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005421 print('There are no failed jobs in the latest set of jobs '
5422 '(patchset #%d), doing nothing.' % patchset)
5423 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005424 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005425 if num_builders > 10:
5426 confirm_or_exit('There are %d builders with failed builds.'
5427 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005428 elif options.quick_run:
5429 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5430 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005431 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005432 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005433 print('git cl try with no bots now defaults to CQ dry run.')
5434 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5435 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005436
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005437 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005438 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005439 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005440 except BuildbucketResponseException as ex:
5441 print('ERROR: %s' % ex)
5442 return 1
5443 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005444
5445
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005446@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005448 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005449 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005450 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005451 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005453 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005454 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005455 '--color', action='store_true', default=setup_color.IS_TTY,
5456 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005458 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5459 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005460 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005461 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005462 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005463 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005464 parser.add_option(
5465 '-i', '--issue', type=int,
5466 help='Operate on this issue instead of the current branch\'s implicit '
5467 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005468 options, args = parser.parse_args(args)
5469 if args:
5470 parser.error('Unrecognized args: %s' % ' '.join(args))
5471
Edward Lemur934836a2019-09-09 20:16:54 +00005472 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005473 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005474 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475
tandrii221ab252016-10-06 08:12:04 -07005476 patchset = options.patchset
5477 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005478 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005479 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005480 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005481 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005482 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005483 cl.GetIssue())
5484
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005485 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005486 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005487 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005489 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005490 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005491 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005492 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005493 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005494 return 0
5495
5496
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005497@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005498@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005499def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005500 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005501 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005502 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005503 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005504
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005505 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005506 if args:
5507 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005508 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005509 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005510 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005511 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005512
5513 # Clear configured merge-base, if there is one.
5514 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005515 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005516 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005517 return 0
5518
5519
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005520@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005521def CMDweb(parser, args):
5522 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005523 parser.add_option('-p',
5524 '--print-only',
5525 action='store_true',
5526 dest='print_only',
5527 help='Only print the Gerrit URL, don\'t open it in the '
5528 'browser.')
5529 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005530 if args:
5531 parser.error('Unrecognized args: %s' % ' '.join(args))
5532
5533 issue_url = Changelist().GetIssueURL()
5534 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005535 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005536 return 1
5537
Orr Bernstein0b960582022-12-22 20:16:18 +00005538 if options.print_only:
5539 print(issue_url)
5540 return 0
5541
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005542 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005543 # allows us to hide the "Created new window in existing browser session."
5544 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005545 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005546 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005547 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005548 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005549 os.open(os.devnull, os.O_RDWR)
5550 try:
5551 webbrowser.open(issue_url)
5552 finally:
5553 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005554 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005555 return 0
5556
5557
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005558@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005559def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005560 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005561 parser.add_option('-d', '--dry-run', action='store_true',
5562 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005563 parser.add_option(
5564 '-q',
5565 '--quick-run',
5566 action='store_true',
5567 help='trigger in quick run mode '
5568 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5569 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005570 parser.add_option('-c', '--clear', action='store_true',
5571 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005572 parser.add_option(
5573 '-i', '--issue', type=int,
5574 help='Operate on this issue instead of the current branch\'s implicit '
5575 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005576 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005577 if args:
5578 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005579 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5580 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005581
Edward Lemur934836a2019-09-09 20:16:54 +00005582 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005583 if not cl.GetIssue():
5584 parser.error('Must upload the issue first.')
5585
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005586 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005587 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005588 elif options.quick_run:
5589 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005590 elif options.dry_run:
5591 state = _CQState.DRY_RUN
5592 else:
5593 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005594 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005595 return 0
5596
5597
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005598@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005599def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005600 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005601 parser.add_option(
5602 '-i', '--issue', type=int,
5603 help='Operate on this issue instead of the current branch\'s implicit '
5604 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005605 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005606 if args:
5607 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005608 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005609 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005610 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005611 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005612 cl.CloseIssue()
5613 return 0
5614
5615
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005616@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005617def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005618 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005619 parser.add_option(
5620 '--stat',
5621 action='store_true',
5622 dest='stat',
5623 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005624 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005625 if args:
5626 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005627
Edward Lemur934836a2019-09-09 20:16:54 +00005628 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005629 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005630 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005631 if not issue:
5632 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005633
Gavin Makbe2e9262022-11-08 23:41:55 +00005634 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005635 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005636 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005637 if not base:
5638 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5639 revision_info = detail['revisions'][detail['current_revision']]
5640 fetch_info = revision_info['fetch']['http']
5641 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5642 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005643
Aaron Gablea718c3e2017-08-28 17:47:28 -07005644 cmd = ['git', 'diff']
5645 if options.stat:
5646 cmd.append('--stat')
5647 cmd.append(base)
5648 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005649
5650 return 0
5651
5652
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005653@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005654def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005655 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005656 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005657 '--ignore-current',
5658 action='store_true',
5659 help='Ignore the CL\'s current reviewers and start from scratch.')
5660 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005661 '--ignore-self',
5662 action='store_true',
5663 help='Do not consider CL\'s author as an owners.')
5664 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005665 '--no-color',
5666 action='store_true',
5667 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005668 parser.add_option(
5669 '--batch',
5670 action='store_true',
5671 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005672 # TODO: Consider moving this to another command, since other
5673 # git-cl owners commands deal with owners for a given CL.
5674 parser.add_option(
5675 '--show-all',
5676 action='store_true',
5677 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005678 options, args = parser.parse_args(args)
5679
Edward Lemur934836a2019-09-09 20:16:54 +00005680 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005681 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005682
Yang Guo6e269a02019-06-26 11:17:02 +00005683 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005684 if len(args) == 0:
5685 print('No files specified for --show-all. Nothing to do.')
5686 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005687 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005688 for path in args:
5689 print('Owners for %s:' % path)
5690 print('\n'.join(
5691 ' - %s' % owner
5692 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005693 return 0
5694
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005695 if args:
5696 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005697 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005698 base_branch = args[0]
5699 else:
5700 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005701 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005702
Edward Lemur2c62b332020-03-12 22:12:33 +00005703 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005704
5705 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005706 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5707 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005708 return 0
5709
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005710 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005711 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005712 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005713 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005714 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005715 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005716 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005717
5718
Aiden Bennerc08566e2018-10-03 17:52:42 +00005719def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005720 """Generates a diff command."""
5721 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005722 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5723
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005724 if allow_prefix:
5725 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5726 # case that diff.noprefix is set in the user's git config.
5727 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5728 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005729 diff_cmd += ['--no-prefix']
5730
5731 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005732
5733 if args:
5734 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005735 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005736 diff_cmd.append(arg)
5737 else:
5738 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005739
5740 return diff_cmd
5741
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005742
Jamie Madill5e96ad12020-01-13 16:08:35 +00005743def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5744 """Runs clang-format-diff and sets a return value if necessary."""
5745
5746 if not clang_diff_files:
5747 return 0
5748
5749 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5750 # formatted. This is used to block during the presubmit.
5751 return_value = 0
5752
5753 # Locate the clang-format binary in the checkout
5754 try:
5755 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5756 except clang_format.NotFoundError as e:
5757 DieWithError(e)
5758
5759 if opts.full or settings.GetFormatFullByDefault():
5760 cmd = [clang_format_tool]
5761 if not opts.dry_run and not opts.diff:
5762 cmd.append('-i')
5763 if opts.dry_run:
5764 for diff_file in clang_diff_files:
5765 with open(diff_file, 'r') as myfile:
5766 code = myfile.read().replace('\r\n', '\n')
5767 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5768 stdout = stdout.replace('\r\n', '\n')
5769 if opts.diff:
5770 sys.stdout.write(stdout)
5771 if code != stdout:
5772 return_value = 2
5773 else:
5774 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5775 if opts.diff:
5776 sys.stdout.write(stdout)
5777 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005778 try:
5779 script = clang_format.FindClangFormatScriptInChromiumTree(
5780 'clang-format-diff.py')
5781 except clang_format.NotFoundError as e:
5782 DieWithError(e)
5783
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005784 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005785 if not opts.dry_run and not opts.diff:
5786 cmd.append('-i')
5787
5788 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005789 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005790
Edward Lesmes89624cd2020-04-06 17:51:56 +00005791 env = os.environ.copy()
5792 env['PATH'] = (
5793 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5794 stdout = RunCommand(
5795 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005796 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005797 if opts.diff:
5798 sys.stdout.write(stdout)
5799 if opts.dry_run and len(stdout) > 0:
5800 return_value = 2
5801
5802 return return_value
5803
5804
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005805def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5806 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5807 presubmit checks have failed (and returns 0 otherwise)."""
5808
5809 if not rust_diff_files:
5810 return 0
5811
5812 # Locate the rustfmt binary.
5813 try:
5814 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5815 except rustfmt.NotFoundError as e:
5816 DieWithError(e)
5817
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005818 # TODO(crbug.com/1440869): Support formatting only the changed lines
5819 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005820 cmd = [rustfmt_tool]
5821 if opts.dry_run:
5822 cmd.append('--check')
5823 cmd += rust_diff_files
5824 rustfmt_exitcode = subprocess2.call(cmd)
5825
5826 if opts.presubmit and rustfmt_exitcode != 0:
5827 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005828
5829 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005830
5831
Olivier Robin0a6b5442022-04-07 07:25:04 +00005832def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5833 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5834 that presubmit checks have failed (and returns 0 otherwise)."""
5835
5836 if not swift_diff_files:
5837 return 0
5838
5839 # Locate the swift-format binary.
5840 try:
5841 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5842 except swift_format.NotFoundError as e:
5843 DieWithError(e)
5844
5845 cmd = [swift_format_tool]
5846 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005847 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005848 else:
5849 cmd += ['format', '-i']
5850 cmd += swift_diff_files
5851 swift_format_exitcode = subprocess2.call(cmd)
5852
5853 if opts.presubmit and swift_format_exitcode != 0:
5854 return 2
5855
5856 return 0
5857
5858
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005859def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005860 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005861 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005862
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005863
enne@chromium.org555cfe42014-01-29 18:21:39 +00005864@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005865@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005866def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005867 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005868 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005869 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005870 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005871 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005872 parser.add_option('--full', action='store_true',
5873 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005874 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005875 parser.add_option('--dry-run', action='store_true',
5876 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005877 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005878 '--no-clang-format',
5879 dest='clang_format',
5880 action='store_false',
5881 default=True,
5882 help='Disables formatting of various file types using clang-format.')
5883 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005884 '--python',
5885 action='store_true',
5886 default=None,
5887 help='Enables python formatting on all python files.')
5888 parser.add_option(
5889 '--no-python',
5890 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005891 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005892 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005893 'If neither --python or --no-python are set, python files that have a '
5894 '.style.yapf file in an ancestor directory will be formatted. '
5895 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005896 parser.add_option(
5897 '--js',
5898 action='store_true',
5899 help='Format javascript code with clang-format. '
5900 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005901 parser.add_option('--diff', action='store_true',
5902 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005903 parser.add_option('--presubmit', action='store_true',
5904 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005905
5906 parser.add_option('--rust-fmt',
5907 dest='use_rust_fmt',
5908 action='store_true',
5909 default=rustfmt.IsRustfmtSupported(),
5910 help='Enables formatting of Rust file types using rustfmt.')
5911 parser.add_option(
5912 '--no-rust-fmt',
5913 dest='use_rust_fmt',
5914 action='store_false',
5915 help='Disables formatting of Rust file types using rustfmt.')
5916
Olivier Robin0a6b5442022-04-07 07:25:04 +00005917 parser.add_option(
5918 '--swift-format',
5919 dest='use_swift_format',
5920 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005921 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005922 help='Enables formatting of Swift file types using swift-format '
5923 '(macOS host only).')
5924 parser.add_option(
5925 '--no-swift-format',
5926 dest='use_swift_format',
5927 action='store_false',
5928 help='Disables formatting of Swift file types using swift-format.')
5929
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005930 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005931
Garrett Beaty91a6f332020-01-06 16:57:24 +00005932 if opts.python is not None and opts.no_python:
5933 raise parser.error('Cannot set both --python and --no-python')
5934 if opts.no_python:
5935 opts.python = False
5936
Daniel Chengc55eecf2016-12-30 03:11:02 -08005937 # Normalize any remaining args against the current path, so paths relative to
5938 # the current directory are still resolved as expected.
5939 args = [os.path.join(os.getcwd(), arg) for arg in args]
5940
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005941 # git diff generates paths against the root of the repository. Change
5942 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005943 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005944 if rel_base_path:
5945 os.chdir(rel_base_path)
5946
digit@chromium.org29e47272013-05-17 17:01:46 +00005947 # Grab the merge-base commit, i.e. the upstream commit of the current
5948 # branch when it was created or the last time it was rebased. This is
5949 # to cover the case where the user may have called "git fetch origin",
5950 # moving the origin branch to a newer commit, but hasn't rebased yet.
5951 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005952 upstream_branch = opts.upstream
5953 if not upstream_branch:
5954 cl = Changelist()
5955 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005956 if upstream_branch:
5957 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5958 upstream_commit = upstream_commit.strip()
5959
5960 if not upstream_commit:
5961 DieWithError('Could not find base commit for this branch. '
5962 'Are you in detached state?')
5963
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005964 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5965 diff_output = RunGit(changed_files_cmd)
5966 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005967 # Filter out files deleted by this CL
5968 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005969
Andreas Haas417d89c2020-02-06 10:24:27 +00005970 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005971 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005972
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005973 clang_diff_files = []
5974 if opts.clang_format:
5975 clang_diff_files = [
5976 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5977 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005978 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005979 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005980 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005981 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005982
Edward Lesmes50da7702020-03-30 19:23:43 +00005983 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005984
Jamie Madill5e96ad12020-01-13 16:08:35 +00005985 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5986 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005987
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005988 if opts.use_rust_fmt:
5989 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5990 upstream_commit)
5991 if rust_fmt_return_value == 2:
5992 return_value = 2
5993
Olivier Robin0a6b5442022-04-07 07:25:04 +00005994 if opts.use_swift_format:
5995 if sys.platform != 'darwin':
5996 DieWithError('swift-format is only supported on macOS.')
5997 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5998 upstream_commit)
5999 if swift_format_return_value == 2:
6000 return_value = 2
6001
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006002 # Similar code to above, but using yapf on .py files rather than clang-format
6003 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006004 py_explicitly_disabled = opts.python is not None and not opts.python
6005 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00006006 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6007 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006008
Aiden Bennerc08566e2018-10-03 17:52:42 +00006009 # Used for caching.
6010 yapf_configs = {}
6011 for f in python_diff_files:
6012 # Find the yapf style config for the current file, defaults to depot
6013 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006014 _FindYapfConfigFile(f, yapf_configs, top_dir)
6015
6016 # Turn on python formatting by default if a yapf config is specified.
6017 # This breaks in the case of this repo though since the specified
6018 # style file is also the global default.
6019 if opts.python is None:
6020 filtered_py_files = []
6021 for f in python_diff_files:
6022 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6023 filtered_py_files.append(f)
6024 else:
6025 filtered_py_files = python_diff_files
6026
6027 # Note: yapf still seems to fix indentation of the entire file
6028 # even if line ranges are specified.
6029 # See https://github.com/google/yapf/issues/499
6030 if not opts.full and filtered_py_files:
6031 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6032
Brian Sheedyb4307d52019-12-02 19:18:17 +00006033 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6034 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6035 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006036
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006037 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006038 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6039 # Default to pep8 if not .style.yapf is found.
6040 if not yapf_style:
6041 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006042
Peter Wend9399922020-06-17 17:33:49 +00006043 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006044 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006045 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006046 else:
6047 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006048
6049 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006050
6051 has_formattable_lines = False
6052 if not opts.full:
6053 # Only run yapf over changed line ranges.
6054 for diff_start, diff_len in py_line_diffs[f]:
6055 diff_end = diff_start + diff_len - 1
6056 # Yapf errors out if diff_end < diff_start but this
6057 # is a valid line range diff for a removal.
6058 if diff_end >= diff_start:
6059 has_formattable_lines = True
6060 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6061 # If all line diffs were removals we have nothing to format.
6062 if not has_formattable_lines:
6063 continue
6064
6065 if opts.diff or opts.dry_run:
6066 cmd += ['--diff']
6067 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006068 stdout = RunCommand(cmd,
6069 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006070 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006071 cwd=top_dir,
6072 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006073 if opts.diff:
6074 sys.stdout.write(stdout)
6075 elif len(stdout) > 0:
6076 return_value = 2
6077 else:
6078 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006079 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006080
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006081 # Format GN build files. Always run on full build files for canonical form.
6082 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006083 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006084 if opts.dry_run or opts.diff:
6085 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006086 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006087 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006088 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006089 cwd=top_dir)
6090 if opts.dry_run and gn_ret == 2:
6091 return_value = 2 # Not formatted.
6092 elif opts.diff and gn_ret == 2:
6093 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006094 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006095 elif gn_ret != 0:
6096 # For non-dry run cases (and non-2 return values for dry-run), a
6097 # nonzero error code indicates a failure, probably because the file
6098 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006099 DieWithError('gn format failed on ' + gn_diff_file +
6100 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006101
Ilya Shermane081cbe2017-08-15 17:51:04 -07006102 # Skip the metrics formatting from the global presubmit hook. These files have
6103 # a separate presubmit hook that issues an error if the files need formatting,
6104 # whereas the top-level presubmit script merely issues a warning. Formatting
6105 # these files is somewhat slow, so it's important not to duplicate the work.
6106 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006107 for diff_xml in GetDiffXMLs(diff_files):
6108 xml_dir = GetMetricsDir(diff_xml)
6109 if not xml_dir:
6110 continue
6111
Ilya Shermane081cbe2017-08-15 17:51:04 -07006112 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006113 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006114 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006115
6116 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6117 # command as histograms/pretty_print.py now needs a relative path argument
6118 # after splitting the histograms into multiple directories.
6119 # For example, in tools/metrics/ukm, pretty-print could be run using:
6120 # $ python pretty_print.py
6121 # But in tools/metrics/histogrmas, pretty-print should be run with an
6122 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006123 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006124 # $ python pretty_print.py enums.xml
6125
Weilun Shib92c4b72020-08-27 17:45:11 +00006126 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006127 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006128 cmd.append(diff_xml)
6129
Ilya Shermane081cbe2017-08-15 17:51:04 -07006130 if opts.dry_run or opts.diff:
6131 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006132
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006133 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6134 # `shell` param and instead replace `'vpython'` with
6135 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006136 stdout = RunCommand(cmd,
6137 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006138 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006139 if opts.diff:
6140 sys.stdout.write(stdout)
6141 if opts.dry_run and stdout:
6142 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006143
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006144 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006145
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006146
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006147def GetDiffXMLs(diff_files):
6148 return [
6149 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6150 ]
6151
6152
6153def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006154 metrics_xml_dirs = [
6155 os.path.join('tools', 'metrics', 'actions'),
6156 os.path.join('tools', 'metrics', 'histograms'),
6157 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006158 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006159 os.path.join('tools', 'metrics', 'ukm'),
6160 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006161 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006162 if diff_xml.startswith(xml_dir):
6163 return xml_dir
6164 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006165
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006166
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006167@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006168@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006169def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006170 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006171 _, args = parser.parse_args(args)
6172
6173 if len(args) != 1:
6174 parser.print_help()
6175 return 1
6176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006177 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006178 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006179 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006180
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006181 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006182
Edward Lemur52969c92020-02-06 18:15:28 +00006183 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006184 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006185 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006186
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006187 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006188 for key, issue in [x.split() for x in output.splitlines()]:
6189 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006190 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006191
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006192 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006193 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006194 return 1
6195 if len(branches) == 1:
6196 RunGit(['checkout', branches[0]])
6197 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006198 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006199 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006200 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006201 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006202 try:
6203 RunGit(['checkout', branches[int(which)]])
6204 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006205 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006206 return 1
6207
6208 return 0
6209
6210
maruel@chromium.org29404b52014-09-08 22:58:00 +00006211def CMDlol(parser, args):
6212 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006213 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006214 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6215 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6216 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006217 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006218 return 0
6219
6220
Josip Sokcevic0399e172022-03-21 23:11:51 +00006221def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006222 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006223 print(utils.depot_tools_version())
6224
6225
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006226class OptionParser(optparse.OptionParser):
6227 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006228
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006229 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006230 optparse.OptionParser.__init__(
6231 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006232 self.add_option(
6233 '-v', '--verbose', action='count', default=0,
6234 help='Use 2 times for more debugging info')
6235
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006236 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006237 try:
6238 return self._parse_args(args)
6239 finally:
6240 # Regardless of success or failure of args parsing, we want to report
6241 # metrics, but only after logging has been initialized (if parsing
6242 # succeeded).
6243 global settings
6244 settings = Settings()
6245
Edward Lesmes9c349062021-05-06 20:02:39 +00006246 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006247 try:
6248 # GetViewVCUrl ultimately calls logging method.
6249 project_url = settings.GetViewVCUrl().strip('/+')
6250 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6251 metrics.collector.add('project_urls', [project_url])
6252 except subprocess2.CalledProcessError:
6253 # Occurs when command is not executed in a git repository
6254 # We should not fail here. If the command needs to be executed
6255 # in a repo, it will be raised later.
6256 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006257
6258 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006259 # Create an optparse.Values object that will store only the actual passed
6260 # options, without the defaults.
6261 actual_options = optparse.Values()
6262 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6263 # Create an optparse.Values object with the default options.
6264 options = optparse.Values(self.get_default_values().__dict__)
6265 # Update it with the options passed by the user.
6266 options._update_careful(actual_options.__dict__)
6267 # Store the options passed by the user in an _actual_options attribute.
6268 # We store only the keys, and not the values, since the values can contain
6269 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006270 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006271
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006272 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006273 logging.basicConfig(
6274 level=levels[min(options.verbose, len(levels) - 1)],
6275 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6276 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006277
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006278 return options, args
6279
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006280
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006281def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006282 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006283 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006284 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006285 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006286
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006287 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006288 dispatcher = subcommand.CommandDispatcher(__name__)
6289 try:
6290 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006291 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006292 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006293 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006294 if e.code != 500:
6295 raise
6296 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006297 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006298 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006299 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006300
6301
6302if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006303 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6304 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006305 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006306 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006307 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006308 sys.exit(main(sys.argv[1:]))