blob: bc58ef23aba97ae05366eabc89ab1a516cdc9221 [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
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Josip Sokcevic512fd3b2023-03-01 21:06:41 +000058from lib import utils
Edward Lemur79d4f992019-11-11 23:49:02 +000059from third_party import six
60from six.moves import urllib
61
62
63if sys.version_info.major == 3:
64 basestring = (str,) # pylint: disable=redefined-builtin
65
Edward Lemurb9830242019-10-30 22:19:20 +000066
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
Edward Lemur0f58ae42019-04-30 17:24:12 +000069# Traces for git push will be stored in a traces directory inside the
70# depot_tools checkout.
71DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
72TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000073PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000074
75# When collecting traces, Git hashes will be reduced to 6 characters to reduce
76# the size after compression.
77GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
78# Used to redact the cookies from the gitcookies file.
79GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
80
Edward Lemurd4d1ba42019-09-20 21:46:37 +000081MAX_ATTEMPTS = 3
82
Edward Lemur1b52d872019-05-09 21:12:12 +000083# The maximum number of traces we will keep. Multiplied by 3 since we store
84# 3 files per trace.
85MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000086# Message to be displayed to the user to inform where to find the traces for a
87# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000088TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000089'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000091' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000092'Copies of your gitcookies file and git config have been recorded at:\n'
93' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000094# Format of the message to be stored as part of the traces to give developers a
95# better context when they go through traces.
96TRACES_README_FORMAT = (
97'Date: %(now)s\n'
98'\n'
99'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
100'Title: %(title)s\n'
101'\n'
102'%(description)s\n'
103'\n'
104'Execution time: %(execution_time)s\n'
105'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000106
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800107POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000108DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000109REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000110 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
111 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000112}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000114DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
115DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
116
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000117DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
118
thestig@chromium.org44202a22014-03-11 19:22:18 +0000119# Valid extensions for files we want to lint.
120DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
121DEFAULT_LINT_IGNORE_REGEX = r"$^"
122
Aiden Bennerc08566e2018-10-03 17:52:42 +0000123# File name for yapf style config files.
124YAPF_CONFIG_FILENAME = '.style.yapf'
125
Edward Lesmes50da7702020-03-30 19:23:43 +0000126# The issue, patchset and codereview server are stored on git config for each
127# branch under branch.<branch-name>.<config-key>.
128ISSUE_CONFIG_KEY = 'gerritissue'
129PATCHSET_CONFIG_KEY = 'gerritpatchset'
130CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000131# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
132# you make to Gerrit. Instead, it creates a new commit object that contains all
133# changes you've made, diffed against a parent/merge base.
134# This is the hash of the new squashed commit and you can find this on Gerrit.
135GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
136# This is the latest uploaded local commit hash.
137LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000138
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000139# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000140Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000141
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000142# Initialized in main()
143settings = None
144
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100145# Used by tests/git_cl_test.py to add extra logging.
146# Inside the weirdly failing test, add this:
147# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700148# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100149_IS_BEING_TESTED = False
150
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000151_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000152
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000153_KNOWN_GERRIT_TO_SHORT_URLS = {
154 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
155 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
156}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000157assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
158 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000159
160
Joanna Wang18de1f62023-01-21 01:24:24 +0000161# Maximum number of branches in a stack that can be traversed and uploaded
162# at once. Picked arbitrarily.
163_MAX_STACKED_BRANCHES_UPLOAD = 20
164
165
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000166class GitPushError(Exception):
167 pass
168
169
Christopher Lamf732cd52017-01-24 12:40:11 +1100170def DieWithError(message, change_desc=None):
171 if change_desc:
172 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000173 print('\n ** Content of CL description **\n' +
174 '='*72 + '\n' +
175 change_desc.description + '\n' +
176 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100177
vapiera7fbd5a2016-06-16 09:17:49 -0700178 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 sys.exit(1)
180
181
Christopher Lamf732cd52017-01-24 12:40:11 +1100182def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000183 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000184 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000185 with open(backup_path, 'wb') as backup_file:
186 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100187
188
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000189def GetNoGitPagerEnv():
190 env = os.environ.copy()
191 # 'cat' is a magical git string that disables pagers on all platforms.
192 env['GIT_PAGER'] = 'cat'
193 return env
194
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000195
bsep@chromium.org627d9002016-04-29 00:00:52 +0000196def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000198 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
199 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000200 except subprocess2.CalledProcessError as e:
201 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000202 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000203 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
204 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000205 out = e.stdout.decode('utf-8', 'replace')
206 if e.stderr:
207 out += e.stderr.decode('utf-8', 'replace')
208 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000209
210
211def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000212 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000213 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000214
215
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000216def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000217 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700218 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000219 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700220 else:
221 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000222 try:
tandrii5d48c322016-08-18 16:19:37 -0700223 (out, _), code = subprocess2.communicate(['git'] + args,
224 env=GetNoGitPagerEnv(),
225 stdout=subprocess2.PIPE,
226 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000227 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700228 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900229 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000230 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000231
232
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000233def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000234 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000235 return RunGitWithCode(args, suppress_stderr=True)[1]
236
237
tandrii2a16b952016-10-19 07:09:44 -0700238def time_sleep(seconds):
239 # Use this so that it can be mocked in tests without interfering with python
240 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700241 return time.sleep(seconds)
242
243
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000244def time_time():
245 # Use this so that it can be mocked in tests without interfering with python
246 # system machinery.
247 return time.time()
248
249
Edward Lemur1b52d872019-05-09 21:12:12 +0000250def datetime_now():
251 # Use this so that it can be mocked in tests without interfering with python
252 # system machinery.
253 return datetime.datetime.now()
254
255
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256def confirm_or_exit(prefix='', action='confirm'):
257 """Asks user to press enter to continue or press Ctrl+C to abort."""
258 if not prefix or prefix.endswith('\n'):
259 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100260 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100261 mid = ' Press'
262 elif prefix.endswith(' '):
263 mid = 'press'
264 else:
265 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000266 gclient_utils.AskForData(
267 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100268
269
270def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000271 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000272 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100273 while True:
274 if 'yes'.startswith(result):
275 return True
276 if 'no'.startswith(result):
277 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000278 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100279
280
machenbach@chromium.org45453142015-09-15 08:45:22 +0000281def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000282 prop_list = getattr(options, 'properties', [])
283 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285 try:
286 properties[key] = json.loads(val)
287 except ValueError:
288 pass # If a value couldn't be evaluated, treat it as a string.
289 return properties
290
291
Edward Lemur4c707a22019-09-24 21:13:43 +0000292def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000293 """Calls a buildbucket v2 method and returns the parsed json response."""
294 headers = {
295 'Accept': 'application/json',
296 'Content-Type': 'application/json',
297 }
298 request = json.dumps(request)
299 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
300
301 logging.info('POST %s with %s' % (url, request))
302
303 attempts = 1
304 time_to_sleep = 1
305 while True:
306 response, content = http.request(url, 'POST', body=request, headers=headers)
307 if response.status == 200:
308 return json.loads(content[4:])
309 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
310 msg = '%s error when calling POST %s with %s: %s' % (
311 response.status, url, request, content)
312 raise BuildbucketResponseException(msg)
313 logging.debug(
314 '%s error when calling POST %s with %s. '
315 'Sleeping for %d seconds and retrying...' % (
316 response.status, url, request, time_to_sleep))
317 time.sleep(time_to_sleep)
318 time_to_sleep *= 2
319 attempts += 1
320
321 assert False, 'unreachable'
322
323
Edward Lemur6215c792019-10-03 21:59:05 +0000324def _parse_bucket(raw_bucket):
325 legacy = True
326 project = bucket = None
327 if '/' in raw_bucket:
328 legacy = False
329 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000331 elif raw_bucket.startswith('luci.'):
332 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000334 elif '.' in raw_bucket:
335 project = raw_bucket.split('.')[0]
336 bucket = raw_bucket
337 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000338 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000339 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
340 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000341
342
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000343def _canonical_git_googlesource_host(host):
344 """Normalizes Gerrit hosts (with '-review') to Git host."""
345 assert host.endswith(_GOOGLESOURCE)
346 # Prefix doesn't include '.' at the end.
347 prefix = host[:-(1 + len(_GOOGLESOURCE))]
348 if prefix.endswith('-review'):
349 prefix = prefix[:-len('-review')]
350 return prefix + '.' + _GOOGLESOURCE
351
352
353def _canonical_gerrit_googlesource_host(host):
354 git_host = _canonical_git_googlesource_host(host)
355 prefix = git_host.split('.', 1)[0]
356 return prefix + '-review.' + _GOOGLESOURCE
357
358
359def _get_counterpart_host(host):
360 assert host.endswith(_GOOGLESOURCE)
361 git = _canonical_git_googlesource_host(host)
362 gerrit = _canonical_gerrit_googlesource_host(git)
363 return git if gerrit == host else gerrit
364
365
Quinten Yearsley777660f2020-03-04 23:37:06 +0000366def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700368
369 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000370 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000371 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700372 options: Command-line options.
373 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000374 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000375 for project, bucket, builder in jobs:
376 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377 print('To see results here, run: git cl try-results')
378 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700379
Quinten Yearsley777660f2020-03-04 23:37:06 +0000380 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000381 if not requests:
382 return
383
Edward Lemur5b929a42019-10-21 17:57:39 +0000384 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 http.force_exception_to_status_code = True
386
387 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000388 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
389 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000390
391 errors = [
392 ' ' + response['error']['message']
393 for response in batch_response.get('responses', [])
394 if 'error' in response
395 ]
396 if errors:
397 raise BuildbucketResponseException(
398 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
399
400
Quinten Yearsley777660f2020-03-04 23:37:06 +0000401def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000402 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000403 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000404 shared_properties = {
405 'category': options.ensure_value('category', 'git_cl_try')
406 }
407 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000408 shared_properties['clobber'] = True
409 shared_properties.update(_get_properties_from_options(options) or {})
410
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000411 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000412 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000413 shared_tags.append({'key': 'retry_failed',
414 'value': '1'})
415
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000416 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000417 for (project, bucket, builder) in jobs:
418 properties = shared_properties.copy()
419 if 'presubmit' in builder.lower():
420 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000421
Edward Lemur45768512020-03-02 19:03:14 +0000422 requests.append({
423 'scheduleBuild': {
424 'requestId': str(uuid.uuid4()),
425 'builder': {
426 'project': getattr(options, 'project', None) or project,
427 'bucket': bucket,
428 'builder': builder,
429 },
430 'gerritChanges': gerrit_changes,
431 'properties': properties,
432 'tags': [
433 {'key': 'builder', 'value': builder},
434 ] + shared_tags,
435 }
436 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000437
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000438 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000439 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000440 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000441 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000442 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 'id': options.revision,
444 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000446
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000447 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000448
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000449
Quinten Yearsley777660f2020-03-04 23:37:06 +0000450def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000451 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000452
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000453 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000454 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000455 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000456 request = {
457 'predicate': {
458 'gerritChanges': [changelist.GetGerritChange(patchset)],
459 },
460 'fields': ','.join('builds.*.' + field for field in fields),
461 }
tandrii221ab252016-10-06 08:12:04 -0700462
Edward Lemur5b929a42019-10-21 17:57:39 +0000463 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000464 if authenticator.has_cached_credentials():
465 http = authenticator.authorize(httplib2.Http())
466 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700467 print('Warning: Some results might be missing because %s' %
468 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000469 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000470 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000471 http.force_exception_to_status_code = True
472
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000473 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
474 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475
Edward Lemur45768512020-03-02 19:03:14 +0000476
Edward Lemur5b929a42019-10-21 17:57:39 +0000477def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000478 """Fetches builds from the latest patchset that has builds (within
479 the last few patchsets).
480
481 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 changelist (Changelist): The CL to fetch builds for
483 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000484 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
485 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000487 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
488 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 """
490 assert buildbucket_host
491 assert changelist.GetIssue(), 'CL must be uploaded first'
492 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000493 if latest_patchset is None:
494 assert changelist.GetMostRecentPatchset()
495 ps = changelist.GetMostRecentPatchset()
496 else:
497 assert latest_patchset > 0, latest_patchset
498 ps = latest_patchset
499
Quinten Yearsley983111f2019-09-26 17:18:48 +0000500 min_ps = max(1, ps - 5)
501 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000502 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000503 if len(builds):
504 return builds, ps
505 ps -= 1
506 return [], 0
507
508
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000509def _filter_failed_for_retry(all_builds):
510 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000511
512 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000513 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000514 i.e. a list of buildbucket.v2.Builds which includes status and builder
515 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000516
517 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000518 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000519 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520 """
Edward Lemur45768512020-03-02 19:03:14 +0000521 grouped = {}
522 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000523 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000524 key = (builder['project'], builder['bucket'], builder['builder'])
525 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000526
Edward Lemur45768512020-03-02 19:03:14 +0000527 jobs = []
528 for (project, bucket, builder), builds in grouped.items():
529 if 'triggered' in builder:
530 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
531 'from a parent. Please schedule a manual job for the parent '
532 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533 continue
534 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
535 # Don't retry if any are running.
536 continue
Edward Lemur45768512020-03-02 19:03:14 +0000537 # If builder had several builds, retry only if the last one failed.
538 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
539 # build, but in case of retrying failed jobs retrying a flaky one makes
540 # sense.
541 builds = sorted(builds, key=lambda b: b['createTime'])
542 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
543 continue
544 # Don't retry experimental build previously triggered by CQ.
545 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
546 for t in builds[-1]['tags']):
547 continue
548 jobs.append((project, bucket, builder))
549
550 # Sort the jobs to make testing easier.
551 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000552
553
Quinten Yearsley777660f2020-03-04 23:37:06 +0000554def _print_tryjobs(options, builds):
555 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000557 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 return
559
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000560 longest_builder = max(len(b['builder']['builder']) for b in builds)
561 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
564 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 builds_by_status = {}
567 for b in builds:
568 builds_by_status.setdefault(b['status'], []).append({
569 'id': b['id'],
570 'name': name_fmt.format(
571 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
572 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000574 sort_key = lambda b: (b['name'], b['id'])
575
576 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 if not builds:
579 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000582 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000583 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 else:
585 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
586
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 print(colorize(title))
588 for b in sorted(builds, key=sort_key):
589 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590
591 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 print_builds(
593 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
594 print_builds(
595 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
596 color=Fore.MAGENTA)
597 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
598 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
599 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000600 print_builds('Started:', builds_by_status.pop('STARTED', []),
601 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print_builds(
603 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000604 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 print_builds(
606 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000607 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608
609
Aiden Bennerc08566e2018-10-03 17:52:42 +0000610def _ComputeDiffLineRanges(files, upstream_commit):
611 """Gets the changed line ranges for each file since upstream_commit.
612
613 Parses a git diff on provided files and returns a dict that maps a file name
614 to an ordered list of range tuples in the form (start_line, count).
615 Ranges are in the same format as a git diff.
616 """
617 # If files is empty then diff_output will be a full diff.
618 if len(files) == 0:
619 return {}
620
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000621 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000622 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 diff_output = RunGit(diff_cmd)
624
625 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
626 # 2 capture groups
627 # 0 == fname of diff file
628 # 1 == 'diff_start,diff_count' or 'diff_start'
629 # will match each of
630 # diff --git a/foo.foo b/foo.py
631 # @@ -12,2 +14,3 @@
632 # @@ -12,2 +17 @@
633 # running re.findall on the above string with pattern will give
634 # [('foo.py', ''), ('', '14,3'), ('', '17')]
635
636 curr_file = None
637 line_diffs = {}
638 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
639 if match[0] != '':
640 # Will match the second filename in diff --git a/a.py b/b.py.
641 curr_file = match[0]
642 line_diffs[curr_file] = []
643 else:
644 # Matches +14,3
645 if ',' in match[1]:
646 diff_start, diff_count = match[1].split(',')
647 else:
648 # Single line changes are of the form +12 instead of +12,1.
649 diff_start = match[1]
650 diff_count = 1
651
652 diff_start = int(diff_start)
653 diff_count = int(diff_count)
654
655 # If diff_count == 0 this is a removal we can ignore.
656 line_diffs[curr_file].append((diff_start, diff_count))
657
658 return line_diffs
659
660
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000661def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000662 """Checks if a yapf file is in any parent directory of fpath until top_dir.
663
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000664 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000665 is found returns None. Uses yapf_config_cache as a cache for previously found
666 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000667 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000669 # Return result if we've already computed it.
670 if fpath in yapf_config_cache:
671 return yapf_config_cache[fpath]
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 parent_dir = os.path.dirname(fpath)
674 if os.path.isfile(fpath):
675 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 # Otherwise fpath is a directory
678 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
679 if os.path.isfile(yapf_file):
680 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000681 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 # If we're at the top level directory, or if we're at root
683 # there is no provided style.
684 ret = None
685 else:
686 # Otherwise recurse on the current directory.
687 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 yapf_config_cache[fpath] = ret
689 return ret
690
691
Brian Sheedyb4307d52019-12-02 19:18:17 +0000692def _GetYapfIgnorePatterns(top_dir):
693 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000694
695 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
696 but this functionality appears to break when explicitly passing files to
697 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000698 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000699 the .yapfignore file should be in the directory that yapf is invoked from,
700 which we assume to be the top level directory in this case.
701
702 Args:
703 top_dir: The top level directory for the repository being formatted.
704
705 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000707 """
708 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000709 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000710 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000711 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000712
Anthony Politoc64e3902021-04-30 21:55:25 +0000713 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
714 stripped_line = line.strip()
715 # Comments and blank lines should be ignored.
716 if stripped_line.startswith('#') or stripped_line == '':
717 continue
718 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000719 return ignore_patterns
720
721
722def _FilterYapfIgnoredFiles(filepaths, patterns):
723 """Filters out any filepaths that match any of the given patterns.
724
725 Args:
726 filepaths: An iterable of strings containing filepaths to filter.
727 patterns: An iterable of strings containing fnmatch patterns to filter on.
728
729 Returns:
730 A list of strings containing all the elements of |filepaths| that did not
731 match any of the patterns in |patterns|.
732 """
733 # Not inlined so that tests can use the same implementation.
734 return [f for f in filepaths
735 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000736
737
Aaron Gable13101a62018-02-09 13:20:41 -0800738def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000739 """Prints statistics about the change to the user."""
740 # --no-ext-diff is broken in some versions of Git, so try to work around
741 # this by overriding the environment (but there is still a problem if the
742 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000743 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000744 if 'GIT_EXTERNAL_DIFF' in env:
745 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000747 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800748 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000749 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750
751
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000752class BuildbucketResponseException(Exception):
753 pass
754
755
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756class Settings(object):
757 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000759 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000760 self.tree_status_url = None
761 self.viewvc_url = None
762 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000763 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000764 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000765 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000766 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000767 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000768 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769
Edward Lemur26964072020-02-19 19:18:51 +0000770 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000772 if self.updated:
773 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000774
Edward Lemur26964072020-02-19 19:18:51 +0000775 # The only value that actually changes the behavior is
776 # autoupdate = "false". Everything else means "true".
777 autoupdate = (
778 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
779
780 cr_settings_file = FindCodereviewSettingsFile()
781 if autoupdate != 'false' and cr_settings_file:
782 LoadCodereviewSettingsFromFile(cr_settings_file)
783 cr_settings_file.close()
784
785 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000787 @staticmethod
788 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000789 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000792 if self.root is None:
793 self.root = os.path.abspath(self.GetRelativeRoot())
794 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 def GetTreeStatusUrl(self, error_ok=False):
797 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000798 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
799 if self.tree_status_url is None and not error_ok:
800 DieWithError(
801 'You must configure your tree status URL by running '
802 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 return self.tree_status_url
804
805 def GetViewVCUrl(self):
806 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 return self.viewvc_url
809
rmistry@google.com90752582014-01-14 21:04:50 +0000810 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000811 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000812
rmistry@google.com5626a922015-02-26 14:03:30 +0000813 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000814 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000815 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000816 return run_post_upload_hook == "True"
817
Joanna Wangc8f23e22023-01-19 21:18:10 +0000818 def GetDefaultCCList(self):
819 return self._GetConfig('rietveld.cc')
820
Dirk Pranke6f0df682021-06-25 00:42:33 +0000821 def GetUsePython3(self):
822 return self._GetConfig('rietveld.use-python3')
823
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000824 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000825 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000826 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000827 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
828 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000829 # Default is squash now (http://crbug.com/611892#c23).
830 self.squash_gerrit_uploads = self._GetConfig(
831 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000832 return self.squash_gerrit_uploads
833
Edward Lesmes4de54132020-05-05 19:41:33 +0000834 def GetSquashGerritUploadsOverride(self):
835 """Return True or False if codereview.settings should be overridden.
836
837 Returns None if no override has been defined.
838 """
839 # See also http://crbug.com/611892#c23
840 result = self._GetConfig('gerrit.override-squash-uploads').lower()
841 if result == 'true':
842 return True
843 if result == 'false':
844 return False
845 return None
846
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000847 def GetIsGerrit(self):
848 """Return True if gerrit.host is set."""
849 if self.is_gerrit is None:
850 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
851 return self.is_gerrit
852
tandrii@chromium.org28253532016-04-14 13:46:56 +0000853 def GetGerritSkipEnsureAuthenticated(self):
854 """Return True if EnsureAuthenticated should not be done for Gerrit
855 uploads."""
856 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000857 self.gerrit_skip_ensure_authenticated = self._GetConfig(
858 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 return self.gerrit_skip_ensure_authenticated
860
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000861 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000862 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000863 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000864 # Git requires single quotes for paths with spaces. We need to replace
865 # them with double quotes for Windows to treat such paths as a single
866 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000867 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000868 return self.git_editor or None
869
thestig@chromium.org44202a22014-03-11 19:22:18 +0000870 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000871 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000872
873 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000874 return self._GetConfig(
875 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000877 def GetFormatFullByDefault(self):
878 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000879 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000880 result = (
881 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
882 error_ok=True).strip())
883 self.format_full_by_default = (result == 'true')
884 return self.format_full_by_default
885
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000886 def IsStatusCommitOrderByDate(self):
887 if self.is_status_commit_order_by_date is None:
888 result = (RunGit(['config', '--bool', 'cl.date-order'],
889 error_ok=True).strip())
890 self.is_status_commit_order_by_date = (result == 'true')
891 return self.is_status_commit_order_by_date
892
Edward Lemur26964072020-02-19 19:18:51 +0000893 def _GetConfig(self, key, default=''):
894 self._LazyUpdateIfNeeded()
895 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000896
897
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000898class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000899 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000900 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000901 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000902 DRY_RUN = 'dry_run'
903 COMMIT = 'commit'
904
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000905 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906
907
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000908class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000909 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000910 self.issue = issue
911 self.patchset = patchset
912 self.hostname = hostname
913
914 @property
915 def valid(self):
916 return self.issue is not None
917
918
Edward Lemurf38bc172019-09-03 21:02:13 +0000919def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
921 fail_result = _ParsedIssueNumberArgument()
922
Edward Lemur678a6842019-10-03 22:25:05 +0000923 if isinstance(arg, int):
924 return _ParsedIssueNumberArgument(issue=arg)
925 if not isinstance(arg, basestring):
926 return fail_result
927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000929 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700930
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000932 if not url.startswith('http'):
933 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000934 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
935 if url.startswith(short_url):
936 url = gerrit_url + url[len(short_url):]
937 break
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000940 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000941 except ValueError:
942 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200943
Alex Turner30ae6372022-01-04 02:32:52 +0000944 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
945 # URL.
946 if not arg.startswith('http') and '.' not in parsed_url.netloc:
947 return fail_result
948
Edward Lemur678a6842019-10-03 22:25:05 +0000949 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
950 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
951 # Short urls like https://domain/<issue_number> can be used, but don't allow
952 # specifying the patchset (you'd 404), but we allow that here.
953 if parsed_url.path == '/':
954 part = parsed_url.fragment
955 else:
956 part = parsed_url.path
957
958 match = re.match(
959 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
960 if not match:
961 return fail_result
962
963 issue = int(match.group('issue'))
964 patchset = match.group('patchset')
965 return _ParsedIssueNumberArgument(
966 issue=issue,
967 patchset=int(patchset) if patchset else None,
968 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000969
970
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000971def _create_description_from_log(args):
972 """Pulls out the commit log to use as a base for the CL description."""
973 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000974 if len(args) == 1 and args[0] == None:
975 # Handle the case where None is passed as the branch.
976 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000977 if len(args) == 1 and not args[0].endswith('.'):
978 log_args = [args[0] + '..']
979 elif len(args) == 1 and args[0].endswith('...'):
980 log_args = [args[0][:-1]]
981 elif len(args) == 2:
982 log_args = [args[0] + '..' + args[1]]
983 else:
984 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000985 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000986
987
Aaron Gablea45ee112016-11-22 15:14:38 -0800988class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700989 def __init__(self, issue, url):
990 self.issue = issue
991 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800992 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700993
994 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800995 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700996 self.issue, self.url)
997
998
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100999_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001000 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001001 # TODO(tandrii): these two aren't known in Gerrit.
1002 'approval', 'disapproval'])
1003
1004
Joanna Wang6215dd02023-02-07 15:58:03 +00001005# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001006_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001007 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001008 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001009])
1010
1011
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013 """Changelist works with one changelist in local branch.
1014
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001015 Notes:
1016 * Not safe for concurrent multi-{thread,process} use.
1017 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001018 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """
1020
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001021 def __init__(self,
1022 branchref=None,
1023 issue=None,
1024 codereview_host=None,
1025 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001026 """Create a new ChangeList instance.
1027
Edward Lemurf38bc172019-09-03 21:02:13 +00001028 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001029 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001031 global settings
1032 if not settings:
1033 # Happens when git_cl.py is used as a utility library.
1034 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001035
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.branchref = branchref
1037 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001038 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001039 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 else:
1041 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001042 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001044 self.lookedup_issue = False
1045 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001047 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001049 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001051 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001052 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001053
Edward Lemur125d60a2019-09-13 18:25:41 +00001054 # Lazily cached values.
1055 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1056 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001057 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001058 # Map from change number (issue) to its detail cache.
1059 self._detail_cache = {}
1060
1061 if codereview_host is not None:
1062 assert not codereview_host.startswith('https://'), codereview_host
1063 self._gerrit_host = codereview_host
1064 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065
Edward Lesmese1576912021-02-16 21:53:34 +00001066 @property
1067 def owners_client(self):
1068 if self._owners_client is None:
1069 remote, remote_branch = self.GetRemoteBranch()
1070 branch = GetTargetRef(remote, remote_branch, None)
1071 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001072 host=self.GetGerritHost(),
1073 project=self.GetGerritProject(),
1074 branch=branch)
1075 return self._owners_client
1076
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001078 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001079
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001080 The return value is a string suitable for passing to git cl with the --cc
1081 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001082 """
1083 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001084 base_cc = settings.GetDefaultCCList()
1085 more_cc = ','.join(self.more_cc)
1086 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001087 return self.cc
1088
Daniel Cheng7227d212017-11-17 08:12:37 -08001089 def ExtendCC(self, more_cc):
1090 """Extends the list of users to cc on this CL based on the changed files."""
1091 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001093 def GetCommitDate(self):
1094 """Returns the commit date as provided in the constructor"""
1095 return self.commit_date
1096
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001098 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001100 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001101 if not branchref:
1102 return None
1103 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001104 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 return self.branch
1106
1107 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001108 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 self.GetBranch() # Poke the lazy loader.
1110 return self.branchref
1111
Edward Lemur85153282020-02-14 22:06:29 +00001112 def _GitGetBranchConfigValue(self, key, default=None):
1113 return scm.GIT.GetBranchConfig(
1114 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001115
Edward Lemur85153282020-02-14 22:06:29 +00001116 def _GitSetBranchConfigValue(self, key, value):
1117 action = 'set %s to %r' % (key, value)
1118 if not value:
1119 action = 'unset %s' % key
1120 assert self.GetBranch(), 'a branch is needed to ' + action
1121 return scm.GIT.SetBranchConfig(
1122 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 @staticmethod
1125 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001126 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001127 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001129 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1130 settings.GetRoot(), branch)
1131 if not remote or not upstream_branch:
1132 DieWithError(
1133 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001134 'Verify this branch is set up to track another \n'
1135 '(via the --track argument to "git checkout -b ..."). \n'
1136 'or pass complete "git diff"-style arguments if supported, like\n'
1137 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138
1139 return remote, upstream_branch
1140
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001141 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001142 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001143 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001144 DieWithError('The upstream for the current branch (%s) does not exist '
1145 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001146 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001147 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 def GetUpstreamBranch(self):
1150 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001151 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001152 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001153 upstream_branch = upstream_branch.replace('refs/heads/',
1154 'refs/remotes/%s/' % remote)
1155 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1156 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 self.upstream_branch = upstream_branch
1158 return self.upstream_branch
1159
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001160 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001161 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, branch = None, self.GetBranch()
1163 seen_branches = set()
1164 while branch not in seen_branches:
1165 seen_branches.add(branch)
1166 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001167 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 if remote != '.' or branch.startswith('refs/remotes'):
1169 break
1170 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001171 remotes = RunGit(['remote'], error_ok=True).split()
1172 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001174 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001176 logging.warning('Could not determine which remote this change is '
1177 'associated with, so defaulting to "%s".' %
1178 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 else:
Gavin Make6a62332020-12-04 21:57:10 +00001180 logging.warning('Could not determine which remote this change is '
1181 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 branch = 'HEAD'
1183 if branch.startswith('refs/remotes'):
1184 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001185 elif branch.startswith('refs/branch-heads/'):
1186 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 else:
1188 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001189 return self._remote
1190
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 def GetRemoteUrl(self):
1192 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1193
1194 Returns None if there is no remote.
1195 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001196 is_cached, value = self._cached_remote_url
1197 if is_cached:
1198 return value
1199
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001201 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001202
Edward Lemur298f2cf2019-02-22 21:40:39 +00001203 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001204 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001205 if host:
1206 self._cached_remote_url = (True, url)
1207 return url
1208
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001209 # If it cannot be parsed as an url, assume it is a local directory,
1210 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 logging.warning('"%s" doesn\'t appear to point to a git host. '
1212 'Interpreting it as a local directory.', url)
1213 if not os.path.isdir(url):
1214 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001215 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1216 'but it doesn\'t exist.',
1217 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 return None
1219
1220 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001221 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222
Edward Lemur79d4f992019-11-11 23:49:02 +00001223 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 if not host:
1225 logging.error(
1226 'Remote "%(remote)s" for branch "%(branch)s" points to '
1227 '"%(cache_path)s", but it is misconfigured.\n'
1228 '"%(cache_path)s" must be a git repo and must have a remote named '
1229 '"%(remote)s" pointing to the git host.', {
1230 'remote': remote,
1231 'cache_path': cache_path,
1232 'branch': self.GetBranch()})
1233 return None
1234
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001235 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001236 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001238 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001239 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001240 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001241 if self.GetBranch():
1242 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001243 if self.issue is not None:
1244 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 return self.issue
1247
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001248 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001250 issue = self.GetIssue()
1251 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001252 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001253 server = self.GetCodereviewServer()
1254 if short:
1255 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1256 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257
Dirk Pranke6f0df682021-06-25 00:42:33 +00001258 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001259 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001260
Edward Lemur6c6827c2020-02-06 21:15:18 +00001261 def FetchDescription(self, pretty=False):
1262 assert self.GetIssue(), 'issue is required to query Gerrit'
1263
Edward Lemur9aa1a962020-02-25 00:58:38 +00001264 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001265 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1266 current_rev = data['current_revision']
1267 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268
1269 if not pretty:
1270 return self.description
1271
1272 # Set width to 72 columns + 2 space indent.
1273 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1274 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1275 lines = self.description.splitlines()
1276 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277
1278 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001279 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001280 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001281 if self.GetBranch():
1282 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001283 if self.patchset is not None:
1284 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001285 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001286 return self.patchset
1287
Edward Lemur9aa1a962020-02-25 00:58:38 +00001288 def GetAuthor(self):
1289 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1290
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001292 """Set this branch's patchset. If patchset=0, clears the patchset."""
1293 assert self.GetBranch()
1294 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001296 else:
1297 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001298 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001300 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001301 """Set this branch's issue. If issue isn't given, clears the issue."""
1302 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001304 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001305 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001307 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001308 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001309 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001310 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 else:
tandrii5d48c322016-08-18 16:19:37 -07001312 # Reset all of these just to be clean.
1313 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001314 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001315 ISSUE_CONFIG_KEY,
1316 PATCHSET_CONFIG_KEY,
1317 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001318 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001319 ]
tandrii5d48c322016-08-18 16:19:37 -07001320 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001321 try:
1322 self._GitSetBranchConfigValue(prop, None)
1323 except subprocess2.CalledProcessError:
1324 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001325 msg = RunGit(['log', '-1', '--format=%B']).strip()
1326 if msg and git_footers.get_footer_change_id(msg):
1327 print('WARNING: The change patched into this branch has a Change-Id. '
1328 'Removing it.')
1329 RunGit(['commit', '--amend', '-m',
1330 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001331 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001332 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001333 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001334
Joanna Wangb46232e2023-01-21 01:58:46 +00001335 def GetAffectedFiles(self, upstream, end_commit=None):
1336 # type: (str, Optional[str]) -> Sequence[str]
1337 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001338 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001339 return [
1340 f for _, f in scm.GIT.CaptureStatus(
1341 settings.GetRoot(), upstream, end_commit=end_commit)
1342 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001343 except subprocess2.CalledProcessError:
1344 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001345 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001346 'This branch probably doesn\'t exist anymore. To reset the\n'
1347 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001348 ' git branch --set-upstream-to origin/main %s\n'
1349 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001350 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001351
dsansomee2d6fd92016-09-08 00:10:47 -07001352 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001353 assert self.GetIssue(), 'issue is required to update description'
1354
1355 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001356 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001357 if not force:
1358 confirm_or_exit(
1359 'The description cannot be modified while the issue has a pending '
1360 'unpublished edit. Either publish the edit in the Gerrit web UI '
1361 'or delete it.\n\n', action='delete the unpublished edit')
1362
1363 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001364 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001366 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001367 description, notify='NONE')
1368
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001369 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001370
Edward Lemur75526302020-02-27 22:31:05 +00001371 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001372 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001373 '--root', settings.GetRoot(),
1374 '--upstream', upstream,
1375 ]
1376
1377 args.extend(['--verbose'] * verbose)
1378
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001379 remote, remote_branch = self.GetRemoteBranch()
1380 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001381 if settings.GetIsGerrit():
1382 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1383 args.extend(['--gerrit_project', self.GetGerritProject()])
1384 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001385
Edward Lemur99df04e2020-03-05 19:39:43 +00001386 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001387 issue = self.GetIssue()
1388 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001389 if author:
1390 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001391 if issue:
1392 args.extend(['--issue', str(issue)])
1393 if patchset:
1394 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001395
Edward Lemur75526302020-02-27 22:31:05 +00001396 return args
1397
Josip Sokcevic017544d2022-03-31 23:47:53 +00001398 def RunHook(self,
1399 committing,
1400 may_prompt,
1401 verbose,
1402 parallel,
1403 upstream,
1404 description,
1405 all_files,
1406 files=None,
1407 resultdb=False,
1408 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001409 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1410 args = self._GetCommonPresubmitArgs(verbose, upstream)
1411 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001412 if may_prompt:
1413 args.append('--may_prompt')
1414 if parallel:
1415 args.append('--parallel')
1416 if all_files:
1417 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001418 if files:
1419 args.extend(files.split(';'))
1420 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001421 if files or all_files:
1422 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001423
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001424 if resultdb and not realm:
1425 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1426 # it is not required to pass the realm flag
1427 print('Note: ResultDB reporting will NOT be performed because --realm'
1428 ' was not specified. To enable ResultDB, please run the command'
1429 ' again with the --realm argument to specify the LUCI realm.')
1430
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001431 py3_results = self._RunPresubmit(args,
1432 description,
1433 use_python3=True,
1434 resultdb=resultdb,
1435 realm=realm)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001436 if py3_results.get('skipped_presubmits', 1) == 0:
1437 print('No more presubmits to run - skipping Python 2 presubmits.')
1438 return py3_results
1439
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001440 py2_results = self._RunPresubmit(args,
1441 description,
1442 use_python3=False,
1443 resultdb=resultdb,
1444 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001445 return self._MergePresubmitResults(py2_results, py3_results)
1446
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001447 def _RunPresubmit(self,
1448 args,
1449 description,
1450 use_python3,
1451 resultdb=None,
1452 realm=None):
1453 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1454 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001455 args = args[:]
1456 vpython = 'vpython3' if use_python3 else 'vpython'
1457
Edward Lemur227d5102020-02-25 23:45:35 +00001458 with gclient_utils.temporary_file() as description_file:
1459 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001460 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001461 args.extend(['--json_output', json_output])
1462 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001463 if self.GetUsePython3():
1464 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001465 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001466 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001467 if resultdb and realm:
1468 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001469
1470 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001471 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001472
Edward Lemur227d5102020-02-25 23:45:35 +00001473 metrics.collector.add_repeated('sub_commands', {
1474 'command': 'presubmit',
1475 'execution_time': time_time() - start,
1476 'exit_code': exit_code,
1477 })
1478
1479 if exit_code:
1480 sys.exit(exit_code)
1481
1482 json_results = gclient_utils.FileRead(json_output)
1483 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001484
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001485 def _MergePresubmitResults(self, py2_results, py3_results):
1486 return {
1487 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1488 py3_results.get('more_cc', []))),
1489 'errors': (
1490 py2_results.get('errors', []) + py3_results.get('errors', [])),
1491 'notifications': (
1492 py2_results.get('notifications', []) +
1493 py3_results.get('notifications', [])),
1494 'warnings': (
1495 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1496 }
1497
Brian Sheedy7326ca22022-11-02 18:36:17 +00001498 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001499 args = self._GetCommonPresubmitArgs(verbose, upstream)
1500 args.append('--post_upload')
1501
1502 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001503 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001504 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001505 if not py3_only:
1506 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001507 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1508 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001509 if not py3_only:
1510 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001511 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001512
Edward Lemur5a644f82020-03-18 16:44:57 +00001513 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001514 # type: (optparse.Values, Sequence[str], Sequence[str]
1515 # ) -> ChangeDescription
1516 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001517 if self.GetIssue():
1518 description = self.FetchDescription()
1519 elif options.message:
1520 description = options.message
1521 else:
1522 description = _create_description_from_log(git_diff_args)
1523 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001524 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001525
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 bug = options.bug
1527 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001528 if not self.GetIssue():
1529 # Extract bug number from branch name, but only if issue is being created.
1530 # It must start with bug or fix, followed by _ or - and number.
1531 # Optionally, it may contain _ or - after number with arbitrary text.
1532 # Examples:
1533 # bug-123
1534 # bug_123
1535 # fix-123
1536 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001537 branch = self.GetBranch()
1538 if branch is not None:
1539 match = re.match(
1540 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1541 if not bug and not fixed and match:
1542 if match.group('type') == 'bug':
1543 bug = match.group('bugnum')
1544 else:
1545 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001546
1547 change_description = ChangeDescription(description, bug, fixed)
1548
Joanna Wang39811b12023-01-20 23:09:48 +00001549 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001550 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001551 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001552 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001553 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001554 missing_files = [
1555 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001556 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001557 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001558 owners = self.owners_client.SuggestOwners(
1559 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001560 assert isinstance(options.reviewers, list), options.reviewers
1561 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562
Edward Lemur5a644f82020-03-18 16:44:57 +00001563 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001564 if options.reviewers:
1565 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001566
1567 return change_description
1568
Joanna Wanga1abbed2023-01-24 01:41:05 +00001569 def _GetTitleForUpload(self, options, multi_change_upload=False):
1570 # type: (optparse.Values, Optional[bool]) -> str
1571
1572 # Getting titles for multipl commits is not supported so we return the
1573 # default.
1574 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001575 return options.title
1576
1577 # On first upload, patchset title is always this string, while options.title
1578 # gets converted to first line of message.
1579 if not self.GetIssue():
1580 return 'Initial upload'
1581
1582 # When uploading subsequent patchsets, options.message is taken as the title
1583 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001584 if options.message:
1585 return options.message.strip()
1586
1587 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001588 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001589 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001590 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001591 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001592
1593 # Use the default title if the user confirms the default with a 'y'.
1594 if user_title.lower() == 'y':
1595 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001596 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001597
Joanna Wang562481d2023-01-26 21:57:14 +00001598 def _GetRefSpecOptions(self,
1599 options,
1600 change_desc,
1601 multi_change_upload=False,
1602 dogfood_path=False):
1603 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1604 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001605
1606 # Extra options that can be specified at push time. Doc:
1607 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1608 refspec_opts = []
1609
1610 # By default, new changes are started in WIP mode, and subsequent patchsets
1611 # don't send email. At any time, passing --send-mail or --send-email will
1612 # mark the change ready and send email for that particular patch.
1613 if options.send_mail:
1614 refspec_opts.append('ready')
1615 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001616 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001617 refspec_opts.append('wip')
1618 else:
1619 refspec_opts.append('notify=NONE')
1620
1621 # TODO(tandrii): options.message should be posted as a comment if
1622 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1623 # to do it.
1624
1625 # Set options.title in case user was prompted in _GetTitleForUpload and
1626 # _CMDUploadChange needs to be called again.
1627 options.title = self._GetTitleForUpload(
1628 options, multi_change_upload=multi_change_upload)
1629
1630 if options.title:
1631 # Punctuation and whitespace in |title| must be percent-encoded.
1632 refspec_opts.append('m=' +
1633 gerrit_util.PercentEncodeForGitRef(options.title))
1634
1635 if options.private:
1636 refspec_opts.append('private')
1637
1638 if options.topic:
1639 # Documentation on Gerrit topics is here:
1640 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1641 refspec_opts.append('topic=%s' % options.topic)
1642
1643 if options.enable_auto_submit:
1644 refspec_opts.append('l=Auto-Submit+1')
1645 if options.set_bot_commit:
1646 refspec_opts.append('l=Bot-Commit+1')
1647 if options.use_commit_queue:
1648 refspec_opts.append('l=Commit-Queue+2')
1649 elif options.cq_dry_run:
1650 refspec_opts.append('l=Commit-Queue+1')
1651 elif options.cq_quick_run:
1652 refspec_opts.append('l=Commit-Queue+1')
1653 refspec_opts.append('l=Quick-Run+1')
1654
1655 if change_desc.get_reviewers(tbr_only=True):
1656 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1657 self.GetGerritProject())
1658 refspec_opts.append('l=Code-Review+%s' % score)
1659
Joanna Wang40497912023-01-24 21:18:16 +00001660 # Gerrit sorts hashtags, so order is not important.
1661 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1662 # We check GetIssue because we only add hashtags from the
1663 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001664 # TODO(b/265929888): When we fully launch the new path:
1665 # 1) remove fetching hashtags from description alltogether
1666 # 2) Or use descrtiption hashtags for:
1667 # `not (self.GetIssue() and multi_change_upload)`
1668 # 3) Or enabled change description tags for multi and single changes
1669 # by adding them post `git push`.
1670 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001671 hashtags.update(change_desc.get_hash_tags())
1672 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001673
1674 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001675 # branch/change.
1676 return refspec_opts
1677
Joanna Wang6215dd02023-02-07 15:58:03 +00001678 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1679 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001680 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001681
1682 if end_commit is None:
1683 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1684
1685 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1686 end_commit)
1687 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1688 with gclient_utils.temporary_file() as desc_tempfile:
1689 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1690 commit_to_push = RunGit(
1691 ['commit-tree', latest_tree, '-p', parent, '-F',
1692 desc_tempfile]).strip()
1693
Joanna Wang7603f042023-03-01 22:17:36 +00001694 # Gerrit may or may not update fast enough to return the correct patchset
1695 # number after we push. Get the pre-upload patchset and increment later.
1696 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001697 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001698 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001699
Joanna Wang6215dd02023-02-07 15:58:03 +00001700 def PrepareCherryPickSquashedCommit(self, options, parent):
1701 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001702 """Create a commit cherry-picked on parent to push."""
1703
Joanna Wang6215dd02023-02-07 15:58:03 +00001704 # The `parent` is what we will cherry-pick on top of.
1705 # The `cherry_pick_base` is the beginning range of what
1706 # we are cherry-picking.
1707 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1708 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001709 self.branchref)
1710
1711 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1712 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1713 with gclient_utils.temporary_file() as desc_tempfile:
1714 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001715 commit_to_cp = RunGit([
1716 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1717 desc_tempfile
1718 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001719
Joanna Wang6215dd02023-02-07 15:58:03 +00001720 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001721 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1722 if ret:
1723 RunGit(['cherry-pick', '--abort'])
1724 RunGit(['checkout', '-q', self.branch])
1725 DieWithError('Could not cleanly cherry-pick')
1726
Joanna Wang6215dd02023-02-07 15:58:03 +00001727 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001728 RunGit(['checkout', '-q', self.branch])
1729
Joanna Wang7603f042023-03-01 22:17:36 +00001730 # Gerrit may or may not update fast enough to return the correct patchset
1731 # number after we push. Get the pre-upload patchset and increment later.
1732 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001733 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001734 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001735
Joanna Wangb46232e2023-01-21 01:58:46 +00001736 def _PrepareChange(self, options, parent, end_commit):
1737 # type: (optparse.Values, str, str) ->
1738 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1739 """Prepares the change to be uploaded."""
1740 self.EnsureCanUploadPatchset(options.force)
1741
1742 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1743 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1744 files)
1745
1746 watchlist = watchlists.Watchlists(settings.GetRoot())
1747 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1748 if not options.bypass_hooks:
1749 hook_results = self.RunHook(committing=False,
1750 may_prompt=not options.force,
1751 verbose=options.verbose,
1752 parallel=options.parallel,
1753 upstream=parent,
1754 description=change_desc.description,
1755 all_files=False)
1756 self.ExtendCC(hook_results['more_cc'])
1757
1758 # Update the change description and ensure we have a Change Id.
1759 if self.GetIssue():
1760 if options.edit_description:
1761 change_desc.prompt()
1762 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1763 change_id = change_detail['change_id']
1764 change_desc.ensure_change_id(change_id)
1765
Joanna Wangb46232e2023-01-21 01:58:46 +00001766 else: # No change issue. First time uploading
1767 if not options.force and not options.message_file:
1768 change_desc.prompt()
1769
1770 # Check if user added a change_id in the descripiton.
1771 change_ids = git_footers.get_footer_change_id(change_desc.description)
1772 if len(change_ids) == 1:
1773 change_id = change_ids[0]
1774 else:
1775 change_id = GenerateGerritChangeId(change_desc.description)
1776 change_desc.ensure_change_id(change_id)
1777
1778 if options.preserve_tryjobs:
1779 change_desc.set_preserve_tryjobs()
1780
1781 SaveDescriptionBackup(change_desc)
1782
1783 # Add ccs
1784 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001785 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001786 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001787 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001788 ccs = self.GetCCList().split(',')
1789 if len(ccs) > 100:
1790 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1791 'process/lsc/lsc_workflow.md')
1792 print('WARNING: This will auto-CC %s users.' % len(ccs))
1793 print('LSC may be more appropriate: %s' % lsc)
1794 print('You can also use the --no-autocc flag to disable auto-CC.')
1795 confirm_or_exit(action='continue')
1796
1797 # Add ccs from the --cc flag.
1798 if options.cc:
1799 ccs.extend(options.cc)
1800
1801 ccs = [email.strip() for email in ccs if email.strip()]
1802 if change_desc.get_cced():
1803 ccs.extend(change_desc.get_cced())
1804
1805 return change_desc.get_reviewers(), ccs, change_desc
1806
Joanna Wang40497912023-01-24 21:18:16 +00001807 def PostUploadUpdates(self, options, new_upload, change_number):
1808 # type: (optparse.Values, _NewUpload, change_number) -> None
1809 """Makes necessary post upload changes to the local and remote cl."""
1810 if not self.GetIssue():
1811 self.SetIssue(change_number)
1812
Joanna Wang7603f042023-03-01 22:17:36 +00001813 self.SetPatchset(new_upload.prev_patchset + 1)
1814
Joanna Wang40497912023-01-24 21:18:16 +00001815 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1816 new_upload.commit_to_push)
1817 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1818 new_upload.new_last_uploaded_commit)
1819
1820 if settings.GetRunPostUploadHook():
1821 self.RunPostUploadHook(options.verbose, new_upload.parent,
1822 new_upload.change_desc.description,
1823 options.no_python2_post_upload_hooks)
1824
1825 if new_upload.reviewers or new_upload.ccs:
1826 gerrit_util.AddReviewers(self.GetGerritHost(),
1827 self._GerritChangeIdentifier(),
1828 reviewers=new_upload.reviewers,
1829 ccs=new_upload.ccs,
1830 notify=bool(options.send_mail))
1831
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832 def CMDUpload(self, options, git_diff_args, orig_args):
1833 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001834 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001835 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001836 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001837 else:
1838 if self.GetBranch() is None:
1839 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1840
1841 # Default to diffing against common ancestor of upstream branch
1842 base_branch = self.GetCommonAncestorWithUpstream()
1843 git_diff_args = [base_branch, 'HEAD']
1844
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001845 # Fast best-effort checks to abort before running potentially expensive
1846 # hooks if uploading is likely to fail anyway. Passing these checks does
1847 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001848 self.EnsureAuthenticated(force=options.force)
1849 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001850
1851 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001852 watchlist = watchlists.Watchlists(settings.GetRoot())
1853 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001854 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001855 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001856
Edward Lemur5a644f82020-03-18 16:44:57 +00001857 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001859 hook_results = self.RunHook(committing=False,
1860 may_prompt=not options.force,
1861 verbose=options.verbose,
1862 parallel=options.parallel,
1863 upstream=base_branch,
1864 description=change_desc.description,
1865 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001866 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001867
Aaron Gable13101a62018-02-09 13:20:41 -08001868 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001869 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001870 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001871 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001872 if self.GetBranch() is not None:
1873 self._GitSetBranchConfigValue(
1874 LAST_UPLOAD_HASH_CONFIG_KEY,
1875 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876 # Run post upload hooks, if specified.
1877 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001878 self.RunPostUploadHook(options.verbose, base_branch,
1879 change_desc.description,
1880 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001881
1882 # Upload all dependencies if specified.
1883 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001884 print()
1885 print('--dependencies has been specified.')
1886 print('All dependent local branches will be re-uploaded.')
1887 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001888 # Remove the dependencies flag from args so that we do not end up in a
1889 # loop.
1890 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001891 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001892 return ret
1893
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001894 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001895 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001897 Issue must have been already uploaded and known. Optionally allows for
1898 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001899 """
1900 assert new_state in _CQState.ALL_STATES
1901 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001902 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001903 vote_map = {
1904 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001905 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001906 _CQState.DRY_RUN: 1,
1907 _CQState.COMMIT: 2,
1908 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001909 if new_state == _CQState.QUICK_RUN:
1910 labels = {
1911 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1912 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1913 }
1914 else:
1915 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001916 notify = False if new_state == _CQState.DRY_RUN else None
1917 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001918 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001919 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001920 return 0
1921 except KeyboardInterrupt:
1922 raise
1923 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001924 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001925 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001926 ' * Your project has no CQ,\n'
1927 ' * You don\'t have permission to change the CQ state,\n'
1928 ' * There\'s a bug in this code (see stack trace below).\n'
1929 'Consider specifying which bots to trigger manually or asking your '
1930 'project owners for permissions or contacting Chrome Infra at:\n'
1931 'https://www.chromium.org/infra\n\n' %
1932 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001933 # Still raise exception so that stack trace is printed.
1934 raise
1935
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001936 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 # Lazy load of configs.
1938 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001939 if self._gerrit_host and '.' not in self._gerrit_host:
1940 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1941 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001942 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001943 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001944 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001945 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001946 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1947 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948 return self._gerrit_host
1949
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001950 def _GetGitHost(self):
1951 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001952 remote_url = self.GetRemoteUrl()
1953 if not remote_url:
1954 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001955 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001956
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001957 def GetCodereviewServer(self):
1958 if not self._gerrit_server:
1959 # If we're on a branch then get the server potentially associated
1960 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001961 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001962 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001963 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001964 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001965 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966 if not self._gerrit_server:
1967 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1968 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001969 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001970 parts[0] = parts[0] + '-review'
1971 self._gerrit_host = '.'.join(parts)
1972 self._gerrit_server = 'https://%s' % self._gerrit_host
1973 return self._gerrit_server
1974
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001975 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001976 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001977 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001978 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001979 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001980 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001981 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001982 if project.endswith('.git'):
1983 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001984 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1985 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1986 # gitiles/git-over-https protocol. E.g.,
1987 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1988 # as
1989 # https://chromium.googlesource.com/v8/v8
1990 if project.startswith('a/'):
1991 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001992 return project
1993
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001994 def _GerritChangeIdentifier(self):
1995 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1996
1997 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001998 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001999 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002000 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002001 if project:
2002 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2003 # Fall back on still unique, but less efficient change number.
2004 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002005
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002006 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002007 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002008 if settings.GetGerritSkipEnsureAuthenticated():
2009 # For projects with unusual authentication schemes.
2010 # See http://crbug.com/603378.
2011 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002012
2013 # Check presence of cookies only if using cookies-based auth method.
2014 cookie_auth = gerrit_util.Authenticator.get()
2015 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002016 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002017
Florian Mayerae510e82020-01-30 21:04:48 +00002018 remote_url = self.GetRemoteUrl()
2019 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002020 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002021 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002022 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2023 logging.warning(
2024 'Ignoring branch %(branch)s with non-https/sso remote '
2025 '%(remote)s', {
2026 'branch': self.branch,
2027 'remote': self.GetRemoteUrl()
2028 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002029 return
2030
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002031 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032 self.GetCodereviewServer()
2033 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002034 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002035
2036 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2037 git_auth = cookie_auth.get_auth_header(git_host)
2038 if gerrit_auth and git_auth:
2039 if gerrit_auth == git_auth:
2040 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002041 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002042 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002043 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002044 ' %s\n'
2045 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002046 ' Consider running the following command:\n'
2047 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002048 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002049 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002050 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002051 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 cookie_auth.get_new_password_message(git_host)))
2053 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002054 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002055 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002056
2057 missing = (
2058 ([] if gerrit_auth else [self._gerrit_host]) +
2059 ([] if git_auth else [git_host]))
2060 DieWithError('Credentials for the following hosts are required:\n'
2061 ' %s\n'
2062 'These are read from %s (or legacy %s)\n'
2063 '%s' % (
2064 '\n '.join(missing),
2065 cookie_auth.get_gitcookies_path(),
2066 cookie_auth.get_netrc_path(),
2067 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002068
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002069 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002070 if not self.GetIssue():
2071 return
2072
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002073 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002074 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002075 DieWithError(
2076 'Change %s has been abandoned, new uploads are not allowed' %
2077 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002078 if status == 'MERGED':
2079 answer = gclient_utils.AskForData(
2080 'Change %s has been submitted, new uploads are not allowed. '
2081 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2082 ).lower()
2083 if answer not in ('y', ''):
2084 DieWithError('New uploads are not allowed.')
2085 self.SetIssue()
2086 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002087
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002088 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2089 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2090 # Apparently this check is not very important? Otherwise get_auth_email
2091 # could have been added to other implementations of Authenticator.
2092 cookies_auth = gerrit_util.Authenticator.get()
2093 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002094 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002095
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002096 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002097 if self.GetIssueOwner() == cookies_user:
2098 return
2099 logging.debug('change %s owner is %s, cookies user is %s',
2100 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002101 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002102 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002103 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002104 if details['email'] == self.GetIssueOwner():
2105 return
2106 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002107 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002108 'as %s.\n'
2109 'Uploading may fail due to lack of permissions.' %
2110 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2111 confirm_or_exit(action='upload')
2112
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002113 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002114 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002115 or CQ status, assuming adherence to a common workflow.
2116
2117 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002118 * 'error' - error from review tool (including deleted issues)
2119 * 'unsent' - no reviewers added
2120 * 'waiting' - waiting for review
2121 * 'reply' - waiting for uploader to reply to review
2122 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002123 * 'dry-run' - dry-running in the CQ
2124 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002125 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002126 """
2127 if not self.GetIssue():
2128 return None
2129
2130 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002131 data = self._GetChangeDetail([
2132 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002133 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002134 return 'error'
2135
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002136 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002137 return 'closed'
2138
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002139 cq_label = data['labels'].get('Commit-Queue', {})
2140 max_cq_vote = 0
2141 for vote in cq_label.get('all', []):
2142 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2143 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002144 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002145 if max_cq_vote == 1:
2146 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002147
Aaron Gable9ab38c62017-04-06 14:36:33 -07002148 if data['labels'].get('Code-Review', {}).get('approved'):
2149 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002150
2151 if not data.get('reviewers', {}).get('REVIEWER', []):
2152 return 'unsent'
2153
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002154 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002155 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002156 while messages:
2157 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002158 if (m.get('tag', '').startswith('autogenerated:cq') or
2159 m.get('tag', '').startswith('autogenerated:cv')):
2160 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002161 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002162 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002163 # Most recent message was by owner.
2164 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002165
2166 # Some reply from non-owner.
2167 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002168
2169 # Somehow there are no messages even though there are reviewers.
2170 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002171
Gavin Mak4e5e3992022-11-14 22:40:12 +00002172 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002173 if not self.GetIssue():
2174 return None
2175
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002176 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002177 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002178 if update:
2179 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002180 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002181
Gavin Makf35a9eb2022-11-17 18:34:36 +00002182 def _IsPatchsetRangeSignificant(self, lower, upper):
2183 """Returns True if the inclusive range of patchsets contains any reworks or
2184 rebases."""
2185 if not self.GetIssue():
2186 return False
2187
2188 data = self._GetChangeDetail(['ALL_REVISIONS'])
2189 ps_kind = {}
2190 for rev_info in data.get('revisions', {}).values():
2191 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2192
2193 for ps in range(lower, upper + 1):
2194 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2195 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2196 return True
2197 return False
2198
Gavin Make61ccc52020-11-13 00:12:57 +00002199 def GetMostRecentDryRunPatchset(self):
2200 """Get patchsets equivalent to the most recent patchset and return
2201 the patchset with the latest dry run. If none have been dry run, return
2202 the latest patchset."""
2203 if not self.GetIssue():
2204 return None
2205
2206 data = self._GetChangeDetail(['ALL_REVISIONS'])
2207 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002208 dry_run = {int(m['_revision_number'])
2209 for m in data.get('messages', [])
2210 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002211
2212 for revision_info in sorted(data.get('revisions', {}).values(),
2213 key=lambda c: c['_number'], reverse=True):
2214 if revision_info['_number'] in dry_run:
2215 patchset = revision_info['_number']
2216 break
2217 if revision_info.get('kind', '') not in \
2218 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2219 break
2220 self.SetPatchset(patchset)
2221 return patchset
2222
Aaron Gable636b13f2017-07-14 10:42:48 -07002223 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002224 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002225 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002226 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002227
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002228 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002229 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002230 # CURRENT_REVISION is included to get the latest patchset so that
2231 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002232 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002233 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2234 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002235 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002236 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002237 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002238 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002239
2240 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002241 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002242 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002243 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244 line_comments = file_comments.setdefault(path, [])
2245 line_comments.extend(
2246 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002247
2248 # Build dictionary of file comments for easy access and sorting later.
2249 # {author+date: {path: {patchset: {line: url+message}}}}
2250 comments = collections.defaultdict(
2251 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002252
2253 server = self.GetCodereviewServer()
2254 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2255 # /c/ is automatically added by short URL server.
2256 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2257 self.GetIssue())
2258 else:
2259 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2260
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002261 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002262 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002263 tag = comment.get('tag', '')
2264 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002265 continue
2266 key = (comment['author']['email'], comment['updated'])
2267 if comment.get('side', 'REVISION') == 'PARENT':
2268 patchset = 'Base'
2269 else:
2270 patchset = 'PS%d' % comment['patch_set']
2271 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002272 url = ('%s/%s/%s#%s%s' %
2273 (url_prefix, comment['patch_set'], path,
2274 'b' if comment.get('side') == 'PARENT' else '',
2275 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002276 comments[key][path][patchset][line] = (url, comment['message'])
2277
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002278 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002279 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002280 summary = self._BuildCommentSummary(msg, comments, readable)
2281 if summary:
2282 summaries.append(summary)
2283 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002284
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002285 @staticmethod
2286 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002287 if 'email' not in msg['author']:
2288 # Some bot accounts may not have an email associated.
2289 return None
2290
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002291 key = (msg['author']['email'], msg['date'])
2292 # Don't bother showing autogenerated messages that don't have associated
2293 # file or line comments. this will filter out most autogenerated
2294 # messages, but will keep robot comments like those from Tricium.
2295 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2296 if is_autogenerated and not comments.get(key):
2297 return None
2298 message = msg['message']
2299 # Gerrit spits out nanoseconds.
2300 assert len(msg['date'].split('.')[-1]) == 9
2301 date = datetime.datetime.strptime(msg['date'][:-3],
2302 '%Y-%m-%d %H:%M:%S.%f')
2303 if key in comments:
2304 message += '\n'
2305 for path, patchsets in sorted(comments.get(key, {}).items()):
2306 if readable:
2307 message += '\n%s' % path
2308 for patchset, lines in sorted(patchsets.items()):
2309 for line, (url, content) in sorted(lines.items()):
2310 if line:
2311 line_str = 'Line %d' % line
2312 path_str = '%s:%d:' % (path, line)
2313 else:
2314 line_str = 'File comment'
2315 path_str = '%s:0:' % path
2316 if readable:
2317 message += '\n %s, %s: %s' % (patchset, line_str, url)
2318 message += '\n %s\n' % content
2319 else:
2320 message += '\n%s ' % path_str
2321 message += '\n%s\n' % content
2322
2323 return _CommentSummary(
2324 date=date,
2325 message=message,
2326 sender=msg['author']['email'],
2327 autogenerated=is_autogenerated,
2328 # These could be inferred from the text messages and correlated with
2329 # Code-Review label maximum, however this is not reliable.
2330 # Leaving as is until the need arises.
2331 approval=False,
2332 disapproval=False,
2333 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002334
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002335 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002336 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002337 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002338
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002339 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002340 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002341 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002342
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002343 def _GetChangeDetail(self, options=None):
2344 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002346 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002347
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002348 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002349 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002350 options.append('CURRENT_COMMIT')
2351
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002352 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002353 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002354 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002355
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002356 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2357 # Assumption: data fetched before with extra options is suitable
2358 # for return for a smaller set of options.
2359 # For example, if we cached data for
2360 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2361 # and request is for options=[CURRENT_REVISION],
2362 # THEN we can return prior cached data.
2363 if options_set.issubset(cached_options_set):
2364 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002365
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002366 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002367 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002368 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002369 except gerrit_util.GerritError as e:
2370 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002371 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002372 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002373
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002374 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002375 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002376
Gavin Mak4e5e3992022-11-14 22:40:12 +00002377 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002378 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002379 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002380 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2381 self._GerritChangeIdentifier(),
2382 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002383 except gerrit_util.GerritError as e:
2384 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002385 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002386 raise
agable32978d92016-11-01 12:55:02 -07002387 return data
2388
Karen Qian40c19422019-03-13 21:28:29 +00002389 def _IsCqConfigured(self):
2390 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002391 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002392
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002393 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002394 if git_common.is_dirty_git_tree('land'):
2395 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002396
tandriid60367b2016-06-22 05:25:12 -07002397 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002398 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002399 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002400 'which can test and land changes for you. '
2401 'Are you sure you wish to bypass it?\n',
2402 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002403 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002404 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002405 # Note: git diff outputs nothing if there is no diff.
2406 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002407 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002408 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002409 if detail['current_revision'] == last_upload:
2410 differs = False
2411 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002412 print('WARNING: Local branch contents differ from latest uploaded '
2413 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 if differs:
2415 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002416 confirm_or_exit(
2417 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2418 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002419 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002420 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002421 upstream = self.GetCommonAncestorWithUpstream()
2422 if self.GetIssue():
2423 description = self.FetchDescription()
2424 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002425 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002426 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002427 committing=True,
2428 may_prompt=not force,
2429 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002430 parallel=parallel,
2431 upstream=upstream,
2432 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002433 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002434 resultdb=resultdb,
2435 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002436
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002437 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002438 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002439 links = self._GetChangeCommit().get('web_links', [])
2440 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002441 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002442 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002443 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002444 return 0
2445
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002446 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2447 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002448 assert parsed_issue_arg.valid
2449
Edward Lemur125d60a2019-09-13 18:25:41 +00002450 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002451
2452 if parsed_issue_arg.hostname:
2453 self._gerrit_host = parsed_issue_arg.hostname
2454 self._gerrit_server = 'https://%s' % self._gerrit_host
2455
tandriic2405f52016-10-10 08:13:15 -07002456 try:
2457 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002458 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002459 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002460
2461 if not parsed_issue_arg.patchset:
2462 # Use current revision by default.
2463 revision_info = detail['revisions'][detail['current_revision']]
2464 patchset = int(revision_info['_number'])
2465 else:
2466 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002467 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002468 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2469 break
2470 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002471 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002472 (parsed_issue_arg.patchset, self.GetIssue()))
2473
Edward Lemur125d60a2019-09-13 18:25:41 +00002474 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002475 if remote_url.endswith('.git'):
2476 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002477 remote_url = remote_url.rstrip('/')
2478
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002479 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002480 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002481
2482 if remote_url != fetch_info['url']:
2483 DieWithError('Trying to patch a change from %s but this repo appears '
2484 'to be %s.' % (fetch_info['url'], remote_url))
2485
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002486 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002487
Joanna Wangc023a632023-01-26 17:59:25 +00002488 # Set issue immediately in case the cherry-pick fails, which happens
2489 # when resolving conflicts.
2490 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002491 self.SetIssue(parsed_issue_arg.issue)
2492
Aaron Gable62619a32017-06-16 08:22:09 -07002493 if force:
2494 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2495 print('Checked out commit for change %i patchset %i locally' %
2496 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002497 elif nocommit:
2498 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2499 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002500 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002501 RunGit(['cherry-pick', 'FETCH_HEAD'])
2502 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002503 (parsed_issue_arg.issue, patchset))
2504 print('Note: this created a local commit which does not have '
2505 'the same hash as the one uploaded for review. This will make '
2506 'uploading changes based on top of this branch difficult.\n'
2507 'If you want to do that, use "git cl patch --force" instead.')
2508
Stefan Zagerd08043c2017-10-12 12:07:02 -07002509 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002510 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002511 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002512 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2513 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002514 else:
2515 print('WARNING: You are in detached HEAD state.\n'
2516 'The patch has been applied to your checkout, but you will not be '
2517 'able to upload a new patch set to the gerrit issue.\n'
2518 'Try using the \'-b\' option if you would like to work on a '
2519 'branch and/or upload a new patch set.')
2520
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002521 return 0
2522
Joanna Wang18de1f62023-01-21 01:24:24 +00002523 @staticmethod
2524 def _GerritCommitMsgHookCheck(offer_removal):
2525 # type: (bool) -> None
2526 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002527 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2528 if not os.path.exists(hook):
2529 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002530 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2531 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002532 data = gclient_utils.FileRead(hook)
2533 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2534 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002535 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002536 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002537 'and may interfere with it in subtle ways.\n'
2538 'We recommend you remove the commit-msg hook.')
2539 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002540 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002541 gclient_utils.rm_file_or_tree(hook)
2542 print('Gerrit commit-msg hook removed.')
2543 else:
2544 print('OK, will keep Gerrit commit-msg hook in place.')
2545
Edward Lemur1b52d872019-05-09 21:12:12 +00002546 def _CleanUpOldTraces(self):
2547 """Keep only the last |MAX_TRACES| traces."""
2548 try:
2549 traces = sorted([
2550 os.path.join(TRACES_DIR, f)
2551 for f in os.listdir(TRACES_DIR)
2552 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2553 and not f.startswith('tmp'))
2554 ])
2555 traces_to_delete = traces[:-MAX_TRACES]
2556 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002557 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002558 except OSError:
2559 print('WARNING: Failed to remove old git traces from\n'
2560 ' %s'
2561 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002562
Edward Lemur5737f022019-05-17 01:24:00 +00002563 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002564 """Zip and write the git push traces stored in traces_dir."""
2565 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002566 traces_zip = trace_name + '-traces'
2567 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002568 # Create a temporary dir to store git config and gitcookies in. It will be
2569 # compressed and stored next to the traces.
2570 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002571 git_info_zip = trace_name + '-git-info'
2572
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002573 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002574
Edward Lemur1b52d872019-05-09 21:12:12 +00002575 git_push_metadata['trace_name'] = trace_name
2576 gclient_utils.FileWrite(
2577 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2578
2579 # Keep only the first 6 characters of the git hashes on the packet
2580 # trace. This greatly decreases size after compression.
2581 packet_traces = os.path.join(traces_dir, 'trace-packet')
2582 if os.path.isfile(packet_traces):
2583 contents = gclient_utils.FileRead(packet_traces)
2584 gclient_utils.FileWrite(
2585 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2586 shutil.make_archive(traces_zip, 'zip', traces_dir)
2587
2588 # Collect and compress the git config and gitcookies.
2589 git_config = RunGit(['config', '-l'])
2590 gclient_utils.FileWrite(
2591 os.path.join(git_info_dir, 'git-config'),
2592 git_config)
2593
2594 cookie_auth = gerrit_util.Authenticator.get()
2595 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2596 gitcookies_path = cookie_auth.get_gitcookies_path()
2597 if os.path.isfile(gitcookies_path):
2598 gitcookies = gclient_utils.FileRead(gitcookies_path)
2599 gclient_utils.FileWrite(
2600 os.path.join(git_info_dir, 'gitcookies'),
2601 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2602 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2603
Edward Lemur1b52d872019-05-09 21:12:12 +00002604 gclient_utils.rmtree(git_info_dir)
2605
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002606 def _RunGitPushWithTraces(self,
2607 refspec,
2608 refspec_opts,
2609 git_push_metadata,
2610 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002611 """Run git push and collect the traces resulting from the execution."""
2612 # Create a temporary directory to store traces in. Traces will be compressed
2613 # and stored in a 'traces' dir inside depot_tools.
2614 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002615 trace_name = os.path.join(
2616 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002617
2618 env = os.environ.copy()
2619 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2620 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002621 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002622 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2623 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2624 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2625
2626 try:
2627 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002628 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002629 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002630 push_cmd = ['git', 'push', remote_url, refspec]
2631 if git_push_options:
2632 for opt in git_push_options:
2633 push_cmd.extend(['-o', opt])
2634
Edward Lemur0f58ae42019-04-30 17:24:12 +00002635 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002636 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002637 env=env,
2638 print_stdout=True,
2639 # Flush after every line: useful for seeing progress when running as
2640 # recipe.
2641 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002642 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002643 except subprocess2.CalledProcessError as e:
2644 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002645 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002646 raise GitPushError(
2647 'Failed to create a change, very likely due to blocked keyword. '
2648 'Please examine output above for the reason of the failure.\n'
2649 'If this is a false positive, you can try to bypass blocked '
2650 'keyword by using push option '
2651 '-o uploadvalidator~skip, e.g.:\n'
2652 'git cl upload -o uploadvalidator~skip\n\n'
2653 'If git-cl is not working correctly, file a bug under the '
2654 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002655 if 'git push -o nokeycheck' in str(e.stdout):
2656 raise GitPushError(
2657 'Failed to create a change, very likely due to a private key being '
2658 'detected. Please examine output above for the reason of the '
2659 'failure.\n'
2660 'If this is a false positive, you can try to bypass private key '
2661 'detection by using push option '
2662 '-o nokeycheck, e.g.:\n'
2663 'git cl upload -o nokeycheck\n\n'
2664 'If git-cl is not working correctly, file a bug under the '
2665 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002666
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002667 raise GitPushError(
2668 'Failed to create a change. Please examine output above for the '
2669 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002670 'For emergencies, Googlers can escalate to '
2671 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002672 'Hint: run command below to diagnose common Git/Gerrit '
2673 'credential problems:\n'
2674 ' git cl creds-check\n'
2675 '\n'
2676 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2677 'component including the files below.\n'
2678 'Review the files before upload, since they might contain sensitive '
2679 'information.\n'
2680 'Set the Restrict-View-Google label so that they are not publicly '
2681 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002682 finally:
2683 execution_time = time_time() - before_push
2684 metrics.collector.add_repeated('sub_commands', {
2685 'command': 'git push',
2686 'execution_time': execution_time,
2687 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002688 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002689 })
2690
Edward Lemur1b52d872019-05-09 21:12:12 +00002691 git_push_metadata['execution_time'] = execution_time
2692 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002693 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002694
Edward Lemur1b52d872019-05-09 21:12:12 +00002695 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002696 gclient_utils.rmtree(traces_dir)
2697
2698 return push_stdout
2699
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002700 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2701 change_desc):
2702 """Upload the current branch to Gerrit, retry if new remote HEAD is
2703 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002704 remote, remote_branch = self.GetRemoteBranch()
2705 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2706
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002707 try:
2708 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002709 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002710 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002711 # Repository might be in the middle of transition to main branch as
2712 # default, and uploads to old default might be blocked.
2713 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002714 DieWithError(str(e), change_desc)
2715
Josip Sokcevicb631a882021-01-06 18:18:10 +00002716 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2717 self.GetGerritProject())
2718 if project_head == branch:
2719 DieWithError(str(e), change_desc)
2720 branch = project_head
2721
2722 print("WARNING: Fetching remote state and retrying upload to default "
2723 "branch...")
2724 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002725 options.edit_description = False
2726 options.force = True
2727 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002728 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2729 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002730 except GitPushError as e:
2731 DieWithError(str(e), change_desc)
2732
2733 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002734 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002736 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002737 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002738 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002739 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002740 # User requested to change description
2741 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002742 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002743 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2744 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002745 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002746
2747 # Check if changes outside of this workspace have been uploaded.
2748 current_rev = change_detail['current_revision']
2749 last_uploaded_rev = self._GitGetBranchConfigValue(
2750 GERRIT_SQUASH_HASH_CONFIG_KEY)
2751 if last_uploaded_rev and current_rev != last_uploaded_rev:
2752 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002753 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002754 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002755 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002756 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002757 if len(change_ids) == 1:
2758 change_id = change_ids[0]
2759 else:
2760 change_id = GenerateGerritChangeId(change_desc.description)
2761 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002762
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002763 if options.preserve_tryjobs:
2764 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002765
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002767 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002768 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002769 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002770 with gclient_utils.temporary_file() as desc_tempfile:
2771 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2772 ref_to_push = RunGit(
2773 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002774 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002775 if options.no_add_changeid:
2776 pass
2777 else: # adding Change-Ids is okay.
2778 if not git_footers.get_footer_change_id(change_desc.description):
2779 DownloadGerritHook(False)
2780 change_desc.set_description(
2781 self._AddChangeIdToCommitMessage(change_desc.description,
2782 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002783 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002784 # For no-squash mode, we assume the remote called "origin" is the one we
2785 # want. It is not worthwhile to support different workflows for
2786 # no-squash mode.
2787 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002788 # attempt to extract the changeid from the current description
2789 # fail informatively if not possible.
2790 change_id_candidates = git_footers.get_footer_change_id(
2791 change_desc.description)
2792 if not change_id_candidates:
2793 DieWithError("Unable to extract change-id from message.")
2794 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002796 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002797 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2798 ref_to_push)]).splitlines()
2799 if len(commits) > 1:
2800 print('WARNING: This will upload %d commits. Run the following command '
2801 'to see which commits will be uploaded: ' % len(commits))
2802 print('git log %s..%s' % (parent, ref_to_push))
2803 print('You can also use `git squash-branch` to squash these into a '
2804 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002805 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002806
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002807 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002808 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002809 # Add default, watchlist, presubmit ccs if this is the initial upload
2810 # and CL is not private and auto-ccing has not been disabled.
2811 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002812 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002813 if len(cc) > 100:
2814 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2815 'process/lsc/lsc_workflow.md')
2816 print('WARNING: This will auto-CC %s users.' % len(cc))
2817 print('LSC may be more appropriate: %s' % lsc)
2818 print('You can also use the --no-autocc flag to disable auto-CC.')
2819 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002820 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002821 if options.cc:
2822 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002823 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002824 if change_desc.get_cced():
2825 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002826 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002827 valid_accounts = set(reviewers + cc)
2828 # TODO(crbug/877717): relax this for all hosts.
2829 else:
2830 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002831 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002832 logging.info('accounts %s are recognized, %s invalid',
2833 sorted(valid_accounts),
2834 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002835
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002836 # Extra options that can be specified at push time. Doc:
2837 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002838 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002839
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002840 for r in sorted(reviewers):
2841 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002842 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002843 reviewers.remove(r)
2844 else:
2845 # TODO(tandrii): this should probably be a hard failure.
2846 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2847 % r)
2848 for c in sorted(cc):
2849 # refspec option will be rejected if cc doesn't correspond to an
2850 # account, even though REST call to add such arbitrary cc may succeed.
2851 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002852 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002853 cc.remove(c)
2854
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002855 refspec_suffix = ''
2856 if refspec_opts:
2857 refspec_suffix = '%' + ','.join(refspec_opts)
2858 assert ' ' not in refspec_suffix, (
2859 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2860 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002861
Edward Lemur1b52d872019-05-09 21:12:12 +00002862 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002863 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002864 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002865 'change_id': change_id,
2866 'description': change_desc.description,
2867 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002868
Gavin Mak4e5e3992022-11-14 22:40:12 +00002869 # Gerrit may or may not update fast enough to return the correct patchset
2870 # number after we push. Get the pre-upload patchset and increment later.
2871 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2872
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002873 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002874 git_push_metadata,
2875 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876
2877 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002878 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002879 change_numbers = [m.group(1)
2880 for m in map(regex.match, push_stdout.splitlines())
2881 if m]
2882 if len(change_numbers) != 1:
2883 DieWithError(
2884 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002885 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002887 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002888 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002889
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002890 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002891 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002892 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002893 gerrit_util.AddReviewers(self.GetGerritHost(),
2894 self._GerritChangeIdentifier(),
2895 reviewers,
2896 cc,
2897 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002898
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899 return 0
2900
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002901 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2902 change_desc):
2903 """Computes parent of the generated commit to be uploaded to Gerrit.
2904
2905 Returns revision or a ref name.
2906 """
2907 if custom_cl_base:
2908 # Try to avoid creating additional unintended CLs when uploading, unless
2909 # user wants to take this risk.
2910 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2911 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2912 local_ref_of_target_remote])
2913 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002914 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002915 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2916 'If you proceed with upload, more than 1 CL may be created by '
2917 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2918 'If you are certain that specified base `%s` has already been '
2919 'uploaded to Gerrit as another CL, you may proceed.\n' %
2920 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2921 if not force:
2922 confirm_or_exit(
2923 'Do you take responsibility for cleaning up potential mess '
2924 'resulting from proceeding with upload?',
2925 action='upload')
2926 return custom_cl_base
2927
Aaron Gablef97e33d2017-03-30 15:44:27 -07002928 if remote != '.':
2929 return self.GetCommonAncestorWithUpstream()
2930
2931 # If our upstream branch is local, we base our squashed commit on its
2932 # squashed version.
2933 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2934
Aaron Gablef97e33d2017-03-30 15:44:27 -07002935 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002936 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002937 if upstream_branch_name == 'main':
2938 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002939
2940 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002941 # TODO(tandrii): consider checking parent change in Gerrit and using its
2942 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2943 # the tree hash of the parent branch. The upside is less likely bogus
2944 # requests to reupload parent change just because it's uploadhash is
2945 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002946 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2947 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002948 # Verify that the upstream branch has been uploaded too, otherwise
2949 # Gerrit will create additional CLs when uploading.
2950 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2951 RunGitSilent(['rev-parse', parent + ':'])):
2952 DieWithError(
2953 '\nUpload upstream branch %s first.\n'
2954 'It is likely that this branch has been rebased since its last '
2955 'upload, so you just need to upload it again.\n'
2956 '(If you uploaded it with --no-squash, then branch dependencies '
2957 'are not supported, and you should reupload with --squash.)'
2958 % upstream_branch_name,
2959 change_desc)
2960 return parent
2961
Gavin Mak4e5e3992022-11-14 22:40:12 +00002962 def _UpdateWithExternalChanges(self):
2963 """Updates workspace with external changes.
2964
2965 Returns the commit hash that should be used as the merge base on upload.
2966 """
2967 local_ps = self.GetPatchset()
2968 if local_ps is None:
2969 return
2970
2971 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002972 if external_ps is None or local_ps == external_ps or \
2973 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002974 return
2975
2976 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002977 if num_changes > 1:
2978 change_words = 'changes were'
2979 else:
2980 change_words = 'change was'
2981 print('\n%d external %s published to %s:\n' %
2982 (num_changes, change_words, self.GetIssueURL(short=True)))
2983
2984 # Print an overview of external changes.
2985 ps_to_commit = {}
2986 ps_to_info = {}
2987 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2988 for commit_id, revision_info in revisions.get('revisions', {}).items():
2989 ps_num = revision_info['_number']
2990 ps_to_commit[ps_num] = commit_id
2991 ps_to_info[ps_num] = revision_info
2992
2993 for ps in range(external_ps, local_ps, -1):
2994 commit = ps_to_commit[ps][:8]
2995 desc = ps_to_info[ps].get('description', '')
2996 print('Patchset %d [%s] %s' % (ps, commit, desc))
2997
2998 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2999 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003000 return
3001
3002 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3003 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3004 external_base = external_parent['commit']
3005
3006 branch = git_common.current_branch()
3007 local_base = self.GetCommonAncestorWithUpstream()
3008 if local_base != external_base:
3009 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3010 (local_base, external_base))
3011 if git_common.upstream(branch):
3012 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3013 'to make these the same.')
3014 print('No upstream branch set. Consider setting it and using '
3015 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3016
3017 # Fetch Gerrit's CL base if it doesn't exist locally.
3018 remote, _ = self.GetRemoteBranch()
3019 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3020 RunGitSilent(['fetch', remote, external_base])
3021
3022 # Get the diff between local_ps and external_ps.
3023 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003024 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003025 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3026 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3027 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3028 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3029 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3030
3031 # Diff can be empty in the case of trivial rebases.
3032 if not diff:
3033 return external_base
3034
3035 # Apply the diff.
3036 with gclient_utils.temporary_file() as diff_tempfile:
3037 gclient_utils.FileWrite(diff_tempfile, diff)
3038 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3039 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3040 if not clean_patch:
3041 # Normally patchset is set after upload. But because we exit, that never
3042 # happens. Updating here makes sure that subsequent uploads don't need
3043 # to fetch/apply the same diff again.
3044 self.SetPatchset(external_ps)
3045 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3046 'conflicts and reupload.')
3047
3048 message = 'Incorporate external changes from '
3049 if num_changes == 1:
3050 message += 'patchset %d' % external_ps
3051 else:
3052 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3053 RunGitSilent(['commit', '-am', message])
3054 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3055 # patchset title instead of this 'Incorporate' message.
3056 return external_base
3057
Edward Lemura12175c2020-03-09 16:58:26 +00003058 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003059 """Re-commits using the current message, assumes the commit hook is in
3060 place.
3061 """
Edward Lemura12175c2020-03-09 16:58:26 +00003062 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003063 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003064 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003065 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003066 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003067
3068 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003069
tandriie113dfd2016-10-11 10:20:12 -07003070 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003071 try:
3072 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003073 except GerritChangeNotExists:
3074 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003075
3076 if data['status'] in ('ABANDONED', 'MERGED'):
3077 return 'CL %s is closed' % self.GetIssue()
3078
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003079 def GetGerritChange(self, patchset=None):
3080 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003081 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003082 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003083 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003084 data = self._GetChangeDetail(['ALL_REVISIONS'])
3085
3086 assert host and issue and patchset, 'CL must be uploaded first'
3087
3088 has_patchset = any(
3089 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003090 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003091 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003092 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003093 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003094
tandrii8c5a3532016-11-04 07:52:02 -07003095 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003096 'host': host,
3097 'change': issue,
3098 'project': data['project'],
3099 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003100 }
tandriie113dfd2016-10-11 10:20:12 -07003101
tandriide281ae2016-10-12 06:02:30 -07003102 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003103 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003104
Edward Lemur707d70b2018-02-07 00:50:14 +01003105 def GetReviewers(self):
3106 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003107 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003108
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003109
Lei Zhang8a0efc12020-08-05 19:58:45 +00003110def _get_bug_line_values(default_project_prefix, bugs):
3111 """Given default_project_prefix and comma separated list of bugs, yields bug
3112 line values.
tandriif9aefb72016-07-01 09:06:51 -07003113
3114 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003115 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003116 * string, which is left as is.
3117
3118 This function may produce more than one line, because bugdroid expects one
3119 project per line.
3120
Lei Zhang8a0efc12020-08-05 19:58:45 +00003121 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003122 ['v8:123', 'chromium:789']
3123 """
3124 default_bugs = []
3125 others = []
3126 for bug in bugs.split(','):
3127 bug = bug.strip()
3128 if bug:
3129 try:
3130 default_bugs.append(int(bug))
3131 except ValueError:
3132 others.append(bug)
3133
3134 if default_bugs:
3135 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003136 if default_project_prefix:
3137 if not default_project_prefix.endswith(':'):
3138 default_project_prefix += ':'
3139 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003140 else:
3141 yield default_bugs
3142 for other in sorted(others):
3143 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3144 yield other
3145
3146
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003147class ChangeDescription(object):
3148 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003149 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003150 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003151 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003152 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003153 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003154 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3155 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003156 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003157 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003158
Dan Beamd8b04ca2019-10-10 21:23:26 +00003159 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003160 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003161 if bug:
3162 regexp = re.compile(self.BUG_LINE)
3163 prefix = settings.GetBugPrefix()
3164 if not any((regexp.match(line) for line in self._description_lines)):
3165 values = list(_get_bug_line_values(prefix, bug))
3166 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003167 if fixed:
3168 regexp = re.compile(self.FIXED_LINE)
3169 prefix = settings.GetBugPrefix()
3170 if not any((regexp.match(line) for line in self._description_lines)):
3171 values = list(_get_bug_line_values(prefix, fixed))
3172 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003173
agable@chromium.org42c20792013-09-12 17:34:49 +00003174 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003175 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003176 return '\n'.join(self._description_lines)
3177
3178 def set_description(self, desc):
3179 if isinstance(desc, basestring):
3180 lines = desc.splitlines()
3181 else:
3182 lines = [line.rstrip() for line in desc]
3183 while lines and not lines[0]:
3184 lines.pop(0)
3185 while lines and not lines[-1]:
3186 lines.pop(-1)
3187 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003188
Edward Lemur5a644f82020-03-18 16:44:57 +00003189 def ensure_change_id(self, change_id):
3190 description = self.description
3191 footer_change_ids = git_footers.get_footer_change_id(description)
3192 # Make sure that the Change-Id in the description matches the given one.
3193 if footer_change_ids != [change_id]:
3194 if footer_change_ids:
3195 # Remove any existing Change-Id footers since they don't match the
3196 # expected change_id footer.
3197 description = git_footers.remove_footer(description, 'Change-Id')
3198 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3199 'if you want to set a new one.')
3200 # Add the expected Change-Id footer.
3201 description = git_footers.add_footer_change_id(description, change_id)
3202 self.set_description(description)
3203
Joanna Wang39811b12023-01-20 23:09:48 +00003204 def update_reviewers(self, reviewers):
3205 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206
3207 Args:
3208 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003209 """
Joanna Wang39811b12023-01-20 23:09:48 +00003210 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003211 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003212
3213 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214
Joanna Wang39811b12023-01-20 23:09:48 +00003215 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003216 regexp = re.compile(self.R_LINE)
3217 matches = [regexp.match(line) for line in self._description_lines]
3218 new_desc = [l for i, l in enumerate(self._description_lines)
3219 if not matches[i]]
3220 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003221
Joanna Wang39811b12023-01-20 23:09:48 +00003222 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003223
Joanna Wang39811b12023-01-20 23:09:48 +00003224 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003225 for match in matches:
3226 if not match:
3227 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003228 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003229
Joanna Wang39811b12023-01-20 23:09:48 +00003230 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003231
3232 # Put the new lines in the description where the old first R= line was.
3233 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3234 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003235 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003236 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003237 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003238
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003239 def set_preserve_tryjobs(self):
3240 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3241 footers = git_footers.parse_footers(self.description)
3242 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3243 if v.lower() == 'true':
3244 return
3245 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3246
Anthony Polito8b955342019-09-24 19:01:36 +00003247 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003248 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003249 self.set_description([
3250 '# Enter a description of the change.',
3251 '# This will be displayed on the codereview site.',
3252 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003253 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003254 '--------------------',
3255 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003256 bug_regexp = re.compile(self.BUG_LINE)
3257 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003258 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003259 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003260
Dan Beamd8b04ca2019-10-10 21:23:26 +00003261 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003262 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003263
Bruce Dawsonfc487042020-10-27 19:11:37 +00003264 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003265 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003266 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003267 if not content:
3268 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003269 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003270
Bruce Dawson2377b012018-01-11 16:46:49 -08003271 # Strip off comments and default inserted "Bug:" line.
3272 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003273 (line.startswith('#') or
3274 line.rstrip() == "Bug:" or
3275 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003276 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003277 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003278 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003279
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003280 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003281 """Adds a footer line to the description.
3282
3283 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3284 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3285 that Gerrit footers are always at the end.
3286 """
3287 parsed_footer_line = git_footers.parse_footer(line)
3288 if parsed_footer_line:
3289 # Line is a gerrit footer in the form: Footer-Key: any value.
3290 # Thus, must be appended observing Gerrit footer rules.
3291 self.set_description(
3292 git_footers.add_footer(self.description,
3293 key=parsed_footer_line[0],
3294 value=parsed_footer_line[1]))
3295 return
3296
3297 if not self._description_lines:
3298 self._description_lines.append(line)
3299 return
3300
3301 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3302 if gerrit_footers:
3303 # git_footers.split_footers ensures that there is an empty line before
3304 # actual (gerrit) footers, if any. We have to keep it that way.
3305 assert top_lines and top_lines[-1] == ''
3306 top_lines, separator = top_lines[:-1], top_lines[-1:]
3307 else:
3308 separator = [] # No need for separator if there are no gerrit_footers.
3309
3310 prev_line = top_lines[-1] if top_lines else ''
3311 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3312 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3313 top_lines.append('')
3314 top_lines.append(line)
3315 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003316
tandrii99a72f22016-08-17 14:33:24 -07003317 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003318 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003319 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003320 reviewers = [match.group(2).strip()
3321 for match in matches
3322 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003323 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003324
bradnelsond975b302016-10-23 12:20:23 -07003325 def get_cced(self):
3326 """Retrieves the list of reviewers."""
3327 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3328 cced = [match.group(2).strip() for match in matches if match]
3329 return cleanup_list(cced)
3330
Nodir Turakulov23b82142017-11-16 11:04:25 -08003331 def get_hash_tags(self):
3332 """Extracts and sanitizes a list of Gerrit hashtags."""
3333 subject = (self._description_lines or ('',))[0]
3334 subject = re.sub(
3335 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3336
3337 tags = []
3338 start = 0
3339 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3340 while True:
3341 m = bracket_exp.match(subject, start)
3342 if not m:
3343 break
3344 tags.append(self.sanitize_hash_tag(m.group(1)))
3345 start = m.end()
3346
3347 if not tags:
3348 # Try "Tag: " prefix.
3349 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3350 if m:
3351 tags.append(self.sanitize_hash_tag(m.group(1)))
3352 return tags
3353
3354 @classmethod
3355 def sanitize_hash_tag(cls, tag):
3356 """Returns a sanitized Gerrit hash tag.
3357
3358 A sanitized hashtag can be used as a git push refspec parameter value.
3359 """
3360 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3361
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003362
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003363def FindCodereviewSettingsFile(filename='codereview.settings'):
3364 """Finds the given file starting in the cwd and going up.
3365
3366 Only looks up to the top of the repository unless an
3367 'inherit-review-settings-ok' file exists in the root of the repository.
3368 """
3369 inherit_ok_file = 'inherit-review-settings-ok'
3370 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003371 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003372 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003373 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003374 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003375 if os.path.isfile(os.path.join(cwd, filename)):
3376 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 if cwd == root:
3378 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003379 parent_dir = os.path.dirname(cwd)
3380 if parent_dir == cwd:
3381 # We hit the system root directory.
3382 break
3383 cwd = parent_dir
3384 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003385
3386
3387def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003388 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003389 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003390
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003391 def SetProperty(name, setting, unset_error_ok=False):
3392 fullname = 'rietveld.' + name
3393 if setting in keyvals:
3394 RunGit(['config', fullname, keyvals[setting]])
3395 else:
3396 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3397
tandrii48df5812016-10-17 03:55:37 -07003398 if not keyvals.get('GERRIT_HOST', False):
3399 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003400 # Only server setting is required. Other settings can be absent.
3401 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003402 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3404 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003405 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003406 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3407 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003408 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3409 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003410 SetProperty(
3411 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003412 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003413
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003414 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003415 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003416
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003417 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003418 RunGit(['config', 'gerrit.squash-uploads',
3419 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003420
tandrii@chromium.org28253532016-04-14 13:46:56 +00003421 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003422 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003423 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3424
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003425 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003426 # should be of the form
3427 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3428 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003429 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3430 keyvals['ORIGIN_URL_CONFIG']])
3431
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003432
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003433def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003434 """Downloads a network object to a local file, like urllib.urlretrieve.
3435
3436 This is necessary because urllib is broken for SSL connections via a proxy.
3437 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003438 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003439 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003440
3441
ukai@chromium.org712d6102013-11-27 00:52:58 +00003442def hasSheBang(fname):
3443 """Checks fname is a #! script."""
3444 with open(fname) as f:
3445 return f.read(2).startswith('#!')
3446
3447
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003448def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003449 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003450
3451 Args:
3452 force: True to update hooks. False to install hooks if not present.
3453 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003454 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003455 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3456 if not os.access(dst, os.X_OK):
3457 if os.path.exists(dst):
3458 if not force:
3459 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003460 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003461 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003462 if not hasSheBang(dst):
3463 DieWithError('Not a script: %s\n'
3464 'You need to download from\n%s\n'
3465 'into .git/hooks/commit-msg and '
3466 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003467 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3468 except Exception:
3469 if os.path.exists(dst):
3470 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003471 DieWithError('\nFailed to download hooks.\n'
3472 'You need to download from\n%s\n'
3473 'into .git/hooks/commit-msg and '
3474 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003475
3476
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003477class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003478 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003479
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003480 def __init__(self):
3481 # Cached list of [host, identity, source], where source is either
3482 # .gitcookies or .netrc.
3483 self._all_hosts = None
3484
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003485 def ensure_configured_gitcookies(self):
3486 """Runs checks and suggests fixes to make git use .gitcookies from default
3487 path."""
3488 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3489 configured_path = RunGitSilent(
3490 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003491 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003492 if configured_path:
3493 self._ensure_default_gitcookies_path(configured_path, default)
3494 else:
3495 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003496
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003497 @staticmethod
3498 def _ensure_default_gitcookies_path(configured_path, default_path):
3499 assert configured_path
3500 if configured_path == default_path:
3501 print('git is already configured to use your .gitcookies from %s' %
3502 configured_path)
3503 return
3504
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003505 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003506 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3507 (configured_path, default_path))
3508
3509 if not os.path.exists(configured_path):
3510 print('However, your configured .gitcookies file is missing.')
3511 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3512 action='reconfigure')
3513 RunGit(['config', '--global', 'http.cookiefile', default_path])
3514 return
3515
3516 if os.path.exists(default_path):
3517 print('WARNING: default .gitcookies file already exists %s' %
3518 default_path)
3519 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3520 default_path)
3521
3522 confirm_or_exit('Move existing .gitcookies to default location?',
3523 action='move')
3524 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003525 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003526 print('Moved and reconfigured git to use .gitcookies from %s' %
3527 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003528
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003529 @staticmethod
3530 def _configure_gitcookies_path(default_path):
3531 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3532 if os.path.exists(netrc_path):
3533 print('You seem to be using outdated .netrc for git credentials: %s' %
3534 netrc_path)
3535 print('This tool will guide you through setting up recommended '
3536 '.gitcookies store for git credentials.\n'
3537 '\n'
3538 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3539 ' git config --global --unset http.cookiefile\n'
3540 ' mv %s %s.backup\n\n' % (default_path, default_path))
3541 confirm_or_exit(action='setup .gitcookies')
3542 RunGit(['config', '--global', 'http.cookiefile', default_path])
3543 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003544
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003545 def get_hosts_with_creds(self, include_netrc=False):
3546 if self._all_hosts is None:
3547 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003548 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3549 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3550 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3551 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003552
3553 if include_netrc:
3554 return self._all_hosts
3555 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3556
3557 def print_current_creds(self, include_netrc=False):
3558 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3559 if not hosts:
3560 print('No Git/Gerrit credentials found')
3561 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003562 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003563 header = [('Host', 'User', 'Which file'),
3564 ['=' * l for l in lengths]]
3565 for row in (header + hosts):
3566 print('\t'.join((('%%+%ds' % l) % s)
3567 for l, s in zip(lengths, row)))
3568
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003569 @staticmethod
3570 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003571 """Parses identity "git-<username>.domain" into <username> and domain."""
3572 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003573 # distinguishable from sub-domains. But we do know typical domains:
3574 if identity.endswith('.chromium.org'):
3575 domain = 'chromium.org'
3576 username = identity[:-len('.chromium.org')]
3577 else:
3578 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003579 if username.startswith('git-'):
3580 username = username[len('git-'):]
3581 return username, domain
3582
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003583 def has_generic_host(self):
3584 """Returns whether generic .googlesource.com has been configured.
3585
3586 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3587 """
3588 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003589 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003590 return True
3591 return False
3592
3593 def _get_git_gerrit_identity_pairs(self):
3594 """Returns map from canonic host to pair of identities (Git, Gerrit).
3595
3596 One of identities might be None, meaning not configured.
3597 """
3598 host_to_identity_pairs = {}
3599 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003600 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003601 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3602 idx = 0 if canonical == host else 1
3603 pair[idx] = identity
3604 return host_to_identity_pairs
3605
3606 def get_partially_configured_hosts(self):
3607 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003608 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003609 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003610 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003611
3612 def get_conflicting_hosts(self):
3613 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003614 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003615 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616 if None not in (i1, i2) and i1 != i2)
3617
3618 def get_duplicated_hosts(self):
3619 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003620 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003621
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003622
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003623 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003624 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003625 hosts = sorted(hosts)
3626 assert hosts
3627 if extra_column_func is None:
3628 extras = [''] * len(hosts)
3629 else:
3630 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003631 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3632 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 lines.append(tmpl % he)
3635 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003636
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003637 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003639 yield ('.googlesource.com wildcard record detected',
3640 ['Chrome Infrastructure team recommends to list full host names '
3641 'explicitly.'],
3642 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643
3644 dups = self.get_duplicated_hosts()
3645 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003646 yield ('The following hosts were defined twice',
3647 self._format_hosts(dups),
3648 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003649
3650 partial = self.get_partially_configured_hosts()
3651 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003652 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3653 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003654 self._format_hosts(
3655 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3656 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003657
3658 conflicting = self.get_conflicting_hosts()
3659 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003660 yield ('The following Git hosts have differing credentials from their '
3661 'Gerrit counterparts',
3662 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3663 tuple(self._get_git_gerrit_identity_pairs()[host])),
3664 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003665
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 def find_and_report_problems(self):
3667 """Returns True if there was at least one problem, else False."""
3668 found = False
3669 bad_hosts = set()
3670 for title, sublines, hosts in self._find_problems():
3671 if not found:
3672 found = True
3673 print('\n\n.gitcookies problem report:\n')
3674 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003675 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003676 if sublines:
3677 print()
3678 print(' %s' % '\n '.join(sublines))
3679 print()
3680
3681 if bad_hosts:
3682 assert found
3683 print(' You can manually remove corresponding lines in your %s file and '
3684 'visit the following URLs with correct account to generate '
3685 'correct credential lines:\n' %
3686 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003687 print(' %s' % '\n '.join(
3688 sorted(
3689 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3690 _canonical_git_googlesource_host(host))
3691 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003692 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003693
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003694
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003695@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003696def CMDcreds_check(parser, args):
3697 """Checks credentials and suggests changes."""
3698 _, _ = parser.parse_args(args)
3699
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003700 # Code below checks .gitcookies. Abort if using something else.
3701 authn = gerrit_util.Authenticator.get()
3702 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003703 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003704 'This command is not designed for bot environment. It checks '
3705 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003706 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3707 if isinstance(authn, gerrit_util.GceAuthenticator):
3708 message += (
3709 '\n'
3710 'If you need to run this on GCE or a cloudtop instance, '
3711 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3712 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003713
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003714 checker = _GitCookiesChecker()
3715 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003716
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003717 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003718 checker.print_current_creds(include_netrc=True)
3719
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003720 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003721 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003722 return 0
3723 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003724
3725
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003726@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003727def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003728 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003729 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003730 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003731 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003732 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003734 return RunGit(['config', 'branch.%s.base-url' % branch],
3735 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003736
3737 print('Setting base-url to %s' % args[0])
3738 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3739 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003740
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003741
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003742def color_for_status(status):
3743 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003744 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003745 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003746 'unsent': BOLD + Fore.YELLOW,
3747 'waiting': BOLD + Fore.RED,
3748 'reply': BOLD + Fore.YELLOW,
3749 'not lgtm': BOLD + Fore.RED,
3750 'lgtm': BOLD + Fore.GREEN,
3751 'commit': BOLD + Fore.MAGENTA,
3752 'closed': BOLD + Fore.CYAN,
3753 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003754 }.get(status, Fore.WHITE)
3755
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003756
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003757def get_cl_statuses(changes, fine_grained, max_processes=None):
3758 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003759
3760 If fine_grained is true, this will fetch CL statuses from the server.
3761 Otherwise, simply indicate if there's a matching url for the given branches.
3762
3763 If max_processes is specified, it is used as the maximum number of processes
3764 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3765 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003766
3767 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003768 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003769 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003770 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003771
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003772 if not fine_grained:
3773 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003774 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003775 for cl in changes:
3776 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003777 return
3778
3779 # First, sort out authentication issues.
3780 logging.debug('ensuring credentials exist')
3781 for cl in changes:
3782 cl.EnsureAuthenticated(force=False, refresh=True)
3783
3784 def fetch(cl):
3785 try:
3786 return (cl, cl.GetStatus())
3787 except:
3788 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003789 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003790 raise
3791
3792 threads_count = len(changes)
3793 if max_processes:
3794 threads_count = max(1, min(threads_count, max_processes))
3795 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3796
Edward Lemur61bf4172020-02-24 23:22:37 +00003797 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003798 fetched_cls = set()
3799 try:
3800 it = pool.imap_unordered(fetch, changes).__iter__()
3801 while True:
3802 try:
3803 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003804 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003805 break
3806 fetched_cls.add(cl)
3807 yield cl, status
3808 finally:
3809 pool.close()
3810
3811 # Add any branches that failed to fetch.
3812 for cl in set(changes) - fetched_cls:
3813 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003814
rmistry@google.com2dd99862015-06-22 12:22:18 +00003815
Jose Lopes3863fc52020-04-07 17:00:25 +00003816def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003817 """Uploads CLs of local branches that are dependents of the current branch.
3818
3819 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003820
3821 test1 -> test2.1 -> test3.1
3822 -> test3.2
3823 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003824
3825 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3826 run on the dependent branches in this order:
3827 test2.1, test3.1, test3.2, test2.2, test3.3
3828
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003829 Note: This function does not rebase your local dependent branches. Use it
3830 when you make a change to the parent branch that will not conflict
3831 with its dependent branches, and you would like their dependencies
3832 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003833 """
3834 if git_common.is_dirty_git_tree('upload-branch-deps'):
3835 return 1
3836
3837 root_branch = cl.GetBranch()
3838 if root_branch is None:
3839 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3840 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003841 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003842 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3843 'patchset dependencies without an uploaded CL.')
3844
3845 branches = RunGit(['for-each-ref',
3846 '--format=%(refname:short) %(upstream:short)',
3847 'refs/heads'])
3848 if not branches:
3849 print('No local branches found.')
3850 return 0
3851
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003852 # Create a dictionary of all local branches to the branches that are
3853 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003854 tracked_to_dependents = collections.defaultdict(list)
3855 for b in branches.splitlines():
3856 tokens = b.split()
3857 if len(tokens) == 2:
3858 branch_name, tracked = tokens
3859 tracked_to_dependents[tracked].append(branch_name)
3860
vapiera7fbd5a2016-06-16 09:17:49 -07003861 print()
3862 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003863 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003864
rmistry@google.com2dd99862015-06-22 12:22:18 +00003865 def traverse_dependents_preorder(branch, padding=''):
3866 dependents_to_process = tracked_to_dependents.get(branch, [])
3867 padding += ' '
3868 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003869 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870 dependents.append(dependent)
3871 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003872
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003874 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875
3876 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003878 return 0
3879
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880 # Record all dependents that failed to upload.
3881 failures = {}
3882 # Go through all dependents, checkout the branch and upload.
3883 try:
3884 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print()
3886 print('--------------------------------------')
3887 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 try:
3891 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003894 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003897 finally:
3898 # Swap back to the original root branch.
3899 RunGit(['checkout', '-q', root_branch])
3900
vapiera7fbd5a2016-06-16 09:17:49 -07003901 print()
3902 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903 for dependent_branch in dependents:
3904 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print(' %s : %s' % (dependent_branch, upload_status))
3906 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003907
3908 return 0
3909
3910
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003911def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003912 """Given a proposed tag name, returns a tag name that is guaranteed to be
3913 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3914 or 'foo-3', and so on."""
3915
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003916 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003917 for suffix_num in itertools.count(1):
3918 if suffix_num == 1:
3919 to_check = proposed_tag
3920 else:
3921 to_check = '%s-%d' % (proposed_tag, suffix_num)
3922
3923 if to_check not in existing_tags:
3924 return to_check
3925
3926
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003927@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003928def CMDarchive(parser, args):
3929 """Archives and deletes branches associated with closed changelists."""
3930 parser.add_option(
3931 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003932 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003933 parser.add_option(
3934 '-f', '--force', action='store_true',
3935 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003936 parser.add_option(
3937 '-d', '--dry-run', action='store_true',
3938 help='Skip the branch tagging and removal steps.')
3939 parser.add_option(
3940 '-t', '--notags', action='store_true',
3941 help='Do not tag archived branches. '
3942 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003943 parser.add_option(
3944 '-p',
3945 '--pattern',
3946 default='git-cl-archived-{issue}-{branch}',
3947 help='Format string for archive tags. '
3948 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003949
kmarshall3bff56b2016-06-06 18:31:47 -07003950 options, args = parser.parse_args(args)
3951 if args:
3952 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003953
3954 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3955 if not branches:
3956 return 0
3957
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003958 tags = RunGit(['for-each-ref', '--format=%(refname)',
3959 'refs/tags']).splitlines() or []
3960 tags = [t.split('/')[-1] for t in tags]
3961
vapiera7fbd5a2016-06-16 09:17:49 -07003962 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003963 changes = [Changelist(branchref=b)
3964 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003965 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3966 statuses = get_cl_statuses(changes,
3967 fine_grained=True,
3968 max_processes=options.maxjobs)
3969 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003970 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3971 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003972 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003973 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003974 proposal.sort()
3975
3976 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003977 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003978 return 0
3979
Edward Lemur85153282020-02-14 22:06:29 +00003980 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003981
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003983 if options.notags:
3984 for next_item in proposal:
3985 print(' ' + next_item[0])
3986 else:
3987 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3988 for next_item in proposal:
3989 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003990
kmarshall9249e012016-08-23 12:02:16 -07003991 # Quit now on precondition failure or if instructed by the user, either
3992 # via an interactive prompt or by command line flags.
3993 if options.dry_run:
3994 print('\nNo changes were made (dry run).\n')
3995 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003996
3997 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003998 print('You are currently on a branch \'%s\' which is associated with a '
3999 'closed codereview issue, so archive cannot proceed. Please '
4000 'checkout another branch and run this command again.' %
4001 current_branch)
4002 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004003
4004 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004005 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004006 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004007 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004008 return 1
4009
4010 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004011 if not options.notags:
4012 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004013
4014 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4015 # Clean up the tag if we failed to delete the branch.
4016 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004017
vapiera7fbd5a2016-06-16 09:17:49 -07004018 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004019
4020 return 0
4021
4022
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004023@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004024def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004025 """Show status of changelists.
4026
4027 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004028 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004029 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004030 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004031 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004032 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004033 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004034 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004035
4036 Also see 'git cl comments'.
4037 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004038 parser.add_option(
4039 '--no-branch-color',
4040 action='store_true',
4041 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004043 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004044 parser.add_option('-f', '--fast', action='store_true',
4045 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004046 parser.add_option(
4047 '-j', '--maxjobs', action='store', type=int,
4048 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004049 parser.add_option(
4050 '-i', '--issue', type=int,
4051 help='Operate on this issue instead of the current branch\'s implicit '
4052 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004053 parser.add_option('-d',
4054 '--date-order',
4055 action='store_true',
4056 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004057 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004058 if args:
4059 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004060
iannuccie53c9352016-08-17 14:40:40 -07004061 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004062 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004064 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004065 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004067 if cl.GetIssue():
4068 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004069 elif options.field == 'id':
4070 issueid = cl.GetIssue()
4071 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004072 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004074 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004077 elif options.field == 'status':
4078 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079 elif options.field == 'url':
4080 url = cl.GetIssueURL()
4081 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004083 return 0
4084
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004085 branches = RunGit([
4086 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4087 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004088 if not branches:
4089 print('No local branch found.')
4090 return 0
4091
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004092 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004093 Changelist(branchref=b, commit_date=ct)
4094 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4095 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004097 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004098 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004099 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004100
Edward Lemur85153282020-02-14 22:06:29 +00004101 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004102
4103 def FormatBranchName(branch, colorize=False):
4104 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4105 an asterisk when it is the current branch."""
4106
4107 asterisk = ""
4108 color = Fore.RESET
4109 if branch == current_branch:
4110 asterisk = "* "
4111 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004112 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004113
4114 if colorize:
4115 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004116 return asterisk + branch_name
4117
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004118 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004119
4120 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004121
4122 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004123 sorted_changes = sorted(changes,
4124 key=lambda c: c.GetCommitDate(),
4125 reverse=True)
4126 else:
4127 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4128 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004129 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004130 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004131 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004132 branch_statuses[c.GetBranch()] = status
4133 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004134 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004135 if url and (not status or status == 'error'):
4136 # The issue probably doesn't exist anymore.
4137 url += ' (broken)'
4138
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004139 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004140 # Turn off bold as well as colors.
4141 END = '\033[0m'
4142 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004143 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004144 color = ''
4145 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004146 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004147
Alan Cuttera3be9a52019-03-04 18:50:33 +00004148 branch_display = FormatBranchName(branch)
4149 padding = ' ' * (alignment - len(branch_display))
4150 if not options.no_branch_color:
4151 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004152
Alan Cuttera3be9a52019-03-04 18:50:33 +00004153 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4154 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004155
vapiera7fbd5a2016-06-16 09:17:49 -07004156 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004157 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004158 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004159 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004160 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004161 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004163 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004164 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004165 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004167 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004168 return 0
4169
4170
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004171def colorize_CMDstatus_doc():
4172 """To be called once in main() to add colors to git cl status help."""
4173 colors = [i for i in dir(Fore) if i[0].isupper()]
4174
4175 def colorize_line(line):
4176 for color in colors:
4177 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004178 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004179 indent = len(line) - len(line.lstrip(' ')) + 1
4180 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4181 return line
4182
4183 lines = CMDstatus.__doc__.splitlines()
4184 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4185
4186
phajdan.jre328cf92016-08-22 04:12:17 -07004187def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004188 if path == '-':
4189 json.dump(contents, sys.stdout)
4190 else:
4191 with open(path, 'w') as f:
4192 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004193
4194
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004195@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004196@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004197def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004198 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199
4200 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004201 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004202 parser.add_option('-r', '--reverse', action='store_true',
4203 help='Lookup the branch(es) for the specified issues. If '
4204 'no issues are specified, all branches with mapped '
4205 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004206 parser.add_option('--json',
4207 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004208 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004209
dnj@chromium.org406c4402015-03-03 17:22:28 +00004210 if options.reverse:
4211 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004212 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004213 # Reverse issue lookup.
4214 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004215
4216 git_config = {}
4217 for config in RunGit(['config', '--get-regexp',
4218 r'branch\..*issue']).splitlines():
4219 name, _space, val = config.partition(' ')
4220 git_config[name] = val
4221
dnj@chromium.org406c4402015-03-03 17:22:28 +00004222 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004223 issue = git_config.get(
4224 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004225 if issue:
4226 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004227 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004228 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004229 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004231 try:
4232 issue_num = int(issue)
4233 except ValueError:
4234 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004235 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004236 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004238 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004239 if options.json:
4240 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004241 return 0
4242
4243 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004244 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004245 if not issue.valid:
4246 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4247 'or no argument to list it.\n'
4248 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004249 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004250 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004251 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004252 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004253 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4254 if options.json:
4255 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004256 'gerrit_host': cl.GetGerritHost(),
4257 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004258 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004259 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004260 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261 return 0
4262
4263
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004264@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004265def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004266 """Shows or posts review comments for any changelist."""
4267 parser.add_option('-a', '--add-comment', dest='comment',
4268 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004269 parser.add_option('-p', '--publish', action='store_true',
4270 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004271 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004272 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004273 parser.add_option('-m', '--machine-readable', dest='readable',
4274 action='store_false', default=True,
4275 help='output comments in a format compatible with '
4276 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004277 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004278 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004279 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004280
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004281 issue = None
4282 if options.issue:
4283 try:
4284 issue = int(options.issue)
4285 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004286 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004287
Edward Lemur934836a2019-09-09 20:16:54 +00004288 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004289
4290 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004291 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004292 return 0
4293
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004294 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4295 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004296 for comment in summary:
4297 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004298 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004299 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004301 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004302 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004303 elif comment.autogenerated:
4304 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004305 else:
4306 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004307 print('\n%s%s %s%s\n%s' % (
4308 color,
4309 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4310 comment.sender,
4311 Fore.RESET,
4312 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4313
smut@google.comc85ac942015-09-15 16:34:43 +00004314 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004315 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004316 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004317 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4318 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004319 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004320 return 0
4321
4322
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004323@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004324@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004325def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004326 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004327 parser.add_option('-d', '--display', action='store_true',
4328 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004329 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004330 help='New description to set for this issue (- for stdin, '
4331 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004332 parser.add_option('-f', '--force', action='store_true',
4333 help='Delete any unpublished Gerrit edits for this issue '
4334 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004335
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004336 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004337
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004338 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004339 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004340 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004341 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004342 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004343
Edward Lemur934836a2019-09-09 20:16:54 +00004344 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004345 if target_issue_arg:
4346 kwargs['issue'] = target_issue_arg.issue
4347 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004348
4349 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004350 if not cl.GetIssue():
4351 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004352
Edward Lemur678a6842019-10-03 22:25:05 +00004353 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004354 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004355
Edward Lemur6c6827c2020-02-06 21:15:18 +00004356 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004357
smut@google.com34fb6b12015-07-13 20:03:26 +00004358 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004359 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004360 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004361
4362 if options.new_description:
4363 text = options.new_description
4364 if text == '-':
4365 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004366 elif text == '+':
4367 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004368 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004369
4370 description.set_description(text)
4371 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004372 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004373 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004374 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004375 return 0
4376
4377
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004378@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004379def CMDlint(parser, args):
4380 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004381 parser.add_option('--filter', action='append', metavar='-x,+y',
4382 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004383 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004384
4385 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004386 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004387 try:
4388 import cpplint
4389 import cpplint_chromium
4390 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004391 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004392 return 1
4393
4394 # Change the current working directory before calling lint so that it
4395 # shows the correct base.
4396 previous_cwd = os.getcwd()
4397 os.chdir(settings.GetRoot())
4398 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004399 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004400 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004401 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004402 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004403 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004404
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004405 # Process cpplint arguments, if any.
4406 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4407 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004408 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004409
Lei Zhang379d1ad2020-07-15 19:40:06 +00004410 include_regex = re.compile(settings.GetLintRegex())
4411 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004412 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4413 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004414 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004415 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004416 continue
4417
4418 if ignore_regex.match(filename):
4419 print('Ignoring file %s' % filename)
4420 continue
4421
4422 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4423 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004424 finally:
4425 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004426 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004427 if cpplint._cpplint_state.error_count != 0:
4428 return 1
4429 return 0
4430
4431
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004432@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004434 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004435 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004436 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004437 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004438 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004439 parser.add_option('--all', action='store_true',
4440 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004441 parser.add_option('--files',
4442 nargs=1,
4443 help='Semicolon-separated list of files to be marked as '
4444 'modified when executing presubmit or post-upload hooks. '
4445 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004446 parser.add_option('--parallel', action='store_true',
4447 help='Run all tests specified by input_api.RunTests in all '
4448 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004449 parser.add_option('--resultdb', action='store_true',
4450 help='Run presubmit checks in the ResultSink environment '
4451 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004452 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004453 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004454
sbc@chromium.org71437c02015-04-09 19:29:40 +00004455 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004456 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004457 return 1
4458
Edward Lemur934836a2019-09-09 20:16:54 +00004459 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460 if args:
4461 base_branch = args[0]
4462 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004463 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004464 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004466 start = time.time()
4467 try:
4468 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4469 description = cl.FetchDescription()
4470 else:
4471 description = _create_description_from_log([base_branch])
4472 except Exception as e:
4473 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004474 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004475 elapsed = time.time() - start
4476 if elapsed > 5:
4477 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004478
Bruce Dawson13acea32022-05-03 22:13:08 +00004479 if not base_branch:
4480 if not options.force:
4481 print('use --force to check even when not on a branch.')
4482 return 1
4483 base_branch = 'HEAD'
4484
Josip Sokcevic017544d2022-03-31 23:47:53 +00004485 cl.RunHook(committing=not options.upload,
4486 may_prompt=False,
4487 verbose=options.verbose,
4488 parallel=options.parallel,
4489 upstream=base_branch,
4490 description=description,
4491 all_files=options.all,
4492 files=options.files,
4493 resultdb=options.resultdb,
4494 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004495 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004496
4497
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004498def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004499 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004500
4501 Works the same way as
4502 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4503 but can be called on demand on all platforms.
4504
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004505 The basic idea is to generate git hash of a state of the tree, original
4506 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004507 """
4508 lines = []
4509 tree_hash = RunGitSilent(['write-tree'])
4510 lines.append('tree %s' % tree_hash.strip())
4511 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4512 if code == 0:
4513 lines.append('parent %s' % parent.strip())
4514 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4515 lines.append('author %s' % author.strip())
4516 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4517 lines.append('committer %s' % committer.strip())
4518 lines.append('')
4519 # Note: Gerrit's commit-hook actually cleans message of some lines and
4520 # whitespace. This code is not doing this, but it clearly won't decrease
4521 # entropy.
4522 lines.append(message)
4523 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004524 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004525 return 'I%s' % change_hash.strip()
4526
4527
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004528def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004529 """Computes the remote branch ref to use for the CL.
4530
4531 Args:
4532 remote (str): The git remote for the CL.
4533 remote_branch (str): The git remote branch for the CL.
4534 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004535 """
4536 if not (remote and remote_branch):
4537 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004538
wittman@chromium.org455dc922015-01-26 20:15:50 +00004539 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004540 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004541 # refs, which are then translated into the remote full symbolic refs
4542 # below.
4543 if '/' not in target_branch:
4544 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4545 else:
4546 prefix_replacements = (
4547 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4548 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4549 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4550 )
4551 match = None
4552 for regex, replacement in prefix_replacements:
4553 match = re.search(regex, target_branch)
4554 if match:
4555 remote_branch = target_branch.replace(match.group(0), replacement)
4556 break
4557 if not match:
4558 # This is a branch path but not one we recognize; use as-is.
4559 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004560 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004561 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004562 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004563 # Handle the refs that need to land in different refs.
4564 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004565
wittman@chromium.org455dc922015-01-26 20:15:50 +00004566 # Create the true path to the remote branch.
4567 # Does the following translation:
4568 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004569 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004570 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4571 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4572 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4573 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4574 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4575 'refs/heads/')
4576 elif remote_branch.startswith('refs/remotes/branch-heads'):
4577 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004578
wittman@chromium.org455dc922015-01-26 20:15:50 +00004579 return remote_branch
4580
4581
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004582def cleanup_list(l):
4583 """Fixes a list so that comma separated items are put as individual items.
4584
4585 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4586 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4587 """
4588 items = sum((i.split(',') for i in l), [])
4589 stripped_items = (i.strip() for i in items)
4590 return sorted(filter(None, stripped_items))
4591
4592
Aaron Gable4db38df2017-11-03 14:59:07 -07004593@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004594@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004595def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004596 """Uploads the current changelist to codereview.
4597
4598 Can skip dependency patchset uploads for a branch by running:
4599 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004600 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004601 git config --unset branch.branch_name.skip-deps-uploads
4602 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004603
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004604 If the name of the checked out branch starts with "bug-" or "fix-" followed
4605 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004606 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004607
4608 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004609 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004610 [git-cl] add support for hashtags
4611 Foo bar: implement foo
4612 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004613 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004614 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4615 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004616 parser.add_option('--bypass-watchlists', action='store_true',
4617 dest='bypass_watchlists',
4618 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004619 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004620 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004621 parser.add_option('--message', '-m', dest='message',
4622 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004623 parser.add_option('-b', '--bug',
4624 help='pre-populate the bug number(s) for this issue. '
4625 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004626 parser.add_option('--message-file', dest='message_file',
4627 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004628 parser.add_option('--title', '-t', dest='title',
4629 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004630 parser.add_option('-T', '--skip-title', action='store_true',
4631 dest='skip_title',
4632 help='Use the most recent commit message as the title of '
4633 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004634 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004635 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004636 help='reviewer email addresses')
4637 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004638 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004639 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004640 parser.add_option('--hashtag', dest='hashtags',
4641 action='append', default=[],
4642 help=('Gerrit hashtag for new CL; '
4643 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004644 parser.add_option('-s',
4645 '--send-mail',
4646 '--send-email',
4647 dest='send_mail',
4648 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004649 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004650 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004651 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004652 metavar='TARGET',
4653 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004654 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004655 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004656 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004657 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004658 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004659 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004660 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004661 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4662 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004663 parser.add_option('-c',
4664 '--use-commit-queue',
4665 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004666 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004667 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004668 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004669 parser.add_option('-d', '--cq-dry-run',
4670 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004671 help='Send the patchset to do a CQ dry run right after '
4672 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004673 parser.add_option(
4674 '-q',
4675 '--cq-quick-run',
4676 action='store_true',
4677 default=False,
4678 help='Send the patchset to do a CQ quick run right after '
4679 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4680 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004681 parser.add_option('--set-bot-commit', action='store_true',
4682 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004683 parser.add_option('--preserve-tryjobs', action='store_true',
4684 help='instruct the CQ to let tryjobs running even after '
4685 'new patchsets are uploaded instead of canceling '
4686 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004687 parser.add_option('--dependencies', action='store_true',
4688 help='Uploads CLs of all the local branches that depend on '
4689 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004690 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4691 help='Sends your change to the CQ after an approval. Only '
4692 'works on repos that have the Auto-Submit label '
4693 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004694 parser.add_option('--parallel', action='store_true',
4695 help='Run all tests specified by input_api.RunTests in all '
4696 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004697 parser.add_option('--no-autocc', action='store_true',
4698 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004699 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004700 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004701 parser.add_option('-R', '--retry-failed', action='store_true',
4702 help='Retry failed tryjobs from old patchset immediately '
4703 'after uploading new patchset. Cannot be used with '
4704 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004705 parser.add_option('--fixed', '-x',
4706 help='List of bugs that will be commented on and marked '
4707 'fixed (pre-populates "Fixed:" tag). Same format as '
4708 '-b option / "Bug:" tag. If fixing several issues, '
4709 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004710 parser.add_option('--edit-description', action='store_true', default=False,
4711 help='Modify description before upload. Cannot be used '
4712 'with --force. It is a noop when --no-squash is set '
4713 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004714 parser.add_option('--git-completion-helper', action="store_true",
4715 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004716 parser.add_option('-o',
4717 '--push-options',
4718 action='append',
4719 default=[],
4720 help='Transmit the given string to the server when '
4721 'performing git push (pass-through). See git-push '
4722 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004723 parser.add_option('--no-add-changeid',
4724 action='store_true',
4725 dest='no_add_changeid',
4726 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004727 parser.add_option('--no-python2-post-upload-hooks',
4728 action='store_true',
4729 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004730 parser.add_option('--cherry-pick-stacked',
4731 '--cp',
4732 dest='cherry_pick_stacked',
4733 action='store_true',
4734 help='If parent branch has un-uploaded updates, '
4735 'automatically skip parent branches and just upload '
4736 'the current branch cherry-pick on its parent\'s last '
4737 'uploaded commit. Allows users to skip the potential '
4738 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004739 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004740
rmistry@google.com2dd99862015-06-22 12:22:18 +00004741 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004742 (options, args) = parser.parse_args(args)
4743
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004744 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004745 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4746 if opt.help != optparse.SUPPRESS_HELP))
4747 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004748
sbc@chromium.org71437c02015-04-09 19:29:40 +00004749 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004750 return 1
4751
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004752 options.reviewers = cleanup_list(options.reviewers)
4753 options.cc = cleanup_list(options.cc)
4754
Josipe827b0f2020-01-30 00:07:20 +00004755 if options.edit_description and options.force:
4756 parser.error('Only one of --force and --edit-description allowed')
4757
tandriib80458a2016-06-23 12:20:07 -07004758 if options.message_file:
4759 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004760 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004761 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004762
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004763 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004764 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004765 options.use_commit_queue,
4766 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004767 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4768 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004769
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004770 if options.skip_title and options.title:
4771 parser.error('Only one of --title and --skip-title allowed.')
4772
Aaron Gableedbc4132017-09-11 13:22:28 -07004773 if options.use_commit_queue:
4774 options.send_mail = True
4775
Edward Lesmes0dd54822020-03-26 18:24:25 +00004776 if options.squash is None:
4777 # Load default for user, repo, squash=true, in this order.
4778 options.squash = settings.GetSquashGerritUploads()
4779
Joanna Wangb54d0f02023-02-24 23:10:19 +00004780 if options.squash and os.environ.get('DOGFOOD_STACKED_CHANGES') == '1':
Joanna Wangdd12deb2023-01-26 20:43:28 +00004781 if options.dependencies:
4782 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004783
Joanna Wangd75fc882023-03-01 21:53:34 +00004784 if options.cherry_pick_stacked:
4785 try:
4786 orig_args.remove('--cherry-pick-stacked')
4787 except ValueError:
4788 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004789 UploadAllSquashed(options, orig_args)
4790 return 0
4791
Joanna Wangd75fc882023-03-01 21:53:34 +00004792 if options.cherry_pick_stacked:
4793 parser.error('--cherry-pick-stacked is not available for this workflow.')
4794
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004795 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004796 # Warm change details cache now to avoid RPCs later, reducing latency for
4797 # developers.
4798 if cl.GetIssue():
4799 cl._GetChangeDetail(
4800 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4801
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004802 if options.retry_failed and not cl.GetIssue():
4803 print('No previous patchsets, so --retry-failed has no effect.')
4804 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004805
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004806 # cl.GetMostRecentPatchset uses cached information, and can return the last
4807 # patchset before upload. Calling it here makes it clear that it's the
4808 # last patchset before upload. Note that GetMostRecentPatchset will fail
4809 # if no CL has been uploaded yet.
4810 if options.retry_failed:
4811 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004812
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004813 ret = cl.CMDUpload(options, args, orig_args)
4814
4815 if options.retry_failed:
4816 if ret != 0:
4817 print('Upload failed, so --retry-failed has no effect.')
4818 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004819 builds, _ = _fetch_latest_builds(cl,
4820 DEFAULT_BUILDBUCKET_HOST,
4821 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004822 jobs = _filter_failed_for_retry(builds)
4823 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004824 print('No failed tryjobs, so --retry-failed has no effect.')
4825 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004826 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004827
4828 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004829
4830
Joanna Wang18de1f62023-01-21 01:24:24 +00004831def UploadAllSquashed(options, orig_args):
4832 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4833 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004834 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004835
Joanna Wangc710e2d2023-01-25 14:53:22 +00004836 # Create commits.
4837 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4838 if cherry_pick_current:
4839 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4840 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4841 uploads_by_cl.append((cls[0], new_upload))
4842 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004843 ordered_cls = list(reversed(cls))
4844
Joanna Wang6215dd02023-02-07 15:58:03 +00004845 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004846 # We can only support external changes when we're only uploading one
4847 # branch.
4848 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
4849 if parent is None:
4850 origin = '.'
4851 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004852
Joanna Wang7603f042023-03-01 22:17:36 +00004853 while origin == '.':
4854 # Search for cl's closest ancestor with a gerrit hash.
4855 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4856 if origin == '.':
4857 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4858
4859 # Support the `git merge` and `git pull` workflow.
4860 if upstream_branch in ['master', 'main']:
4861 parent = cl.GetCommonAncestorWithUpstream()
4862 else:
4863 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4864 upstream_branch,
4865 GERRIT_SQUASH_HASH_CONFIG_KEY)
4866 if parent:
4867 break
4868 branch = upstream_branch
4869 else:
4870 # Either the root of the tree is the cl's direct parent and the while
4871 # loop above only found empty branches between cl and the root of the
4872 # tree.
4873 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004874
Joanna Wangc710e2d2023-01-25 14:53:22 +00004875 for i, cl in enumerate(ordered_cls):
4876 # If we're in the middle of the stack, set end_commit to downstream's
4877 # direct ancestor.
4878 if i + 1 < len(ordered_cls):
4879 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4880 else:
4881 child_base_commit = None
4882 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004883 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004884 end_commit=child_base_commit)
4885 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004886 parent = new_upload.commit_to_push
4887
4888 # Create refspec options
4889 cl, new_upload = uploads_by_cl[-1]
4890 refspec_opts = cl._GetRefSpecOptions(
4891 options,
4892 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004893 multi_change_upload=len(uploads_by_cl) > 1,
4894 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004895 refspec_suffix = ''
4896 if refspec_opts:
4897 refspec_suffix = '%' + ','.join(refspec_opts)
4898 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4899 refspec_suffix)
4900
4901 remote, remote_branch = cl.GetRemoteBranch()
4902 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4903 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4904 refspec_suffix)
4905
4906 # Git push
4907 git_push_metadata = {
4908 'gerrit_host':
4909 cl.GetGerritHost(),
4910 'title':
4911 options.title or '<untitled>',
4912 'change_id':
4913 git_footers.get_footer_change_id(new_upload.change_desc.description),
4914 'description':
4915 new_upload.change_desc.description,
4916 }
4917 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4918 git_push_metadata)
4919
4920 # Post push updates
4921 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4922 change_numbers = [
4923 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4924 ]
4925
4926 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4927 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4928
4929 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004930
4931
4932def _UploadAllPrecheck(options, orig_args):
4933 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4934 """Checks the state of the tree and gives the user uploading options
4935
4936 Returns: A tuple of the ordered list of changes that have new commits
4937 since their last upload and a boolean of whether the user wants to
4938 cherry-pick and upload the current branch instead of uploading all cls.
4939 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004940 cl = Changelist()
4941 if cl.GetBranch() is None:
4942 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4943
Joanna Wang18de1f62023-01-21 01:24:24 +00004944 branch_ref = None
4945 cls = []
4946 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004947 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004948
4949 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4950
4951 while True:
4952 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4953 DieWithError(
4954 'More than %s branches in the stack have not been uploaded.\n'
4955 'Are your branches in a misconfigured state?\n'
4956 'If not, please upload some upstream changes first.' %
4957 (_MAX_STACKED_BRANCHES_UPLOAD))
4958
4959 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004960
Joanna Wang6215dd02023-02-07 15:58:03 +00004961 # Only add CL if it has anything to commit.
4962 base_commit = cl.GetCommonAncestorWithUpstream()
4963 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4964
4965 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4966 if diff:
4967 cls.append(cl)
4968 if (not first_pass and
4969 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4970 # We are mid-stack and the user must upload their upstream branches.
4971 must_upload_upstream = True
4972 elif first_pass: # The current branch has nothing to commit. Exit.
4973 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4974 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4975 first_pass = False
4976
4977 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004978 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004979 branch_ref = upstream_branch_ref # set branch for next run.
4980
Joanna Wang6215dd02023-02-07 15:58:03 +00004981 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4982 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4983 upstream_branch,
4984 LAST_UPLOAD_HASH_CONFIG_KEY)
4985
Joanna Wang18de1f62023-01-21 01:24:24 +00004986 # Case 1: We've reached the beginning of the tree.
4987 if origin != '.':
4988 break
4989
Joanna Wang18de1f62023-01-21 01:24:24 +00004990 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00004991 # the user MUST upload them unless they are empty. Continue to
4992 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00004993 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00004994 continue
4995
Joanna Wang18de1f62023-01-21 01:24:24 +00004996 # Case 3: If upstream's last_upload == cl.base_commit we do
4997 # not need to upload any more upstreams from this point on.
4998 # (Even if there may be diverged branches higher up the tree)
4999 if base_commit == upstream_last_upload:
5000 break
5001
5002 # Case 4: If upstream's last_upload < cl.base_commit we are
5003 # uploading cl and upstream_cl.
5004 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005005 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005006 continue
5007
5008 # Case 5: If cl.base_commit < upstream's last_upload the user
5009 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005010 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005011 DieWithError(
5012 'At least one branch in the stack has diverged from its upstream '
5013 'branch and does not contain its upstream\'s last upload.\n'
5014 'Please rebase the stack with `git rebase-update` before uploading.')
5015
5016 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5017 # any relation to commits in the tree. Continue up the tree until we hit
5018 # the root.
5019
5020 # We assume all cls in the stack have the same auth requirements and only
5021 # check this once.
5022 cls[0].EnsureAuthenticated(force=options.force)
5023
5024 cherry_pick = False
5025 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005026 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005027 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005028 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005029 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005031 msg = ('At least one parent branch in `%s` has never been uploaded '
5032 'and must be uploaded before/with `%s`.\n' %
5033 (branches, cls[1].branch))
5034 if options.cherry_pick_stacked:
5035 DieWithError(msg)
5036 if not options.force:
5037 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005039 if options.cherry_pick_stacked:
5040 print('cherry-picking `%s` on %s\'s last upload' %
5041 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005043 elif not options.force:
5044 answer = gclient_utils.AskForData(
5045 '\n' + opt_message +
5046 'Press enter to update branches %s.\nOr type `n` to upload only '
5047 '`%s` cherry-picked on %s\'s last upload:' %
5048 (branches, cls[0].branch, cls[1].branch))
5049 if answer.lower() == 'n':
5050 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005051 return cls, cherry_pick
5052
5053
Francois Dorayd42c6812017-05-30 15:10:20 -04005054@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005055@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005056def CMDsplit(parser, args):
5057 """Splits a branch into smaller branches and uploads CLs.
5058
5059 Creates a branch and uploads a CL for each group of files modified in the
5060 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005061 comment, the string '$directory', is replaced with the directory containing
5062 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005063 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005064 parser.add_option('-d', '--description', dest='description_file',
5065 help='A text file containing a CL description in which '
5066 '$directory will be replaced by each CL\'s directory.')
5067 parser.add_option('-c', '--comment', dest='comment_file',
5068 help='A text file containing a CL comment.')
5069 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005070 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005071 help='List the files and reviewers for each CL that would '
5072 'be created, but don\'t create branches or CLs.')
5073 parser.add_option('--cq-dry-run', action='store_true',
5074 help='If set, will do a cq dry run for each uploaded CL. '
5075 'Please be careful when doing this; more than ~10 CLs '
5076 'has the potential to overload our build '
5077 'infrastructure. Try to upload these not during high '
5078 'load times (usually 11-3 Mountain View time). Email '
5079 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005080 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5081 default=True,
5082 help='Sends your change to the CQ after an approval. Only '
5083 'works on repos that have the Auto-Submit label '
5084 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005085 parser.add_option('--max-depth',
5086 type='int',
5087 default=0,
5088 help='The max depth to look for OWNERS files. Useful for '
5089 'controlling the granularity of the split CLs, e.g. '
5090 '--max-depth=1 will only split by top-level '
5091 'directory. Specifying a value less than 1 means no '
5092 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005093 options, _ = parser.parse_args(args)
5094
5095 if not options.description_file:
5096 parser.error('No --description flag specified.')
5097
5098 def WrappedCMDupload(args):
5099 return CMDupload(OptionParser(), args)
5100
Daniel Cheng403c44e2022-10-05 22:24:58 +00005101 return split_cl.SplitCl(options.description_file, options.comment_file,
5102 Changelist, WrappedCMDupload, options.dry_run,
5103 options.cq_dry_run, options.enable_auto_submit,
5104 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005105
5106
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005107@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005108@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005109def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005110 """DEPRECATED: Used to commit the current changelist via git-svn."""
5111 message = ('git-cl no longer supports committing to SVN repositories via '
5112 'git-svn. You probably want to use `git cl land` instead.')
5113 print(message)
5114 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005115
5116
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005117@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005118@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005119def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005120 """Commits the current changelist via git.
5121
5122 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5123 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005124 """
5125 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5126 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005127 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005128 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005129 parser.add_option('--parallel', action='store_true',
5130 help='Run all tests specified by input_api.RunTests in all '
5131 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005132 parser.add_option('--resultdb', action='store_true',
5133 help='Run presubmit checks in the ResultSink environment '
5134 'and send results to the ResultDB database.')
5135 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005136 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005137
Edward Lemur934836a2019-09-09 20:16:54 +00005138 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005139
Robert Iannucci2e73d432018-03-14 01:10:47 -07005140 if not cl.GetIssue():
5141 DieWithError('You must upload the change first to Gerrit.\n'
5142 ' If you would rather have `git cl land` upload '
5143 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005144 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5145 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005146
5147
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005148@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005149@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005150def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005151 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005152 parser.add_option('-b', dest='newbranch',
5153 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005154 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005155 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005156 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005157 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005158
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005159 group = optparse.OptionGroup(
5160 parser,
5161 'Options for continuing work on the current issue uploaded from a '
5162 'different clone (e.g. different machine). Must be used independently '
5163 'from the other options. No issue number should be specified, and the '
5164 'branch must have an issue number associated with it')
5165 group.add_option('--reapply', action='store_true', dest='reapply',
5166 help='Reset the branch and reapply the issue.\n'
5167 'CAUTION: This will undo any local changes in this '
5168 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005169
5170 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005171 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005172 parser.add_option_group(group)
5173
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005174 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005175
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005176 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005177 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005178 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005179 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005180 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005181
Edward Lemur934836a2019-09-09 20:16:54 +00005182 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005183 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005184 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005185
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005186 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005187 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005188 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005189
5190 RunGit(['reset', '--hard', upstream])
5191 if options.pull:
5192 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005193
Edward Lemur678a6842019-10-03 22:25:05 +00005194 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005195 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5196 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005197
5198 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005199 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005200
Edward Lemurf38bc172019-09-03 21:02:13 +00005201 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005202 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005203 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005204
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005205 # We don't want uncommitted changes mixed up with the patch.
5206 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005207 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005209 if options.newbranch:
5210 if options.force:
5211 RunGit(['branch', '-D', options.newbranch],
5212 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005213 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005214
Edward Lemur678a6842019-10-03 22:25:05 +00005215 cl = Changelist(
5216 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005217
Edward Lemur678a6842019-10-03 22:25:05 +00005218 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005219 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005220
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005221 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5222 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223
5224
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005225def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226 """Fetches the tree status and returns either 'open', 'closed',
5227 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005228 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005229 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005230 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005231 if status.find('closed') != -1 or status == '0':
5232 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005233
5234 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005235 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005236
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005237 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005238 return 'unset'
5239
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005240
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241def GetTreeStatusReason():
5242 """Fetches the tree status from a json url and returns the message
5243 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005244 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005245 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005246 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005247 status = json.loads(connection.read())
5248 connection.close()
5249 return status['message']
5250
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005251
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005252@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005253def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005254 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005255 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256 status = GetTreeStatus()
5257 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005258 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005259 return 2
5260
vapiera7fbd5a2016-06-16 09:17:49 -07005261 print('The tree is %s' % status)
5262 print()
5263 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005264 if status != 'open':
5265 return 1
5266 return 0
5267
5268
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005269@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005270def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005271 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5272 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005273 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005274 '-b', '--bot', action='append',
5275 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5276 'times to specify multiple builders. ex: '
5277 '"-b win_rel -b win_layout". See '
5278 'the try server waterfall for the builders name and the tests '
5279 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005280 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005281 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005282 help=('Buildbucket bucket to send the try requests. Format: '
5283 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005284 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005285 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005286 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005287 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005288 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005289 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005290 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005291 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005292 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005293 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005294 '-q',
5295 '--quick-run',
5296 action='store_true',
5297 default=False,
5298 help='trigger in quick run mode '
5299 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5300 'uick_run.md) (chromium only).')
5301 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005302 '--category', default='git_cl_try', help='Specify custom build category.')
5303 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005304 '--project',
5305 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005306 'in recipe to determine to which repository or directory to '
5307 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005308 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005309 '-p', '--property', dest='properties', action='append', default=[],
5310 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005311 'key2=value2 etc. The value will be treated as '
5312 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005313 'NOTE: using this may make your tryjob not usable for CQ, '
5314 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005315 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005316 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5317 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005318 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005319 parser.add_option(
5320 '-R', '--retry-failed', action='store_true', default=False,
5321 help='Retry failed jobs from the latest set of tryjobs. '
5322 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005323 parser.add_option(
5324 '-i', '--issue', type=int,
5325 help='Operate on this issue instead of the current branch\'s implicit '
5326 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005327 options, args = parser.parse_args(args)
5328
machenbach@chromium.org45453142015-09-15 08:45:22 +00005329 # Make sure that all properties are prop=value pairs.
5330 bad_params = [x for x in options.properties if '=' not in x]
5331 if bad_params:
5332 parser.error('Got properties with missing "=": %s' % bad_params)
5333
maruel@chromium.org15192402012-09-06 12:38:29 +00005334 if args:
5335 parser.error('Unknown arguments: %s' % args)
5336
Edward Lemur934836a2019-09-09 20:16:54 +00005337 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005338 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005339 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005340
Edward Lemurf38bc172019-09-03 21:02:13 +00005341 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005342 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005343
tandriie113dfd2016-10-11 10:20:12 -07005344 error_message = cl.CannotTriggerTryJobReason()
5345 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005346 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005347
Edward Lemur45768512020-03-02 19:03:14 +00005348 if options.bot:
5349 if options.retry_failed:
5350 parser.error('--bot is not compatible with --retry-failed.')
5351 if not options.bucket:
5352 parser.error('A bucket (e.g. "chromium/try") is required.')
5353
5354 triggered = [b for b in options.bot if 'triggered' in b]
5355 if triggered:
5356 parser.error(
5357 'Cannot schedule builds on triggered bots: %s.\n'
5358 'This type of bot requires an initial job from a parent (usually a '
5359 'builder). Schedule a job on the parent instead.\n' % triggered)
5360
5361 if options.bucket.startswith('.master'):
5362 parser.error('Buildbot masters are not supported.')
5363
5364 project, bucket = _parse_bucket(options.bucket)
5365 if project is None or bucket is None:
5366 parser.error('Invalid bucket: %s.' % options.bucket)
5367 jobs = sorted((project, bucket, bot) for bot in options.bot)
5368 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005369 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005370 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005371 if options.verbose:
5372 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005373 jobs = _filter_failed_for_retry(builds)
5374 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005375 print('There are no failed jobs in the latest set of jobs '
5376 '(patchset #%d), doing nothing.' % patchset)
5377 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005378 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005379 if num_builders > 10:
5380 confirm_or_exit('There are %d builders with failed builds.'
5381 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005382 elif options.quick_run:
5383 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5384 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005385 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005386 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005387 print('git cl try with no bots now defaults to CQ dry run.')
5388 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5389 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005390
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005391 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005392 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005393 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005394 except BuildbucketResponseException as ex:
5395 print('ERROR: %s' % ex)
5396 return 1
5397 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005398
5399
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005400@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005401def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005402 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005403 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005404 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005405 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005406 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005407 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005408 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005409 '--color', action='store_true', default=setup_color.IS_TTY,
5410 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005411 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005412 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5413 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005414 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005415 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005416 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005417 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005418 parser.add_option(
5419 '-i', '--issue', type=int,
5420 help='Operate on this issue instead of the current branch\'s implicit '
5421 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005422 options, args = parser.parse_args(args)
5423 if args:
5424 parser.error('Unrecognized args: %s' % ' '.join(args))
5425
Edward Lemur934836a2019-09-09 20:16:54 +00005426 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005427 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005428 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005429
tandrii221ab252016-10-06 08:12:04 -07005430 patchset = options.patchset
5431 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005432 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005433 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005434 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005435 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005436 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005437 cl.GetIssue())
5438
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005439 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005440 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005441 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005442 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005443 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005444 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005445 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005446 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005447 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005448 return 0
5449
5450
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005451@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005452@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005453def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005454 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005455 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005456 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005457 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005458
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005459 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005460 if args:
5461 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005462 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005463 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005464 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005465 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005466
5467 # Clear configured merge-base, if there is one.
5468 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005469 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005470 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005471 return 0
5472
5473
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005474@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005475def CMDweb(parser, args):
5476 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005477 parser.add_option('-p',
5478 '--print-only',
5479 action='store_true',
5480 dest='print_only',
5481 help='Only print the Gerrit URL, don\'t open it in the '
5482 'browser.')
5483 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005484 if args:
5485 parser.error('Unrecognized args: %s' % ' '.join(args))
5486
5487 issue_url = Changelist().GetIssueURL()
5488 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005489 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005490 return 1
5491
Orr Bernstein0b960582022-12-22 20:16:18 +00005492 if options.print_only:
5493 print(issue_url)
5494 return 0
5495
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005496 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005497 # allows us to hide the "Created new window in existing browser session."
5498 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005499 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005500 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005501 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005502 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005503 os.open(os.devnull, os.O_RDWR)
5504 try:
5505 webbrowser.open(issue_url)
5506 finally:
5507 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005508 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005509 return 0
5510
5511
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005512@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005513def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005514 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005515 parser.add_option('-d', '--dry-run', action='store_true',
5516 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005517 parser.add_option(
5518 '-q',
5519 '--quick-run',
5520 action='store_true',
5521 help='trigger in quick run mode '
5522 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5523 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005524 parser.add_option('-c', '--clear', action='store_true',
5525 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005526 parser.add_option(
5527 '-i', '--issue', type=int,
5528 help='Operate on this issue instead of the current branch\'s implicit '
5529 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005530 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005531 if args:
5532 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005533 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5534 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005535
Edward Lemur934836a2019-09-09 20:16:54 +00005536 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005537 if not cl.GetIssue():
5538 parser.error('Must upload the issue first.')
5539
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005540 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005541 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005542 elif options.quick_run:
5543 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005544 elif options.dry_run:
5545 state = _CQState.DRY_RUN
5546 else:
5547 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005548 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005549 return 0
5550
5551
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005552@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005553def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005554 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005555 parser.add_option(
5556 '-i', '--issue', type=int,
5557 help='Operate on this issue instead of the current branch\'s implicit '
5558 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005559 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005560 if args:
5561 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005562 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005563 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005564 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005565 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005566 cl.CloseIssue()
5567 return 0
5568
5569
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005570@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005571def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005572 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005573 parser.add_option(
5574 '--stat',
5575 action='store_true',
5576 dest='stat',
5577 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005578 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005579 if args:
5580 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005581
Edward Lemur934836a2019-09-09 20:16:54 +00005582 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005583 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005584 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005585 if not issue:
5586 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005587
Gavin Makbe2e9262022-11-08 23:41:55 +00005588 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005589 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005590 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005591 if not base:
5592 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5593 revision_info = detail['revisions'][detail['current_revision']]
5594 fetch_info = revision_info['fetch']['http']
5595 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5596 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005597
Aaron Gablea718c3e2017-08-28 17:47:28 -07005598 cmd = ['git', 'diff']
5599 if options.stat:
5600 cmd.append('--stat')
5601 cmd.append(base)
5602 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005603
5604 return 0
5605
5606
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005607@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005608def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005609 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005610 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005611 '--ignore-current',
5612 action='store_true',
5613 help='Ignore the CL\'s current reviewers and start from scratch.')
5614 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005615 '--ignore-self',
5616 action='store_true',
5617 help='Do not consider CL\'s author as an owners.')
5618 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005619 '--no-color',
5620 action='store_true',
5621 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005622 parser.add_option(
5623 '--batch',
5624 action='store_true',
5625 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005626 # TODO: Consider moving this to another command, since other
5627 # git-cl owners commands deal with owners for a given CL.
5628 parser.add_option(
5629 '--show-all',
5630 action='store_true',
5631 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005632 options, args = parser.parse_args(args)
5633
Edward Lemur934836a2019-09-09 20:16:54 +00005634 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005635 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005636
Yang Guo6e269a02019-06-26 11:17:02 +00005637 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005638 if len(args) == 0:
5639 print('No files specified for --show-all. Nothing to do.')
5640 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005641 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005642 for path in args:
5643 print('Owners for %s:' % path)
5644 print('\n'.join(
5645 ' - %s' % owner
5646 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005647 return 0
5648
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005649 if args:
5650 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005651 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005652 base_branch = args[0]
5653 else:
5654 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005655 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005656
Edward Lemur2c62b332020-03-12 22:12:33 +00005657 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005658
5659 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005660 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5661 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005662 return 0
5663
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005664 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005665 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005666 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005667 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005668 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005669 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005670 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005671
5672
Aiden Bennerc08566e2018-10-03 17:52:42 +00005673def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005674 """Generates a diff command."""
5675 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005676 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5677
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005678 if allow_prefix:
5679 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5680 # case that diff.noprefix is set in the user's git config.
5681 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5682 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005683 diff_cmd += ['--no-prefix']
5684
5685 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005686
5687 if args:
5688 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005689 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005690 diff_cmd.append(arg)
5691 else:
5692 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005693
5694 return diff_cmd
5695
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005696
Jamie Madill5e96ad12020-01-13 16:08:35 +00005697def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5698 """Runs clang-format-diff and sets a return value if necessary."""
5699
5700 if not clang_diff_files:
5701 return 0
5702
5703 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5704 # formatted. This is used to block during the presubmit.
5705 return_value = 0
5706
5707 # Locate the clang-format binary in the checkout
5708 try:
5709 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5710 except clang_format.NotFoundError as e:
5711 DieWithError(e)
5712
5713 if opts.full or settings.GetFormatFullByDefault():
5714 cmd = [clang_format_tool]
5715 if not opts.dry_run and not opts.diff:
5716 cmd.append('-i')
5717 if opts.dry_run:
5718 for diff_file in clang_diff_files:
5719 with open(diff_file, 'r') as myfile:
5720 code = myfile.read().replace('\r\n', '\n')
5721 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5722 stdout = stdout.replace('\r\n', '\n')
5723 if opts.diff:
5724 sys.stdout.write(stdout)
5725 if code != stdout:
5726 return_value = 2
5727 else:
5728 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5729 if opts.diff:
5730 sys.stdout.write(stdout)
5731 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005732 try:
5733 script = clang_format.FindClangFormatScriptInChromiumTree(
5734 'clang-format-diff.py')
5735 except clang_format.NotFoundError as e:
5736 DieWithError(e)
5737
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005738 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005739 if not opts.dry_run and not opts.diff:
5740 cmd.append('-i')
5741
5742 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005743 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005744
Edward Lesmes89624cd2020-04-06 17:51:56 +00005745 env = os.environ.copy()
5746 env['PATH'] = (
5747 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5748 stdout = RunCommand(
5749 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005750 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005751 if opts.diff:
5752 sys.stdout.write(stdout)
5753 if opts.dry_run and len(stdout) > 0:
5754 return_value = 2
5755
5756 return return_value
5757
5758
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005759def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5760 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5761 presubmit checks have failed (and returns 0 otherwise)."""
5762
5763 if not rust_diff_files:
5764 return 0
5765
5766 # Locate the rustfmt binary.
5767 try:
5768 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5769 except rustfmt.NotFoundError as e:
5770 DieWithError(e)
5771
5772 # TODO(crbug.com/1231317): Support formatting only the changed lines
5773 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5774 # https://github.com/emilio/rustfmt-format-diff
5775 cmd = [rustfmt_tool]
5776 if opts.dry_run:
5777 cmd.append('--check')
5778 cmd += rust_diff_files
5779 rustfmt_exitcode = subprocess2.call(cmd)
5780
5781 if opts.presubmit and rustfmt_exitcode != 0:
5782 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005783
5784 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005785
5786
Olivier Robin0a6b5442022-04-07 07:25:04 +00005787def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5788 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5789 that presubmit checks have failed (and returns 0 otherwise)."""
5790
5791 if not swift_diff_files:
5792 return 0
5793
5794 # Locate the swift-format binary.
5795 try:
5796 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5797 except swift_format.NotFoundError as e:
5798 DieWithError(e)
5799
5800 cmd = [swift_format_tool]
5801 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005802 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005803 else:
5804 cmd += ['format', '-i']
5805 cmd += swift_diff_files
5806 swift_format_exitcode = subprocess2.call(cmd)
5807
5808 if opts.presubmit and swift_format_exitcode != 0:
5809 return 2
5810
5811 return 0
5812
5813
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005814def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005815 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005816 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005817
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005818
enne@chromium.org555cfe42014-01-29 18:21:39 +00005819@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005820@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005821def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005822 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005823 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005824 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005825 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005826 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005827 parser.add_option('--full', action='store_true',
5828 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005829 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005830 parser.add_option('--dry-run', action='store_true',
5831 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005832 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005833 '--no-clang-format',
5834 dest='clang_format',
5835 action='store_false',
5836 default=True,
5837 help='Disables formatting of various file types using clang-format.')
5838 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005839 '--python',
5840 action='store_true',
5841 default=None,
5842 help='Enables python formatting on all python files.')
5843 parser.add_option(
5844 '--no-python',
5845 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005846 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005847 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005848 'If neither --python or --no-python are set, python files that have a '
5849 '.style.yapf file in an ancestor directory will be formatted. '
5850 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005851 parser.add_option(
5852 '--js',
5853 action='store_true',
5854 help='Format javascript code with clang-format. '
5855 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005856 parser.add_option('--diff', action='store_true',
5857 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005858 parser.add_option('--presubmit', action='store_true',
5859 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005860
5861 parser.add_option('--rust-fmt',
5862 dest='use_rust_fmt',
5863 action='store_true',
5864 default=rustfmt.IsRustfmtSupported(),
5865 help='Enables formatting of Rust file types using rustfmt.')
5866 parser.add_option(
5867 '--no-rust-fmt',
5868 dest='use_rust_fmt',
5869 action='store_false',
5870 help='Disables formatting of Rust file types using rustfmt.')
5871
Olivier Robin0a6b5442022-04-07 07:25:04 +00005872 parser.add_option(
5873 '--swift-format',
5874 dest='use_swift_format',
5875 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005876 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005877 help='Enables formatting of Swift file types using swift-format '
5878 '(macOS host only).')
5879 parser.add_option(
5880 '--no-swift-format',
5881 dest='use_swift_format',
5882 action='store_false',
5883 help='Disables formatting of Swift file types using swift-format.')
5884
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005885 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005886
Garrett Beaty91a6f332020-01-06 16:57:24 +00005887 if opts.python is not None and opts.no_python:
5888 raise parser.error('Cannot set both --python and --no-python')
5889 if opts.no_python:
5890 opts.python = False
5891
Daniel Chengc55eecf2016-12-30 03:11:02 -08005892 # Normalize any remaining args against the current path, so paths relative to
5893 # the current directory are still resolved as expected.
5894 args = [os.path.join(os.getcwd(), arg) for arg in args]
5895
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005896 # git diff generates paths against the root of the repository. Change
5897 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005898 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005899 if rel_base_path:
5900 os.chdir(rel_base_path)
5901
digit@chromium.org29e47272013-05-17 17:01:46 +00005902 # Grab the merge-base commit, i.e. the upstream commit of the current
5903 # branch when it was created or the last time it was rebased. This is
5904 # to cover the case where the user may have called "git fetch origin",
5905 # moving the origin branch to a newer commit, but hasn't rebased yet.
5906 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005907 upstream_branch = opts.upstream
5908 if not upstream_branch:
5909 cl = Changelist()
5910 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005911 if upstream_branch:
5912 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5913 upstream_commit = upstream_commit.strip()
5914
5915 if not upstream_commit:
5916 DieWithError('Could not find base commit for this branch. '
5917 'Are you in detached state?')
5918
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005919 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5920 diff_output = RunGit(changed_files_cmd)
5921 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005922 # Filter out files deleted by this CL
5923 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005924
Andreas Haas417d89c2020-02-06 10:24:27 +00005925 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005926 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005927
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005928 clang_diff_files = []
5929 if opts.clang_format:
5930 clang_diff_files = [
5931 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5932 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005933 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005934 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005935 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005936 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005937
Edward Lesmes50da7702020-03-30 19:23:43 +00005938 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005939
Jamie Madill5e96ad12020-01-13 16:08:35 +00005940 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5941 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005942
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005943 if opts.use_rust_fmt:
5944 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5945 upstream_commit)
5946 if rust_fmt_return_value == 2:
5947 return_value = 2
5948
Olivier Robin0a6b5442022-04-07 07:25:04 +00005949 if opts.use_swift_format:
5950 if sys.platform != 'darwin':
5951 DieWithError('swift-format is only supported on macOS.')
5952 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5953 upstream_commit)
5954 if swift_format_return_value == 2:
5955 return_value = 2
5956
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005957 # Similar code to above, but using yapf on .py files rather than clang-format
5958 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005959 py_explicitly_disabled = opts.python is not None and not opts.python
5960 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005961 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5962 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005963
Aiden Bennerc08566e2018-10-03 17:52:42 +00005964 # Used for caching.
5965 yapf_configs = {}
5966 for f in python_diff_files:
5967 # Find the yapf style config for the current file, defaults to depot
5968 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005969 _FindYapfConfigFile(f, yapf_configs, top_dir)
5970
5971 # Turn on python formatting by default if a yapf config is specified.
5972 # This breaks in the case of this repo though since the specified
5973 # style file is also the global default.
5974 if opts.python is None:
5975 filtered_py_files = []
5976 for f in python_diff_files:
5977 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5978 filtered_py_files.append(f)
5979 else:
5980 filtered_py_files = python_diff_files
5981
5982 # Note: yapf still seems to fix indentation of the entire file
5983 # even if line ranges are specified.
5984 # See https://github.com/google/yapf/issues/499
5985 if not opts.full and filtered_py_files:
5986 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5987
Brian Sheedyb4307d52019-12-02 19:18:17 +00005988 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5989 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5990 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005991
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005992 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005993 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5994 # Default to pep8 if not .style.yapf is found.
5995 if not yapf_style:
5996 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005997
Peter Wend9399922020-06-17 17:33:49 +00005998 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005999 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006000 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006001 else:
6002 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006003
6004 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006005
6006 has_formattable_lines = False
6007 if not opts.full:
6008 # Only run yapf over changed line ranges.
6009 for diff_start, diff_len in py_line_diffs[f]:
6010 diff_end = diff_start + diff_len - 1
6011 # Yapf errors out if diff_end < diff_start but this
6012 # is a valid line range diff for a removal.
6013 if diff_end >= diff_start:
6014 has_formattable_lines = True
6015 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6016 # If all line diffs were removals we have nothing to format.
6017 if not has_formattable_lines:
6018 continue
6019
6020 if opts.diff or opts.dry_run:
6021 cmd += ['--diff']
6022 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006023 stdout = RunCommand(cmd,
6024 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006025 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006026 cwd=top_dir,
6027 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006028 if opts.diff:
6029 sys.stdout.write(stdout)
6030 elif len(stdout) > 0:
6031 return_value = 2
6032 else:
6033 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006034 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006035
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006036 # Format GN build files. Always run on full build files for canonical form.
6037 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006038 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006039 if opts.dry_run or opts.diff:
6040 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006041 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006042 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006043 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006044 cwd=top_dir)
6045 if opts.dry_run and gn_ret == 2:
6046 return_value = 2 # Not formatted.
6047 elif opts.diff and gn_ret == 2:
6048 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006049 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006050 elif gn_ret != 0:
6051 # For non-dry run cases (and non-2 return values for dry-run), a
6052 # nonzero error code indicates a failure, probably because the file
6053 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006054 DieWithError('gn format failed on ' + gn_diff_file +
6055 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006056
Ilya Shermane081cbe2017-08-15 17:51:04 -07006057 # Skip the metrics formatting from the global presubmit hook. These files have
6058 # a separate presubmit hook that issues an error if the files need formatting,
6059 # whereas the top-level presubmit script merely issues a warning. Formatting
6060 # these files is somewhat slow, so it's important not to duplicate the work.
6061 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006062 for diff_xml in GetDiffXMLs(diff_files):
6063 xml_dir = GetMetricsDir(diff_xml)
6064 if not xml_dir:
6065 continue
6066
Ilya Shermane081cbe2017-08-15 17:51:04 -07006067 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006068 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006069 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006070
6071 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6072 # command as histograms/pretty_print.py now needs a relative path argument
6073 # after splitting the histograms into multiple directories.
6074 # For example, in tools/metrics/ukm, pretty-print could be run using:
6075 # $ python pretty_print.py
6076 # But in tools/metrics/histogrmas, pretty-print should be run with an
6077 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006078 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006079 # $ python pretty_print.py enums.xml
6080
Weilun Shib92c4b72020-08-27 17:45:11 +00006081 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006082 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006083 cmd.append(diff_xml)
6084
Ilya Shermane081cbe2017-08-15 17:51:04 -07006085 if opts.dry_run or opts.diff:
6086 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006087
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006088 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6089 # `shell` param and instead replace `'vpython'` with
6090 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006091 stdout = RunCommand(cmd,
6092 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006093 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006094 if opts.diff:
6095 sys.stdout.write(stdout)
6096 if opts.dry_run and stdout:
6097 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006098
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006099 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006100
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006101
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006102def GetDiffXMLs(diff_files):
6103 return [
6104 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6105 ]
6106
6107
6108def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006109 metrics_xml_dirs = [
6110 os.path.join('tools', 'metrics', 'actions'),
6111 os.path.join('tools', 'metrics', 'histograms'),
6112 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006113 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006114 os.path.join('tools', 'metrics', 'ukm'),
6115 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006116 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006117 if diff_xml.startswith(xml_dir):
6118 return xml_dir
6119 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006120
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006121
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006122@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006123@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006124def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006125 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006126 _, args = parser.parse_args(args)
6127
6128 if len(args) != 1:
6129 parser.print_help()
6130 return 1
6131
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006132 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006133 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006134 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006135
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006136 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006137
Edward Lemur52969c92020-02-06 18:15:28 +00006138 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006139 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006140 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006141
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006142 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006143 for key, issue in [x.split() for x in output.splitlines()]:
6144 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006145 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006146
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006147 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006148 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006149 return 1
6150 if len(branches) == 1:
6151 RunGit(['checkout', branches[0]])
6152 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006153 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006154 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006155 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006156 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006157 try:
6158 RunGit(['checkout', branches[int(which)]])
6159 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006160 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006161 return 1
6162
6163 return 0
6164
6165
maruel@chromium.org29404b52014-09-08 22:58:00 +00006166def CMDlol(parser, args):
6167 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006168 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006169 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6170 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6171 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006172 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006173 return 0
6174
6175
Josip Sokcevic0399e172022-03-21 23:11:51 +00006176def CMDversion(parser, args):
Josip Sokcevic0399e172022-03-21 23:11:51 +00006177 print(utils.depot_tools_version())
6178
6179
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006180class OptionParser(optparse.OptionParser):
6181 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006182
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006183 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006184 optparse.OptionParser.__init__(
6185 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006186 self.add_option(
6187 '-v', '--verbose', action='count', default=0,
6188 help='Use 2 times for more debugging info')
6189
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006190 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006191 try:
6192 return self._parse_args(args)
6193 finally:
6194 # Regardless of success or failure of args parsing, we want to report
6195 # metrics, but only after logging has been initialized (if parsing
6196 # succeeded).
6197 global settings
6198 settings = Settings()
6199
Edward Lesmes9c349062021-05-06 20:02:39 +00006200 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006201 # GetViewVCUrl ultimately calls logging method.
6202 project_url = settings.GetViewVCUrl().strip('/+')
6203 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6204 metrics.collector.add('project_urls', [project_url])
6205
6206 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006207 # Create an optparse.Values object that will store only the actual passed
6208 # options, without the defaults.
6209 actual_options = optparse.Values()
6210 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6211 # Create an optparse.Values object with the default options.
6212 options = optparse.Values(self.get_default_values().__dict__)
6213 # Update it with the options passed by the user.
6214 options._update_careful(actual_options.__dict__)
6215 # Store the options passed by the user in an _actual_options attribute.
6216 # We store only the keys, and not the values, since the values can contain
6217 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006218 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006219
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006220 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006221 logging.basicConfig(
6222 level=levels[min(options.verbose, len(levels) - 1)],
6223 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6224 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006225
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006226 return options, args
6227
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006228
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006229def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006230 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006231 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006232 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006233 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006234
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006235 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006236 dispatcher = subcommand.CommandDispatcher(__name__)
6237 try:
6238 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006239 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006240 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006241 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006242 if e.code != 500:
6243 raise
6244 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006245 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006246 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006247 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006248
6249
6250if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006251 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6252 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006253 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006254 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006255 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006256 sys.exit(main(sys.argv[1:]))