blob: 0b879d4146a53c1b5d372118edb3bfd458bfdf9f [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
thakis@chromium.org3421c992014-11-02 02:20:32 +000010import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000011import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010012import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000013import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000014import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010015import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000016import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000017import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000018import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import optparse
20import os
21import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010022import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000023import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070025import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000027import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000028import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000029import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000030import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000032from third_party import colorama
Daniel Cheng66d0f152023-08-29 23:21:58 +000033from typing import Optional
34from typing import Sequence
35from typing import Tuple
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000036import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000037import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000038import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000039import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000040import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000041import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000042import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000043import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000044import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000045import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000046import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000048import presubmit_canned_checks
Josip Sokcevic7958e302023-03-01 23:02:21 +000049import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000050import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +000051import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000052import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040053import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000054import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000055import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000056import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000057import watchlists
58
Edward Lemur79d4f992019-11-11 23:49:02 +000059from six.moves import urllib
60
61
tandrii7400cf02016-06-21 08:48:07 -070062__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063
Edward Lemur0f58ae42019-04-30 17:24:12 +000064# Traces for git push will be stored in a traces directory inside the
65# depot_tools checkout.
66DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
67TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000068PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000069
70# When collecting traces, Git hashes will be reduced to 6 characters to reduce
71# the size after compression.
72GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
73# Used to redact the cookies from the gitcookies file.
74GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
75
Edward Lemurd4d1ba42019-09-20 21:46:37 +000076MAX_ATTEMPTS = 3
77
Edward Lemur1b52d872019-05-09 21:12:12 +000078# The maximum number of traces we will keep. Multiplied by 3 since we store
79# 3 files per trace.
80MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000081# Message to be displayed to the user to inform where to find the traces for a
82# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000083TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000084'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000085'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000086' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'Copies of your gitcookies file and git config have been recorded at:\n'
88' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000089# Format of the message to be stored as part of the traces to give developers a
90# better context when they go through traces.
91TRACES_README_FORMAT = (
92'Date: %(now)s\n'
93'\n'
94'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
95'Title: %(title)s\n'
96'\n'
97'%(description)s\n'
98'\n'
99'Execution time: %(execution_time)s\n'
100'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000101
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800102POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000103DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000104REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000105 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
106 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000108
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000109DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
110DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
111
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000112DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
Edward Lesmes50da7702020-03-30 19:23:43 +0000121# The issue, patchset and codereview server are stored on git config for each
122# branch under branch.<branch-name>.<config-key>.
123ISSUE_CONFIG_KEY = 'gerritissue'
124PATCHSET_CONFIG_KEY = 'gerritpatchset'
125CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000126# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
127# you make to Gerrit. Instead, it creates a new commit object that contains all
128# changes you've made, diffed against a parent/merge base.
129# This is the hash of the new squashed commit and you can find this on Gerrit.
130GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
131# This is the latest uploaded local commit hash.
132LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000133
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000134# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000135Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000136
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000137# Initialized in main()
138settings = None
139
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100140# Used by tests/git_cl_test.py to add extra logging.
141# Inside the weirdly failing test, add this:
142# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700143# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144_IS_BEING_TESTED = False
145
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000146_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000147
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000148_KNOWN_GERRIT_TO_SHORT_URLS = {
149 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
150 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
151}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000152assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
153 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000154
155
Joanna Wang18de1f62023-01-21 01:24:24 +0000156# Maximum number of branches in a stack that can be traversed and uploaded
157# at once. Picked arbitrarily.
158_MAX_STACKED_BRANCHES_UPLOAD = 20
159
160
Joanna Wang892f2ce2023-03-14 21:39:47 +0000161# Environment variable to indicate if user is participating in the stcked
162# changes dogfood.
163DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
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
Daniel Cheng66d0f152023-08-29 23:21:58 +0000738def _GetCommitCountSummary(begin_commit: str,
739 end_commit: str = "HEAD") -> Optional[str]:
740 """Generate a summary of the number of commits in (begin_commit, end_commit).
741
742 Returns a string containing the summary, or None if the range is empty.
743 """
744 count = int(
745 RunGitSilent(['rev-list', '--count', f'{begin_commit}..{end_commit}']))
746
747 if not count:
748 return None
749
750 return f'{count} commit{"s"[:count!=1]}'
751
752
Aaron Gable13101a62018-02-09 13:20:41 -0800753def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 """Prints statistics about the change to the user."""
755 # --no-ext-diff is broken in some versions of Git, so try to work around
756 # this by overriding the environment (but there is still a problem if the
757 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000758 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759 if 'GIT_EXTERNAL_DIFF' in env:
760 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000761
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800763 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000764 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000765
766
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000767class BuildbucketResponseException(Exception):
768 pass
769
770
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771class Settings(object):
772 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000774 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 self.tree_status_url = None
776 self.viewvc_url = None
777 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000778 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000780 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000781 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000782 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000783 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000784
Edward Lemur26964072020-02-19 19:18:51 +0000785 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000787 if self.updated:
788 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000789
Edward Lemur26964072020-02-19 19:18:51 +0000790 # The only value that actually changes the behavior is
791 # autoupdate = "false". Everything else means "true".
792 autoupdate = (
793 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
794
795 cr_settings_file = FindCodereviewSettingsFile()
796 if autoupdate != 'false' and cr_settings_file:
797 LoadCodereviewSettingsFromFile(cr_settings_file)
798 cr_settings_file.close()
799
800 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000801
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000802 @staticmethod
803 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000804 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000805
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000807 if self.root is None:
808 self.root = os.path.abspath(self.GetRelativeRoot())
809 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 def GetTreeStatusUrl(self, error_ok=False):
812 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000813 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
814 if self.tree_status_url is None and not error_ok:
815 DieWithError(
816 'You must configure your tree status URL by running '
817 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000818 return self.tree_status_url
819
820 def GetViewVCUrl(self):
821 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000822 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000823 return self.viewvc_url
824
rmistry@google.com90752582014-01-14 21:04:50 +0000825 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000826 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000827
rmistry@google.com5626a922015-02-26 14:03:30 +0000828 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000829 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000830 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000831 return run_post_upload_hook == "True"
832
Joanna Wangc8f23e22023-01-19 21:18:10 +0000833 def GetDefaultCCList(self):
834 return self._GetConfig('rietveld.cc')
835
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000837 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000839 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
840 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000841 # Default is squash now (http://crbug.com/611892#c23).
842 self.squash_gerrit_uploads = self._GetConfig(
843 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000844 return self.squash_gerrit_uploads
845
Edward Lesmes4de54132020-05-05 19:41:33 +0000846 def GetSquashGerritUploadsOverride(self):
847 """Return True or False if codereview.settings should be overridden.
848
849 Returns None if no override has been defined.
850 """
851 # See also http://crbug.com/611892#c23
852 result = self._GetConfig('gerrit.override-squash-uploads').lower()
853 if result == 'true':
854 return True
855 if result == 'false':
856 return False
857 return None
858
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000859 def GetIsGerrit(self):
860 """Return True if gerrit.host is set."""
861 if self.is_gerrit is None:
862 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
863 return self.is_gerrit
864
tandrii@chromium.org28253532016-04-14 13:46:56 +0000865 def GetGerritSkipEnsureAuthenticated(self):
866 """Return True if EnsureAuthenticated should not be done for Gerrit
867 uploads."""
868 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000869 self.gerrit_skip_ensure_authenticated = self._GetConfig(
870 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000871 return self.gerrit_skip_ensure_authenticated
872
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000874 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000876 # Git requires single quotes for paths with spaces. We need to replace
877 # them with double quotes for Windows to treat such paths as a single
878 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000879 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000880 return self.git_editor or None
881
thestig@chromium.org44202a22014-03-11 19:22:18 +0000882 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000883 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000884
885 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000886 return self._GetConfig(
887 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000888
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000889 def GetFormatFullByDefault(self):
890 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000891 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000892 result = (
893 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
894 error_ok=True).strip())
895 self.format_full_by_default = (result == 'true')
896 return self.format_full_by_default
897
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000898 def IsStatusCommitOrderByDate(self):
899 if self.is_status_commit_order_by_date is None:
900 result = (RunGit(['config', '--bool', 'cl.date-order'],
901 error_ok=True).strip())
902 self.is_status_commit_order_by_date = (result == 'true')
903 return self.is_status_commit_order_by_date
904
Edward Lemur26964072020-02-19 19:18:51 +0000905 def _GetConfig(self, key, default=''):
906 self._LazyUpdateIfNeeded()
907 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000908
909
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000910class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000911 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000912 NONE = 'none'
913 DRY_RUN = 'dry_run'
914 COMMIT = 'commit'
915
Struan Shrimpton8b2072b2023-07-31 21:01:26 +0000916 ALL_STATES = [NONE, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000917
918
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000919class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000920 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 self.issue = issue
922 self.patchset = patchset
923 self.hostname = hostname
924
925 @property
926 def valid(self):
927 return self.issue is not None
928
929
Edward Lemurf38bc172019-09-03 21:02:13 +0000930def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
932 fail_result = _ParsedIssueNumberArgument()
933
Edward Lemur678a6842019-10-03 22:25:05 +0000934 if isinstance(arg, int):
935 return _ParsedIssueNumberArgument(issue=arg)
Gavin Makcc976552023-08-28 17:01:52 +0000936 if not isinstance(arg, str):
Edward Lemur678a6842019-10-03 22:25:05 +0000937 return fail_result
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000940 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700941
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000942 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000943 if not url.startswith('http'):
944 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000945 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
946 if url.startswith(short_url):
947 url = gerrit_url + url[len(short_url):]
948 break
949
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000951 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000952 except ValueError:
953 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200954
Alex Turner30ae6372022-01-04 02:32:52 +0000955 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
956 # URL.
957 if not arg.startswith('http') and '.' not in parsed_url.netloc:
958 return fail_result
959
Edward Lemur678a6842019-10-03 22:25:05 +0000960 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
961 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
962 # Short urls like https://domain/<issue_number> can be used, but don't allow
963 # specifying the patchset (you'd 404), but we allow that here.
964 if parsed_url.path == '/':
965 part = parsed_url.fragment
966 else:
967 part = parsed_url.path
968
969 match = re.match(
970 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
971 if not match:
972 return fail_result
973
974 issue = int(match.group('issue'))
975 patchset = match.group('patchset')
976 return _ParsedIssueNumberArgument(
977 issue=issue,
978 patchset=int(patchset) if patchset else None,
979 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000980
981
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000982def _create_description_from_log(args):
983 """Pulls out the commit log to use as a base for the CL description."""
984 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000985 if len(args) == 1 and args[0] == None:
986 # Handle the case where None is passed as the branch.
987 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000988 if len(args) == 1 and not args[0].endswith('.'):
989 log_args = [args[0] + '..']
990 elif len(args) == 1 and args[0].endswith('...'):
991 log_args = [args[0][:-1]]
992 elif len(args) == 2:
993 log_args = [args[0] + '..' + args[1]]
994 else:
995 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000996 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000997
998
Aaron Gablea45ee112016-11-22 15:14:38 -0800999class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001000 def __init__(self, issue, url):
1001 self.issue = issue
1002 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001003 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001004
1005 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001006 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001007 self.issue, self.url)
1008
1009
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001010_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001011 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001012 # TODO(tandrii): these two aren't known in Gerrit.
1013 'approval', 'disapproval'])
1014
1015
Joanna Wang6215dd02023-02-07 15:58:03 +00001016# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001017_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001018 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001019 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001020])
1021
1022
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """Changelist works with one changelist in local branch.
1025
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001026 Notes:
1027 * Not safe for concurrent multi-{thread,process} use.
1028 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001029 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """
1031
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001032 def __init__(self,
1033 branchref=None,
1034 issue=None,
1035 codereview_host=None,
1036 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001037 """Create a new ChangeList instance.
1038
Edward Lemurf38bc172019-09-03 21:02:13 +00001039 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001040 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001042 global settings
1043 if not settings:
1044 # Happens when git_cl.py is used as a utility library.
1045 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.branchref = branchref
1048 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001049 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001050 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 else:
1052 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001053 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001054 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001055 self.lookedup_issue = False
1056 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001057 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001058 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001061 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001062 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001063 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001064
Edward Lemur125d60a2019-09-13 18:25:41 +00001065 # Lazily cached values.
1066 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1067 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001068 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001069 # Map from change number (issue) to its detail cache.
1070 self._detail_cache = {}
1071
1072 if codereview_host is not None:
1073 assert not codereview_host.startswith('https://'), codereview_host
1074 self._gerrit_host = codereview_host
1075 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076
Edward Lesmese1576912021-02-16 21:53:34 +00001077 @property
1078 def owners_client(self):
1079 if self._owners_client is None:
1080 remote, remote_branch = self.GetRemoteBranch()
1081 branch = GetTargetRef(remote, remote_branch, None)
1082 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001083 host=self.GetGerritHost(),
1084 project=self.GetGerritProject(),
1085 branch=branch)
1086 return self._owners_client
1087
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001088 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001089 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001090
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001091 The return value is a string suitable for passing to git cl with the --cc
1092 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001093 """
1094 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001095 base_cc = settings.GetDefaultCCList()
1096 more_cc = ','.join(self.more_cc)
1097 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001098 return self.cc
1099
Daniel Cheng7227d212017-11-17 08:12:37 -08001100 def ExtendCC(self, more_cc):
1101 """Extends the list of users to cc on this CL based on the changed files."""
1102 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001104 def GetCommitDate(self):
1105 """Returns the commit date as provided in the constructor"""
1106 return self.commit_date
1107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001109 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001111 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001112 if not branchref:
1113 return None
1114 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001115 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 return self.branch
1117
1118 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001119 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.GetBranch() # Poke the lazy loader.
1121 return self.branchref
1122
Edward Lemur85153282020-02-14 22:06:29 +00001123 def _GitGetBranchConfigValue(self, key, default=None):
1124 return scm.GIT.GetBranchConfig(
1125 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001126
Edward Lemur85153282020-02-14 22:06:29 +00001127 def _GitSetBranchConfigValue(self, key, value):
1128 action = 'set %s to %r' % (key, value)
1129 if not value:
1130 action = 'unset %s' % key
1131 assert self.GetBranch(), 'a branch is needed to ' + action
1132 return scm.GIT.SetBranchConfig(
1133 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001134
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 @staticmethod
1136 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001137 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001138 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001140 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1141 settings.GetRoot(), branch)
1142 if not remote or not upstream_branch:
1143 DieWithError(
1144 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001145 'Verify this branch is set up to track another \n'
1146 '(via the --track argument to "git checkout -b ..."). \n'
1147 'or pass complete "git diff"-style arguments if supported, like\n'
1148 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149
1150 return remote, upstream_branch
1151
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001153 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001154 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001155 DieWithError('The upstream for the current branch (%s) does not exist '
1156 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001157 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001158 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 def GetUpstreamBranch(self):
1161 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001163 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001164 upstream_branch = upstream_branch.replace('refs/heads/',
1165 'refs/remotes/%s/' % remote)
1166 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1167 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168 self.upstream_branch = upstream_branch
1169 return self.upstream_branch
1170
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, branch = None, self.GetBranch()
1174 seen_branches = set()
1175 while branch not in seen_branches:
1176 seen_branches.add(branch)
1177 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001178 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 if remote != '.' or branch.startswith('refs/remotes'):
1180 break
1181 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 remotes = RunGit(['remote'], error_ok=True).split()
1183 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001184 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001187 logging.warning('Could not determine which remote this change is '
1188 'associated with, so defaulting to "%s".' %
1189 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001190 else:
Gavin Make6a62332020-12-04 21:57:10 +00001191 logging.warning('Could not determine which remote this change is '
1192 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 branch = 'HEAD'
1194 if branch.startswith('refs/remotes'):
1195 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001196 elif branch.startswith('refs/branch-heads/'):
1197 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 else:
1199 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001200 return self._remote
1201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202 def GetRemoteUrl(self):
1203 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1204
1205 Returns None if there is no remote.
1206 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001207 is_cached, value = self._cached_remote_url
1208 if is_cached:
1209 return value
1210
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001211 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001212 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001213
Edward Lemur298f2cf2019-02-22 21:40:39 +00001214 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001215 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 if host:
1217 self._cached_remote_url = (True, url)
1218 return url
1219
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001220 # If it cannot be parsed as an url, assume it is a local directory,
1221 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 logging.warning('"%s" doesn\'t appear to point to a git host. '
1223 'Interpreting it as a local directory.', url)
1224 if not os.path.isdir(url):
1225 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001226 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1227 'but it doesn\'t exist.',
1228 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001229 return None
1230
1231 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001232 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001233
Edward Lemur79d4f992019-11-11 23:49:02 +00001234 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001235 if not host:
1236 logging.error(
1237 'Remote "%(remote)s" for branch "%(branch)s" points to '
1238 '"%(cache_path)s", but it is misconfigured.\n'
1239 '"%(cache_path)s" must be a git repo and must have a remote named '
1240 '"%(remote)s" pointing to the git host.', {
1241 'remote': remote,
1242 'cache_path': cache_path,
1243 'branch': self.GetBranch()})
1244 return None
1245
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001246 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001247 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001249 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001250 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001251 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001252 if self.GetBranch():
1253 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001254 if self.issue is not None:
1255 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 return self.issue
1258
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001259 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001261 issue = self.GetIssue()
1262 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001263 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001264 server = self.GetCodereviewServer()
1265 if short:
1266 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1267 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268
Edward Lemur6c6827c2020-02-06 21:15:18 +00001269 def FetchDescription(self, pretty=False):
1270 assert self.GetIssue(), 'issue is required to query Gerrit'
1271
Edward Lemur9aa1a962020-02-25 00:58:38 +00001272 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001273 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1274 current_rev = data['current_revision']
1275 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276
1277 if not pretty:
1278 return self.description
1279
1280 # Set width to 72 columns + 2 space indent.
1281 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1282 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1283 lines = self.description.splitlines()
1284 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285
1286 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001287 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001288 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001289 if self.GetBranch():
1290 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001291 if self.patchset is not None:
1292 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001293 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001294 return self.patchset
1295
Edward Lemur9aa1a962020-02-25 00:58:38 +00001296 def GetAuthor(self):
1297 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1298
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001300 """Set this branch's patchset. If patchset=0, clears the patchset."""
1301 assert self.GetBranch()
1302 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001303 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001304 else:
1305 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001306 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001308 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001309 """Set this branch's issue. If issue isn't given, clears the issue."""
1310 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001312 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001313 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001314 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001315 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001316 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001317 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001318 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001319 else:
tandrii5d48c322016-08-18 16:19:37 -07001320 # Reset all of these just to be clean.
1321 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001322 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001323 ISSUE_CONFIG_KEY,
1324 PATCHSET_CONFIG_KEY,
1325 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001326 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001327 ]
tandrii5d48c322016-08-18 16:19:37 -07001328 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001329 try:
1330 self._GitSetBranchConfigValue(prop, None)
1331 except subprocess2.CalledProcessError:
1332 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001333 msg = RunGit(['log', '-1', '--format=%B']).strip()
1334 if msg and git_footers.get_footer_change_id(msg):
1335 print('WARNING: The change patched into this branch has a Change-Id. '
1336 'Removing it.')
1337 RunGit(['commit', '--amend', '-m',
1338 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001339 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001341 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342
Joanna Wangb46232e2023-01-21 01:58:46 +00001343 def GetAffectedFiles(self, upstream, end_commit=None):
1344 # type: (str, Optional[str]) -> Sequence[str]
1345 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001346 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001347 return [
1348 f for _, f in scm.GIT.CaptureStatus(
1349 settings.GetRoot(), upstream, end_commit=end_commit)
1350 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001351 except subprocess2.CalledProcessError:
1352 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001353 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 'This branch probably doesn\'t exist anymore. To reset the\n'
1355 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001356 ' git branch --set-upstream-to origin/main %s\n'
1357 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001358 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001359
dsansomee2d6fd92016-09-08 00:10:47 -07001360 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001361 assert self.GetIssue(), 'issue is required to update description'
1362
1363 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001364 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 if not force:
1366 confirm_or_exit(
1367 'The description cannot be modified while the issue has a pending '
1368 'unpublished edit. Either publish the edit in the Gerrit web UI '
1369 'or delete it.\n\n', action='delete the unpublished edit')
1370
1371 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001372 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001373 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001374 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001375 description, notify='NONE')
1376
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001377 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001378
Edward Lemur75526302020-02-27 22:31:05 +00001379 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001380 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001381 '--root', settings.GetRoot(),
1382 '--upstream', upstream,
1383 ]
1384
1385 args.extend(['--verbose'] * verbose)
1386
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001387 remote, remote_branch = self.GetRemoteBranch()
1388 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001389 if settings.GetIsGerrit():
1390 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1391 args.extend(['--gerrit_project', self.GetGerritProject()])
1392 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001393
Edward Lemur99df04e2020-03-05 19:39:43 +00001394 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001395 issue = self.GetIssue()
1396 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001397 if author:
1398 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001399 if issue:
1400 args.extend(['--issue', str(issue)])
1401 if patchset:
1402 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001403
Edward Lemur75526302020-02-27 22:31:05 +00001404 return args
1405
Josip Sokcevic017544d2022-03-31 23:47:53 +00001406 def RunHook(self,
1407 committing,
1408 may_prompt,
1409 verbose,
1410 parallel,
1411 upstream,
1412 description,
1413 all_files,
1414 files=None,
1415 resultdb=False,
1416 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001417 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1418 args = self._GetCommonPresubmitArgs(verbose, upstream)
1419 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001420 if may_prompt:
1421 args.append('--may_prompt')
1422 if parallel:
1423 args.append('--parallel')
1424 if all_files:
1425 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001426 if files:
1427 args.extend(files.split(';'))
1428 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001429 if files or all_files:
1430 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001431
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001432 if resultdb and not realm:
1433 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1434 # it is not required to pass the realm flag
1435 print('Note: ResultDB reporting will NOT be performed because --realm'
1436 ' was not specified. To enable ResultDB, please run the command'
1437 ' again with the --realm argument to specify the LUCI realm.')
1438
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001439 return self._RunPresubmit(args,
1440 description,
1441 resultdb=resultdb,
1442 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001443
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001444 def _RunPresubmit(self,
1445 args,
1446 description,
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001447 resultdb=None,
1448 realm=None):
1449 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1450 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001451 args = args[:]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001452
Edward Lemur227d5102020-02-25 23:45:35 +00001453 with gclient_utils.temporary_file() as description_file:
1454 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001455 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001456 args.extend(['--json_output', json_output])
1457 args.extend(['--description_file', description_file])
Edward Lemur227d5102020-02-25 23:45:35 +00001458 start = time_time()
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001459 cmd = ['vpython3', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001460 if resultdb and realm:
1461 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001462
1463 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001464 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001465
Edward Lemur227d5102020-02-25 23:45:35 +00001466 metrics.collector.add_repeated('sub_commands', {
1467 'command': 'presubmit',
1468 'execution_time': time_time() - start,
1469 'exit_code': exit_code,
1470 })
1471
1472 if exit_code:
1473 sys.exit(exit_code)
1474
1475 json_results = gclient_utils.FileRead(json_output)
1476 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001477
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001478 def RunPostUploadHook(self, verbose, upstream, description):
Edward Lemur75526302020-02-27 22:31:05 +00001479 args = self._GetCommonPresubmitArgs(verbose, upstream)
1480 args.append('--post_upload')
1481
1482 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001483 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001484 args.extend(['--description_file', description_file])
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001485 subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args).wait()
Edward Lemur75526302020-02-27 22:31:05 +00001486
Edward Lemur5a644f82020-03-18 16:44:57 +00001487 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001488 # type: (optparse.Values, Sequence[str], Sequence[str]
1489 # ) -> ChangeDescription
1490 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001491 if self.GetIssue():
1492 description = self.FetchDescription()
1493 elif options.message:
1494 description = options.message
1495 else:
1496 description = _create_description_from_log(git_diff_args)
1497 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001498 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001499
Edward Lemur5a644f82020-03-18 16:44:57 +00001500 bug = options.bug
1501 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001502 if not self.GetIssue():
1503 # Extract bug number from branch name, but only if issue is being created.
1504 # It must start with bug or fix, followed by _ or - and number.
1505 # Optionally, it may contain _ or - after number with arbitrary text.
1506 # Examples:
1507 # bug-123
1508 # bug_123
1509 # fix-123
1510 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001511 branch = self.GetBranch()
1512 if branch is not None:
1513 match = re.match(
1514 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1515 if not bug and not fixed and match:
1516 if match.group('type') == 'bug':
1517 bug = match.group('bugnum')
1518 else:
1519 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001520
1521 change_description = ChangeDescription(description, bug, fixed)
1522
Joanna Wang39811b12023-01-20 23:09:48 +00001523 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001524 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001525 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001526 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001527 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001528 missing_files = [
1529 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001530 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001531 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001532 owners = self.owners_client.SuggestOwners(
1533 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001534 assert isinstance(options.reviewers, list), options.reviewers
1535 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001536
Edward Lemur5a644f82020-03-18 16:44:57 +00001537 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001538 if options.reviewers:
1539 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001540
1541 return change_description
1542
Joanna Wanga1abbed2023-01-24 01:41:05 +00001543 def _GetTitleForUpload(self, options, multi_change_upload=False):
1544 # type: (optparse.Values, Optional[bool]) -> str
1545
1546 # Getting titles for multipl commits is not supported so we return the
1547 # default.
1548 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001549 return options.title
1550
1551 # On first upload, patchset title is always this string, while options.title
1552 # gets converted to first line of message.
1553 if not self.GetIssue():
1554 return 'Initial upload'
1555
1556 # When uploading subsequent patchsets, options.message is taken as the title
1557 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001558 if options.message:
1559 return options.message.strip()
1560
1561 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001562 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001563 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001564 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001565 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001566
1567 # Use the default title if the user confirms the default with a 'y'.
1568 if user_title.lower() == 'y':
1569 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001570 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001571
Joanna Wang562481d2023-01-26 21:57:14 +00001572 def _GetRefSpecOptions(self,
1573 options,
1574 change_desc,
1575 multi_change_upload=False,
1576 dogfood_path=False):
1577 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1578 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001579
1580 # Extra options that can be specified at push time. Doc:
1581 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1582 refspec_opts = []
1583
1584 # By default, new changes are started in WIP mode, and subsequent patchsets
1585 # don't send email. At any time, passing --send-mail or --send-email will
1586 # mark the change ready and send email for that particular patch.
1587 if options.send_mail:
1588 refspec_opts.append('ready')
1589 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001590 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001591 refspec_opts.append('wip')
Joanna Wangcea35a32023-08-28 21:30:59 +00001592 else:
1593 refspec_opts.append('notify=NONE')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001594
1595 # TODO(tandrii): options.message should be posted as a comment if
1596 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1597 # to do it.
1598
1599 # Set options.title in case user was prompted in _GetTitleForUpload and
1600 # _CMDUploadChange needs to be called again.
1601 options.title = self._GetTitleForUpload(
1602 options, multi_change_upload=multi_change_upload)
1603
1604 if options.title:
1605 # Punctuation and whitespace in |title| must be percent-encoded.
1606 refspec_opts.append('m=' +
1607 gerrit_util.PercentEncodeForGitRef(options.title))
1608
1609 if options.private:
1610 refspec_opts.append('private')
1611
1612 if options.topic:
1613 # Documentation on Gerrit topics is here:
1614 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1615 refspec_opts.append('topic=%s' % options.topic)
1616
1617 if options.enable_auto_submit:
1618 refspec_opts.append('l=Auto-Submit+1')
1619 if options.set_bot_commit:
1620 refspec_opts.append('l=Bot-Commit+1')
1621 if options.use_commit_queue:
1622 refspec_opts.append('l=Commit-Queue+2')
1623 elif options.cq_dry_run:
1624 refspec_opts.append('l=Commit-Queue+1')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001625
1626 if change_desc.get_reviewers(tbr_only=True):
1627 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1628 self.GetGerritProject())
1629 refspec_opts.append('l=Code-Review+%s' % score)
1630
Joanna Wang40497912023-01-24 21:18:16 +00001631 # Gerrit sorts hashtags, so order is not important.
1632 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1633 # We check GetIssue because we only add hashtags from the
1634 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001635 # TODO(b/265929888): When we fully launch the new path:
1636 # 1) remove fetching hashtags from description alltogether
1637 # 2) Or use descrtiption hashtags for:
1638 # `not (self.GetIssue() and multi_change_upload)`
1639 # 3) Or enabled change description tags for multi and single changes
1640 # by adding them post `git push`.
1641 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001642 hashtags.update(change_desc.get_hash_tags())
1643 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001644
1645 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001646 # branch/change.
1647 return refspec_opts
1648
Joanna Wang05b60342023-03-29 20:25:57 +00001649 def PrepareSquashedCommit(self,
1650 options,
1651 parent,
1652 orig_parent,
1653 end_commit=None):
1654 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1655 """Create a squashed commit to upload.
1656
1657
1658 Args:
1659 parent: The commit to use as the parent for the new squashed.
1660 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1661 is part of the same original tree as end_commit, which does not
1662 contain squashed commits. This is used to create the change
1663 description for the new squashed commit with:
1664 `git log orig_parent..end_commit`.
1665 end_commit: The commit to use as the end of the new squashed commit.
1666 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001667
1668 if end_commit is None:
1669 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1670
Joanna Wang05b60342023-03-29 20:25:57 +00001671 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001672 end_commit)
1673 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1674 with gclient_utils.temporary_file() as desc_tempfile:
1675 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1676 commit_to_push = RunGit(
1677 ['commit-tree', latest_tree, '-p', parent, '-F',
1678 desc_tempfile]).strip()
1679
Joanna Wang7603f042023-03-01 22:17:36 +00001680 # Gerrit may or may not update fast enough to return the correct patchset
1681 # number after we push. Get the pre-upload patchset and increment later.
1682 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001683 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001684 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001685
Joanna Wang6215dd02023-02-07 15:58:03 +00001686 def PrepareCherryPickSquashedCommit(self, options, parent):
1687 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001688 """Create a commit cherry-picked on parent to push."""
1689
Joanna Wang6215dd02023-02-07 15:58:03 +00001690 # The `parent` is what we will cherry-pick on top of.
1691 # The `cherry_pick_base` is the beginning range of what
1692 # we are cherry-picking.
1693 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1694 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001695 self.branchref)
1696
1697 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1698 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1699 with gclient_utils.temporary_file() as desc_tempfile:
1700 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001701 commit_to_cp = RunGit([
1702 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1703 desc_tempfile
1704 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001705
Joanna Wang6215dd02023-02-07 15:58:03 +00001706 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001707 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1708 if ret:
1709 RunGit(['cherry-pick', '--abort'])
1710 RunGit(['checkout', '-q', self.branch])
1711 DieWithError('Could not cleanly cherry-pick')
1712
Joanna Wang6215dd02023-02-07 15:58:03 +00001713 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001714 RunGit(['checkout', '-q', self.branch])
1715
Joanna Wang7603f042023-03-01 22:17:36 +00001716 # Gerrit may or may not update fast enough to return the correct patchset
1717 # number after we push. Get the pre-upload patchset and increment later.
1718 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001719 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001720 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001721
Joanna Wangb46232e2023-01-21 01:58:46 +00001722 def _PrepareChange(self, options, parent, end_commit):
1723 # type: (optparse.Values, str, str) ->
1724 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1725 """Prepares the change to be uploaded."""
1726 self.EnsureCanUploadPatchset(options.force)
1727
1728 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1729 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1730 files)
1731
1732 watchlist = watchlists.Watchlists(settings.GetRoot())
1733 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1734 if not options.bypass_hooks:
1735 hook_results = self.RunHook(committing=False,
1736 may_prompt=not options.force,
1737 verbose=options.verbose,
1738 parallel=options.parallel,
1739 upstream=parent,
1740 description=change_desc.description,
1741 all_files=False)
1742 self.ExtendCC(hook_results['more_cc'])
1743
1744 # Update the change description and ensure we have a Change Id.
1745 if self.GetIssue():
1746 if options.edit_description:
1747 change_desc.prompt()
1748 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1749 change_id = change_detail['change_id']
1750 change_desc.ensure_change_id(change_id)
1751
Joanna Wangb46232e2023-01-21 01:58:46 +00001752 else: # No change issue. First time uploading
1753 if not options.force and not options.message_file:
1754 change_desc.prompt()
1755
1756 # Check if user added a change_id in the descripiton.
1757 change_ids = git_footers.get_footer_change_id(change_desc.description)
1758 if len(change_ids) == 1:
1759 change_id = change_ids[0]
1760 else:
1761 change_id = GenerateGerritChangeId(change_desc.description)
1762 change_desc.ensure_change_id(change_id)
1763
1764 if options.preserve_tryjobs:
1765 change_desc.set_preserve_tryjobs()
1766
1767 SaveDescriptionBackup(change_desc)
1768
1769 # Add ccs
1770 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001771 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001772 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001773 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001774 ccs = self.GetCCList().split(',')
1775 if len(ccs) > 100:
1776 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1777 'process/lsc/lsc_workflow.md')
1778 print('WARNING: This will auto-CC %s users.' % len(ccs))
1779 print('LSC may be more appropriate: %s' % lsc)
1780 print('You can also use the --no-autocc flag to disable auto-CC.')
1781 confirm_or_exit(action='continue')
1782
1783 # Add ccs from the --cc flag.
1784 if options.cc:
1785 ccs.extend(options.cc)
1786
1787 ccs = [email.strip() for email in ccs if email.strip()]
1788 if change_desc.get_cced():
1789 ccs.extend(change_desc.get_cced())
1790
1791 return change_desc.get_reviewers(), ccs, change_desc
1792
Joanna Wang40497912023-01-24 21:18:16 +00001793 def PostUploadUpdates(self, options, new_upload, change_number):
1794 # type: (optparse.Values, _NewUpload, change_number) -> None
1795 """Makes necessary post upload changes to the local and remote cl."""
1796 if not self.GetIssue():
1797 self.SetIssue(change_number)
1798
Joanna Wang7603f042023-03-01 22:17:36 +00001799 self.SetPatchset(new_upload.prev_patchset + 1)
1800
Joanna Wang40497912023-01-24 21:18:16 +00001801 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1802 new_upload.commit_to_push)
1803 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1804 new_upload.new_last_uploaded_commit)
1805
1806 if settings.GetRunPostUploadHook():
1807 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001808 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00001809
1810 if new_upload.reviewers or new_upload.ccs:
1811 gerrit_util.AddReviewers(self.GetGerritHost(),
1812 self._GerritChangeIdentifier(),
1813 reviewers=new_upload.reviewers,
1814 ccs=new_upload.ccs,
1815 notify=bool(options.send_mail))
1816
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001817 def CMDUpload(self, options, git_diff_args, orig_args):
1818 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001819 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001820 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001821 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001822 else:
1823 if self.GetBranch() is None:
1824 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1825
1826 # Default to diffing against common ancestor of upstream branch
1827 base_branch = self.GetCommonAncestorWithUpstream()
1828 git_diff_args = [base_branch, 'HEAD']
1829
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001830 # Fast best-effort checks to abort before running potentially expensive
1831 # hooks if uploading is likely to fail anyway. Passing these checks does
1832 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001833 self.EnsureAuthenticated(force=options.force)
1834 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001835
Daniel Cheng66d0f152023-08-29 23:21:58 +00001836 print(f'Processing {_GetCommitCountSummary(*git_diff_args)}...')
1837
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001838 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001839 watchlist = watchlists.Watchlists(settings.GetRoot())
1840 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001841 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001842 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001843
Edward Lemur5a644f82020-03-18 16:44:57 +00001844 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001846 hook_results = self.RunHook(committing=False,
1847 may_prompt=not options.force,
1848 verbose=options.verbose,
1849 parallel=options.parallel,
1850 upstream=base_branch,
1851 description=change_desc.description,
1852 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001853 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001854
Aaron Gable13101a62018-02-09 13:20:41 -08001855 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001856 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001857 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001859 if self.GetBranch() is not None:
1860 self._GitSetBranchConfigValue(
1861 LAST_UPLOAD_HASH_CONFIG_KEY,
1862 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001863 # Run post upload hooks, if specified.
1864 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001865 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001866 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001867
1868 # Upload all dependencies if specified.
1869 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001870 print()
1871 print('--dependencies has been specified.')
1872 print('All dependent local branches will be re-uploaded.')
1873 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001874 # Remove the dependencies flag from args so that we do not end up in a
1875 # loop.
1876 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001877 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001878 return ret
1879
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001880 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001881 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001882
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001883 Issue must have been already uploaded and known.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001884 """
1885 assert new_state in _CQState.ALL_STATES
1886 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001887 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001888 vote_map = {
1889 _CQState.NONE: 0,
1890 _CQState.DRY_RUN: 1,
1891 _CQState.COMMIT: 2,
1892 }
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001893 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001894 notify = False if new_state == _CQState.DRY_RUN else None
1895 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001896 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001897 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001898 return 0
1899 except KeyboardInterrupt:
1900 raise
1901 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001902 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001903 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001904 ' * Your project has no CQ,\n'
1905 ' * You don\'t have permission to change the CQ state,\n'
1906 ' * There\'s a bug in this code (see stack trace below).\n'
1907 'Consider specifying which bots to trigger manually or asking your '
1908 'project owners for permissions or contacting Chrome Infra at:\n'
1909 'https://www.chromium.org/infra\n\n' %
1910 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001911 # Still raise exception so that stack trace is printed.
1912 raise
1913
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001914 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915 # Lazy load of configs.
1916 self.GetCodereviewServer()
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001917
tandriie32e3ea2016-06-22 02:52:48 -07001918 if self._gerrit_host and '.' not in self._gerrit_host:
1919 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
Edward Lemur79d4f992019-11-11 23:49:02 +00001920 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001921 if parsed.scheme == 'sso':
tandriie32e3ea2016-06-22 02:52:48 -07001922 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1923 self._gerrit_server = 'https://%s' % self._gerrit_host
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001924
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 return self._gerrit_host
1926
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001927 def _GetGitHost(self):
1928 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001929 remote_url = self.GetRemoteUrl()
1930 if not remote_url:
1931 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001932 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001933
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 def GetCodereviewServer(self):
1935 if not self._gerrit_server:
1936 # If we're on a branch then get the server potentially associated
1937 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001938 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001939 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001940 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001941 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001942 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 if not self._gerrit_server:
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001944 url = urllib.parse.urlparse(self.GetRemoteUrl())
1945 parts = url.netloc.split('.')
1946
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1948 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949 parts[0] = parts[0] + '-review'
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001950
1951 if url.scheme == 'sso' and len(parts) == 1:
1952 # sso:// uses abbreivated hosts, eg. sso://chromium instead of
1953 # chromium.googlesource.com. Hence, for code review server, they need
1954 # to be expanded.
1955 parts[0] += '.googlesource.com'
1956
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001957 self._gerrit_host = '.'.join(parts)
1958 self._gerrit_server = 'https://%s' % self._gerrit_host
1959 return self._gerrit_server
1960
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001961 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001962 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001963 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001964 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001965 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001966 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001967 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001968 if project.endswith('.git'):
1969 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001970 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1971 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1972 # gitiles/git-over-https protocol. E.g.,
1973 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1974 # as
1975 # https://chromium.googlesource.com/v8/v8
1976 if project.startswith('a/'):
1977 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001978 return project
1979
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001980 def _GerritChangeIdentifier(self):
1981 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1982
1983 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001984 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001985 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001986 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001987 if project:
1988 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1989 # Fall back on still unique, but less efficient change number.
1990 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001991
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001992 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001993 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001994 if settings.GetGerritSkipEnsureAuthenticated():
1995 # For projects with unusual authentication schemes.
1996 # See http://crbug.com/603378.
1997 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001998
1999 # Check presence of cookies only if using cookies-based auth method.
2000 cookie_auth = gerrit_util.Authenticator.get()
2001 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002002 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002003
Florian Mayerae510e82020-01-30 21:04:48 +00002004 remote_url = self.GetRemoteUrl()
2005 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002006 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002007 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002008 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2009 logging.warning(
2010 'Ignoring branch %(branch)s with non-https/sso remote '
2011 '%(remote)s', {
2012 'branch': self.branch,
2013 'remote': self.GetRemoteUrl()
2014 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002015 return
2016
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002017 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002018 self.GetCodereviewServer()
2019 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002020 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021
2022 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2023 git_auth = cookie_auth.get_auth_header(git_host)
2024 if gerrit_auth and git_auth:
2025 if gerrit_auth == git_auth:
2026 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002027 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002028 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002029 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002030 ' %s\n'
2031 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002032 ' Consider running the following command:\n'
2033 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002034 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002035 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002036 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002037 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002038 cookie_auth.get_new_password_message(git_host)))
2039 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002040 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002041 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002042
2043 missing = (
2044 ([] if gerrit_auth else [self._gerrit_host]) +
2045 ([] if git_auth else [git_host]))
2046 DieWithError('Credentials for the following hosts are required:\n'
2047 ' %s\n'
2048 'These are read from %s (or legacy %s)\n'
2049 '%s' % (
2050 '\n '.join(missing),
2051 cookie_auth.get_gitcookies_path(),
2052 cookie_auth.get_netrc_path(),
2053 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002054
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002055 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002056 if not self.GetIssue():
2057 return
2058
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002059 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002060 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002061 DieWithError(
2062 'Change %s has been abandoned, new uploads are not allowed' %
2063 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002064 if status == 'MERGED':
2065 answer = gclient_utils.AskForData(
2066 'Change %s has been submitted, new uploads are not allowed. '
2067 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2068 ).lower()
2069 if answer not in ('y', ''):
2070 DieWithError('New uploads are not allowed.')
2071 self.SetIssue()
2072 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002073
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002074 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2075 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2076 # Apparently this check is not very important? Otherwise get_auth_email
2077 # could have been added to other implementations of Authenticator.
2078 cookies_auth = gerrit_util.Authenticator.get()
2079 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002080 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002081
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002082 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002083 if self.GetIssueOwner() == cookies_user:
2084 return
2085 logging.debug('change %s owner is %s, cookies user is %s',
2086 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002087 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002088 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002089 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002090 if details['email'] == self.GetIssueOwner():
2091 return
2092 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002093 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002094 'as %s.\n'
2095 'Uploading may fail due to lack of permissions.' %
2096 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2097 confirm_or_exit(action='upload')
2098
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002099 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002100 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002101 or CQ status, assuming adherence to a common workflow.
2102
2103 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002104 * 'error' - error from review tool (including deleted issues)
2105 * 'unsent' - no reviewers added
2106 * 'waiting' - waiting for review
2107 * 'reply' - waiting for uploader to reply to review
2108 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002109 * 'dry-run' - dry-running in the CQ
2110 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002111 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002112 """
2113 if not self.GetIssue():
2114 return None
2115
2116 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002117 data = self._GetChangeDetail([
2118 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002119 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002120 return 'error'
2121
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002122 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002123 return 'closed'
2124
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002125 cq_label = data['labels'].get('Commit-Queue', {})
2126 max_cq_vote = 0
2127 for vote in cq_label.get('all', []):
2128 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2129 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002130 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002131 if max_cq_vote == 1:
2132 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002133
Aaron Gable9ab38c62017-04-06 14:36:33 -07002134 if data['labels'].get('Code-Review', {}).get('approved'):
2135 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002136
2137 if not data.get('reviewers', {}).get('REVIEWER', []):
2138 return 'unsent'
2139
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002140 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002141 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002142 while messages:
2143 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002144 if (m.get('tag', '').startswith('autogenerated:cq') or
2145 m.get('tag', '').startswith('autogenerated:cv')):
2146 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002147 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002148 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002149 # Most recent message was by owner.
2150 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002151
2152 # Some reply from non-owner.
2153 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002154
2155 # Somehow there are no messages even though there are reviewers.
2156 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002157
Gavin Mak4e5e3992022-11-14 22:40:12 +00002158 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002159 if not self.GetIssue():
2160 return None
2161
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002162 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002163 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002164 if update:
2165 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002166 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002167
Gavin Makf35a9eb2022-11-17 18:34:36 +00002168 def _IsPatchsetRangeSignificant(self, lower, upper):
2169 """Returns True if the inclusive range of patchsets contains any reworks or
2170 rebases."""
2171 if not self.GetIssue():
2172 return False
2173
2174 data = self._GetChangeDetail(['ALL_REVISIONS'])
2175 ps_kind = {}
2176 for rev_info in data.get('revisions', {}).values():
2177 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2178
2179 for ps in range(lower, upper + 1):
2180 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2181 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2182 return True
2183 return False
2184
Gavin Make61ccc52020-11-13 00:12:57 +00002185 def GetMostRecentDryRunPatchset(self):
2186 """Get patchsets equivalent to the most recent patchset and return
2187 the patchset with the latest dry run. If none have been dry run, return
2188 the latest patchset."""
2189 if not self.GetIssue():
2190 return None
2191
2192 data = self._GetChangeDetail(['ALL_REVISIONS'])
2193 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002194 dry_run = {int(m['_revision_number'])
2195 for m in data.get('messages', [])
2196 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002197
2198 for revision_info in sorted(data.get('revisions', {}).values(),
2199 key=lambda c: c['_number'], reverse=True):
2200 if revision_info['_number'] in dry_run:
2201 patchset = revision_info['_number']
2202 break
2203 if revision_info.get('kind', '') not in \
2204 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2205 break
2206 self.SetPatchset(patchset)
2207 return patchset
2208
Aaron Gable636b13f2017-07-14 10:42:48 -07002209 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002210 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002211 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002212 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002213
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002214 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002215 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002216 # CURRENT_REVISION is included to get the latest patchset so that
2217 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002218 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002219 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2220 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002221 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002222 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002223 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002224 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002225
2226 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002227 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002228 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002229 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002230 line_comments = file_comments.setdefault(path, [])
2231 line_comments.extend(
2232 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002233
2234 # Build dictionary of file comments for easy access and sorting later.
2235 # {author+date: {path: {patchset: {line: url+message}}}}
2236 comments = collections.defaultdict(
2237 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002238
2239 server = self.GetCodereviewServer()
2240 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2241 # /c/ is automatically added by short URL server.
2242 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2243 self.GetIssue())
2244 else:
2245 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2246
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002247 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002248 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002249 tag = comment.get('tag', '')
2250 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002251 continue
2252 key = (comment['author']['email'], comment['updated'])
2253 if comment.get('side', 'REVISION') == 'PARENT':
2254 patchset = 'Base'
2255 else:
2256 patchset = 'PS%d' % comment['patch_set']
2257 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002258 url = ('%s/%s/%s#%s%s' %
2259 (url_prefix, comment['patch_set'], path,
2260 'b' if comment.get('side') == 'PARENT' else '',
2261 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002262 comments[key][path][patchset][line] = (url, comment['message'])
2263
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002264 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002265 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002266 summary = self._BuildCommentSummary(msg, comments, readable)
2267 if summary:
2268 summaries.append(summary)
2269 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002270
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002271 @staticmethod
2272 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002273 if 'email' not in msg['author']:
2274 # Some bot accounts may not have an email associated.
2275 return None
2276
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002277 key = (msg['author']['email'], msg['date'])
2278 # Don't bother showing autogenerated messages that don't have associated
2279 # file or line comments. this will filter out most autogenerated
2280 # messages, but will keep robot comments like those from Tricium.
2281 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2282 if is_autogenerated and not comments.get(key):
2283 return None
2284 message = msg['message']
2285 # Gerrit spits out nanoseconds.
2286 assert len(msg['date'].split('.')[-1]) == 9
2287 date = datetime.datetime.strptime(msg['date'][:-3],
2288 '%Y-%m-%d %H:%M:%S.%f')
2289 if key in comments:
2290 message += '\n'
2291 for path, patchsets in sorted(comments.get(key, {}).items()):
2292 if readable:
2293 message += '\n%s' % path
2294 for patchset, lines in sorted(patchsets.items()):
2295 for line, (url, content) in sorted(lines.items()):
2296 if line:
2297 line_str = 'Line %d' % line
2298 path_str = '%s:%d:' % (path, line)
2299 else:
2300 line_str = 'File comment'
2301 path_str = '%s:0:' % path
2302 if readable:
2303 message += '\n %s, %s: %s' % (patchset, line_str, url)
2304 message += '\n %s\n' % content
2305 else:
2306 message += '\n%s ' % path_str
2307 message += '\n%s\n' % content
2308
2309 return _CommentSummary(
2310 date=date,
2311 message=message,
2312 sender=msg['author']['email'],
2313 autogenerated=is_autogenerated,
2314 # These could be inferred from the text messages and correlated with
2315 # Code-Review label maximum, however this is not reliable.
2316 # Leaving as is until the need arises.
2317 approval=False,
2318 disapproval=False,
2319 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002320
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002321 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002322 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002323 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002324
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002325 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002326 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002327 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002328
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002329 def _GetChangeDetail(self, options=None):
2330 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002332 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002333
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002334 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002335 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002336 options.append('CURRENT_COMMIT')
2337
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002338 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002339 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002340 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002341
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002342 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2343 # Assumption: data fetched before with extra options is suitable
2344 # for return for a smaller set of options.
2345 # For example, if we cached data for
2346 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2347 # and request is for options=[CURRENT_REVISION],
2348 # THEN we can return prior cached data.
2349 if options_set.issubset(cached_options_set):
2350 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002351
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002352 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002353 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002354 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002355 except gerrit_util.GerritError as e:
2356 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002357 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002358 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002359
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002360 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002361 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002362
Gavin Mak4e5e3992022-11-14 22:40:12 +00002363 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002364 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002365 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002366 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2367 self._GerritChangeIdentifier(),
2368 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002369 except gerrit_util.GerritError as e:
2370 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002371 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002372 raise
agable32978d92016-11-01 12:55:02 -07002373 return data
2374
Karen Qian40c19422019-03-13 21:28:29 +00002375 def _IsCqConfigured(self):
2376 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002377 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002378
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002379 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002380 if git_common.is_dirty_git_tree('land'):
2381 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002382
tandriid60367b2016-06-22 05:25:12 -07002383 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002384 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002385 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002386 'which can test and land changes for you. '
2387 'Are you sure you wish to bypass it?\n',
2388 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002389 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002390 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002391 # Note: git diff outputs nothing if there is no diff.
2392 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002393 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002394 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002395 if detail['current_revision'] == last_upload:
2396 differs = False
2397 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002398 print('WARNING: Local branch contents differ from latest uploaded '
2399 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 if differs:
2401 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002402 confirm_or_exit(
2403 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2404 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002405 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002406 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002407 upstream = self.GetCommonAncestorWithUpstream()
2408 if self.GetIssue():
2409 description = self.FetchDescription()
2410 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002411 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002412 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002413 committing=True,
2414 may_prompt=not force,
2415 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002416 parallel=parallel,
2417 upstream=upstream,
2418 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002419 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002420 resultdb=resultdb,
2421 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002422
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002423 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002424 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002425 links = self._GetChangeCommit().get('web_links', [])
2426 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002427 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002428 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002429 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002430 return 0
2431
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002432 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2433 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002434 assert parsed_issue_arg.valid
2435
Edward Lemur125d60a2019-09-13 18:25:41 +00002436 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002437
2438 if parsed_issue_arg.hostname:
2439 self._gerrit_host = parsed_issue_arg.hostname
2440 self._gerrit_server = 'https://%s' % self._gerrit_host
2441
tandriic2405f52016-10-10 08:13:15 -07002442 try:
2443 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002444 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002445 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002446
2447 if not parsed_issue_arg.patchset:
2448 # Use current revision by default.
2449 revision_info = detail['revisions'][detail['current_revision']]
2450 patchset = int(revision_info['_number'])
2451 else:
2452 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002453 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002454 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2455 break
2456 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002457 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002458 (parsed_issue_arg.patchset, self.GetIssue()))
2459
Edward Lemur125d60a2019-09-13 18:25:41 +00002460 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002461 if remote_url.endswith('.git'):
2462 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002463 remote_url = remote_url.rstrip('/')
2464
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002465 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002466 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002467
2468 if remote_url != fetch_info['url']:
2469 DieWithError('Trying to patch a change from %s but this repo appears '
2470 'to be %s.' % (fetch_info['url'], remote_url))
2471
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002472 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002473
Joanna Wangc023a632023-01-26 17:59:25 +00002474 # Set issue immediately in case the cherry-pick fails, which happens
2475 # when resolving conflicts.
2476 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002477 self.SetIssue(parsed_issue_arg.issue)
2478
Aaron Gable62619a32017-06-16 08:22:09 -07002479 if force:
2480 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2481 print('Checked out commit for change %i patchset %i locally' %
2482 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002483 elif nocommit:
2484 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2485 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002486 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002487 RunGit(['cherry-pick', 'FETCH_HEAD'])
2488 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002489 (parsed_issue_arg.issue, patchset))
2490 print('Note: this created a local commit which does not have '
2491 'the same hash as the one uploaded for review. This will make '
2492 'uploading changes based on top of this branch difficult.\n'
2493 'If you want to do that, use "git cl patch --force" instead.')
2494
Stefan Zagerd08043c2017-10-12 12:07:02 -07002495 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002496 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002497 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002498 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2499 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002500 else:
2501 print('WARNING: You are in detached HEAD state.\n'
2502 'The patch has been applied to your checkout, but you will not be '
2503 'able to upload a new patch set to the gerrit issue.\n'
2504 'Try using the \'-b\' option if you would like to work on a '
2505 'branch and/or upload a new patch set.')
2506
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002507 return 0
2508
Joanna Wang18de1f62023-01-21 01:24:24 +00002509 @staticmethod
2510 def _GerritCommitMsgHookCheck(offer_removal):
2511 # type: (bool) -> None
2512 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002513 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2514 if not os.path.exists(hook):
2515 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002516 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2517 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002518 data = gclient_utils.FileRead(hook)
2519 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2520 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002521 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002522 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002523 'and may interfere with it in subtle ways.\n'
2524 'We recommend you remove the commit-msg hook.')
2525 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002526 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002527 gclient_utils.rm_file_or_tree(hook)
2528 print('Gerrit commit-msg hook removed.')
2529 else:
2530 print('OK, will keep Gerrit commit-msg hook in place.')
2531
Edward Lemur1b52d872019-05-09 21:12:12 +00002532 def _CleanUpOldTraces(self):
2533 """Keep only the last |MAX_TRACES| traces."""
2534 try:
2535 traces = sorted([
2536 os.path.join(TRACES_DIR, f)
2537 for f in os.listdir(TRACES_DIR)
2538 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2539 and not f.startswith('tmp'))
2540 ])
2541 traces_to_delete = traces[:-MAX_TRACES]
2542 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002543 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002544 except OSError:
2545 print('WARNING: Failed to remove old git traces from\n'
2546 ' %s'
2547 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002548
Edward Lemur5737f022019-05-17 01:24:00 +00002549 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002550 """Zip and write the git push traces stored in traces_dir."""
2551 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002552 traces_zip = trace_name + '-traces'
2553 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002554 # Create a temporary dir to store git config and gitcookies in. It will be
2555 # compressed and stored next to the traces.
2556 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002557 git_info_zip = trace_name + '-git-info'
2558
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002559 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002560
Edward Lemur1b52d872019-05-09 21:12:12 +00002561 git_push_metadata['trace_name'] = trace_name
2562 gclient_utils.FileWrite(
2563 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2564
2565 # Keep only the first 6 characters of the git hashes on the packet
2566 # trace. This greatly decreases size after compression.
2567 packet_traces = os.path.join(traces_dir, 'trace-packet')
2568 if os.path.isfile(packet_traces):
2569 contents = gclient_utils.FileRead(packet_traces)
2570 gclient_utils.FileWrite(
2571 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2572 shutil.make_archive(traces_zip, 'zip', traces_dir)
2573
2574 # Collect and compress the git config and gitcookies.
2575 git_config = RunGit(['config', '-l'])
2576 gclient_utils.FileWrite(
2577 os.path.join(git_info_dir, 'git-config'),
2578 git_config)
2579
2580 cookie_auth = gerrit_util.Authenticator.get()
2581 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2582 gitcookies_path = cookie_auth.get_gitcookies_path()
2583 if os.path.isfile(gitcookies_path):
2584 gitcookies = gclient_utils.FileRead(gitcookies_path)
2585 gclient_utils.FileWrite(
2586 os.path.join(git_info_dir, 'gitcookies'),
2587 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2588 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2589
Edward Lemur1b52d872019-05-09 21:12:12 +00002590 gclient_utils.rmtree(git_info_dir)
2591
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002592 def _RunGitPushWithTraces(self,
2593 refspec,
2594 refspec_opts,
2595 git_push_metadata,
2596 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002597 """Run git push and collect the traces resulting from the execution."""
2598 # Create a temporary directory to store traces in. Traces will be compressed
2599 # and stored in a 'traces' dir inside depot_tools.
2600 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002601 trace_name = os.path.join(
2602 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002603
2604 env = os.environ.copy()
2605 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2606 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002607 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002608 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2609 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2610 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2611
2612 try:
2613 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002614 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002615 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002616 push_cmd = ['git', 'push', remote_url, refspec]
2617 if git_push_options:
2618 for opt in git_push_options:
2619 push_cmd.extend(['-o', opt])
2620
Edward Lemur0f58ae42019-04-30 17:24:12 +00002621 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002622 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002623 env=env,
2624 print_stdout=True,
2625 # Flush after every line: useful for seeing progress when running as
2626 # recipe.
2627 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002628 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002629 except subprocess2.CalledProcessError as e:
2630 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002631 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002632 raise GitPushError(
2633 'Failed to create a change, very likely due to blocked keyword. '
2634 'Please examine output above for the reason of the failure.\n'
2635 'If this is a false positive, you can try to bypass blocked '
2636 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002637 '-o banned-words~skip, e.g.:\n'
2638 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002639 'If git-cl is not working correctly, file a bug under the '
2640 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002641 if 'git push -o nokeycheck' in str(e.stdout):
2642 raise GitPushError(
2643 'Failed to create a change, very likely due to a private key being '
2644 'detected. Please examine output above for the reason of the '
2645 'failure.\n'
2646 'If this is a false positive, you can try to bypass private key '
2647 'detection by using push option '
2648 '-o nokeycheck, e.g.:\n'
2649 'git cl upload -o nokeycheck\n\n'
2650 'If git-cl is not working correctly, file a bug under the '
2651 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002652
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002653 raise GitPushError(
2654 'Failed to create a change. Please examine output above for the '
2655 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002656 'For emergencies, Googlers can escalate to '
2657 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002658 'Hint: run command below to diagnose common Git/Gerrit '
2659 'credential problems:\n'
2660 ' git cl creds-check\n'
2661 '\n'
2662 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2663 'component including the files below.\n'
2664 'Review the files before upload, since they might contain sensitive '
2665 'information.\n'
2666 'Set the Restrict-View-Google label so that they are not publicly '
2667 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002668 finally:
2669 execution_time = time_time() - before_push
2670 metrics.collector.add_repeated('sub_commands', {
2671 'command': 'git push',
2672 'execution_time': execution_time,
2673 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002674 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002675 })
2676
Edward Lemur1b52d872019-05-09 21:12:12 +00002677 git_push_metadata['execution_time'] = execution_time
2678 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002679 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002680
Edward Lemur1b52d872019-05-09 21:12:12 +00002681 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002682 gclient_utils.rmtree(traces_dir)
2683
2684 return push_stdout
2685
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002686 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2687 change_desc):
2688 """Upload the current branch to Gerrit, retry if new remote HEAD is
2689 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002690 remote, remote_branch = self.GetRemoteBranch()
2691 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2692
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002693 try:
2694 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002695 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002696 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002697 # Repository might be in the middle of transition to main branch as
2698 # default, and uploads to old default might be blocked.
2699 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002700 DieWithError(str(e), change_desc)
2701
Josip Sokcevicb631a882021-01-06 18:18:10 +00002702 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2703 self.GetGerritProject())
2704 if project_head == branch:
2705 DieWithError(str(e), change_desc)
2706 branch = project_head
2707
2708 print("WARNING: Fetching remote state and retrying upload to default "
2709 "branch...")
2710 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002711 options.edit_description = False
2712 options.force = True
2713 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002714 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2715 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002716 except GitPushError as e:
2717 DieWithError(str(e), change_desc)
2718
2719 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002720 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002721 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002722 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002723 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002724 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002725 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002726 # User requested to change description
2727 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002728 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002729 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2730 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002731 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002732
2733 # Check if changes outside of this workspace have been uploaded.
2734 current_rev = change_detail['current_revision']
2735 last_uploaded_rev = self._GitGetBranchConfigValue(
2736 GERRIT_SQUASH_HASH_CONFIG_KEY)
2737 if last_uploaded_rev and current_rev != last_uploaded_rev:
2738 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002739 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002740 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002741 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002742 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002743 if len(change_ids) == 1:
2744 change_id = change_ids[0]
2745 else:
2746 change_id = GenerateGerritChangeId(change_desc.description)
2747 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002748
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002749 if options.preserve_tryjobs:
2750 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002751
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002752 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002753 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002754 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002755 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002756 with gclient_utils.temporary_file() as desc_tempfile:
2757 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2758 ref_to_push = RunGit(
2759 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002760 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002761 if options.no_add_changeid:
2762 pass
2763 else: # adding Change-Ids is okay.
2764 if not git_footers.get_footer_change_id(change_desc.description):
2765 DownloadGerritHook(False)
2766 change_desc.set_description(
2767 self._AddChangeIdToCommitMessage(change_desc.description,
2768 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002769 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002770 # For no-squash mode, we assume the remote called "origin" is the one we
2771 # want. It is not worthwhile to support different workflows for
2772 # no-squash mode.
2773 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002774 # attempt to extract the changeid from the current description
2775 # fail informatively if not possible.
2776 change_id_candidates = git_footers.get_footer_change_id(
2777 change_desc.description)
2778 if not change_id_candidates:
2779 DieWithError("Unable to extract change-id from message.")
2780 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002781
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002782 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002783 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2784 ref_to_push)]).splitlines()
2785 if len(commits) > 1:
2786 print('WARNING: This will upload %d commits. Run the following command '
2787 'to see which commits will be uploaded: ' % len(commits))
2788 print('git log %s..%s' % (parent, ref_to_push))
2789 print('You can also use `git squash-branch` to squash these into a '
2790 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002791 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002792
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002793 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002794 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002795 # Add default, watchlist, presubmit ccs if this is the initial upload
2796 # and CL is not private and auto-ccing has not been disabled.
2797 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002798 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002799 if len(cc) > 100:
2800 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2801 'process/lsc/lsc_workflow.md')
2802 print('WARNING: This will auto-CC %s users.' % len(cc))
2803 print('LSC may be more appropriate: %s' % lsc)
2804 print('You can also use the --no-autocc flag to disable auto-CC.')
2805 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002806 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002807 if options.cc:
2808 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002809 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002810 if change_desc.get_cced():
2811 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002812 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002813 valid_accounts = set(reviewers + cc)
2814 # TODO(crbug/877717): relax this for all hosts.
2815 else:
2816 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002817 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002818 logging.info('accounts %s are recognized, %s invalid',
2819 sorted(valid_accounts),
2820 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002821
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002822 # Extra options that can be specified at push time. Doc:
2823 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002824 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002825
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002826 for r in sorted(reviewers):
2827 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002828 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002829 reviewers.remove(r)
2830 else:
2831 # TODO(tandrii): this should probably be a hard failure.
2832 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2833 % r)
2834 for c in sorted(cc):
2835 # refspec option will be rejected if cc doesn't correspond to an
2836 # account, even though REST call to add such arbitrary cc may succeed.
2837 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002838 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002839 cc.remove(c)
2840
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002841 refspec_suffix = ''
2842 if refspec_opts:
2843 refspec_suffix = '%' + ','.join(refspec_opts)
2844 assert ' ' not in refspec_suffix, (
2845 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2846 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002847
Edward Lemur1b52d872019-05-09 21:12:12 +00002848 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002849 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002850 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002851 'change_id': change_id,
2852 'description': change_desc.description,
2853 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002854
Gavin Mak4e5e3992022-11-14 22:40:12 +00002855 # Gerrit may or may not update fast enough to return the correct patchset
2856 # number after we push. Get the pre-upload patchset and increment later.
2857 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2858
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002859 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002860 git_push_metadata,
2861 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002862
2863 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002864 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002865 change_numbers = [m.group(1)
2866 for m in map(regex.match, push_stdout.splitlines())
2867 if m]
2868 if len(change_numbers) != 1:
2869 DieWithError(
2870 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002871 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002872 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002873 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002874 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002875
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002876 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002877 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002878 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002879 gerrit_util.AddReviewers(self.GetGerritHost(),
2880 self._GerritChangeIdentifier(),
2881 reviewers,
2882 cc,
2883 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002884
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002885 return 0
2886
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002887 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2888 change_desc):
2889 """Computes parent of the generated commit to be uploaded to Gerrit.
2890
2891 Returns revision or a ref name.
2892 """
2893 if custom_cl_base:
2894 # Try to avoid creating additional unintended CLs when uploading, unless
2895 # user wants to take this risk.
2896 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2897 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2898 local_ref_of_target_remote])
2899 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002900 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002901 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2902 'If you proceed with upload, more than 1 CL may be created by '
2903 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2904 'If you are certain that specified base `%s` has already been '
2905 'uploaded to Gerrit as another CL, you may proceed.\n' %
2906 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2907 if not force:
2908 confirm_or_exit(
2909 'Do you take responsibility for cleaning up potential mess '
2910 'resulting from proceeding with upload?',
2911 action='upload')
2912 return custom_cl_base
2913
Aaron Gablef97e33d2017-03-30 15:44:27 -07002914 if remote != '.':
2915 return self.GetCommonAncestorWithUpstream()
2916
2917 # If our upstream branch is local, we base our squashed commit on its
2918 # squashed version.
2919 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2920
Aaron Gablef97e33d2017-03-30 15:44:27 -07002921 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002922 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002923 if upstream_branch_name == 'main':
2924 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002925
2926 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002927 # TODO(tandrii): consider checking parent change in Gerrit and using its
2928 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2929 # the tree hash of the parent branch. The upside is less likely bogus
2930 # requests to reupload parent change just because it's uploadhash is
2931 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002932 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2933 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002934 # Verify that the upstream branch has been uploaded too, otherwise
2935 # Gerrit will create additional CLs when uploading.
2936 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2937 RunGitSilent(['rev-parse', parent + ':'])):
2938 DieWithError(
2939 '\nUpload upstream branch %s first.\n'
2940 'It is likely that this branch has been rebased since its last '
2941 'upload, so you just need to upload it again.\n'
2942 '(If you uploaded it with --no-squash, then branch dependencies '
2943 'are not supported, and you should reupload with --squash.)'
2944 % upstream_branch_name,
2945 change_desc)
2946 return parent
2947
Gavin Mak4e5e3992022-11-14 22:40:12 +00002948 def _UpdateWithExternalChanges(self):
2949 """Updates workspace with external changes.
2950
2951 Returns the commit hash that should be used as the merge base on upload.
2952 """
2953 local_ps = self.GetPatchset()
2954 if local_ps is None:
2955 return
2956
2957 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002958 if external_ps is None or local_ps == external_ps or \
2959 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002960 return
2961
2962 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002963 if num_changes > 1:
2964 change_words = 'changes were'
2965 else:
2966 change_words = 'change was'
2967 print('\n%d external %s published to %s:\n' %
2968 (num_changes, change_words, self.GetIssueURL(short=True)))
2969
2970 # Print an overview of external changes.
2971 ps_to_commit = {}
2972 ps_to_info = {}
2973 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2974 for commit_id, revision_info in revisions.get('revisions', {}).items():
2975 ps_num = revision_info['_number']
2976 ps_to_commit[ps_num] = commit_id
2977 ps_to_info[ps_num] = revision_info
2978
2979 for ps in range(external_ps, local_ps, -1):
2980 commit = ps_to_commit[ps][:8]
2981 desc = ps_to_info[ps].get('description', '')
2982 print('Patchset %d [%s] %s' % (ps, commit, desc))
2983
Josip Sokcevic43ceaf02023-05-25 15:56:00 +00002984 print('\nSee diff at: %s/%d..%d' %
2985 (self.GetIssueURL(short=True), local_ps, external_ps))
2986 print('\nUploading without applying patches will override them.')
2987
2988 if not ask_for_explicit_yes('Get the latest changes and apply on top?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002989 return
2990
2991 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2992 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2993 external_base = external_parent['commit']
2994
2995 branch = git_common.current_branch()
2996 local_base = self.GetCommonAncestorWithUpstream()
2997 if local_base != external_base:
2998 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2999 (local_base, external_base))
3000 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00003001 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3002 'Continue with upload and override the latest changes?')
3003 return
3004 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003005
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003006 external_parent_last_uploaded = self._GetChangeCommit(
3007 revision=local_ps)['parents'][0]
3008 external_base_last_uploaded = external_parent_last_uploaded['commit']
3009
3010 if external_base != external_base_last_uploaded:
3011 print('\nPatch set merge bases are different (%s, %s).\n' %
3012 (external_base_last_uploaded, external_base))
3013 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3014 'Continue with upload and override the latest changes?')
3015 return
3016
Gavin Mak4e5e3992022-11-14 22:40:12 +00003017 # 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.
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003023 print('Fetching changes...')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003024 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003025 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003026 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3027 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3028 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3029 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003030
3031 # If the commit parents are different, don't apply the diff as it very
3032 # likely contains many more changes not relevant to this CL.
3033 parents = RunGitSilent(
3034 ['rev-parse',
3035 '%s~1' % (last_uploaded),
3036 '%s~1' % (latest_external)]).strip().split()
3037 assert len(parents) == 2, 'Expected two parents.'
3038 if parents[0] != parents[1]:
3039 confirm_or_exit(
3040 'Can\'t apply the latest changes from Gerrit (parent mismatch '
3041 'between PS).\n'
3042 'Continue with upload and override the latest changes?')
3043 return
3044
Gavin Mak4e5e3992022-11-14 22:40:12 +00003045 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3046
3047 # Diff can be empty in the case of trivial rebases.
3048 if not diff:
3049 return external_base
3050
3051 # Apply the diff.
3052 with gclient_utils.temporary_file() as diff_tempfile:
3053 gclient_utils.FileWrite(diff_tempfile, diff)
3054 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3055 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3056 if not clean_patch:
3057 # Normally patchset is set after upload. But because we exit, that never
3058 # happens. Updating here makes sure that subsequent uploads don't need
3059 # to fetch/apply the same diff again.
3060 self.SetPatchset(external_ps)
3061 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3062 'conflicts and reupload.')
3063
3064 message = 'Incorporate external changes from '
3065 if num_changes == 1:
3066 message += 'patchset %d' % external_ps
3067 else:
3068 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3069 RunGitSilent(['commit', '-am', message])
3070 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3071 # patchset title instead of this 'Incorporate' message.
3072 return external_base
3073
Edward Lemura12175c2020-03-09 16:58:26 +00003074 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003075 """Re-commits using the current message, assumes the commit hook is in
3076 place.
3077 """
Edward Lemura12175c2020-03-09 16:58:26 +00003078 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003079 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003080 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003081 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003082 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003083
3084 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003085
tandriie113dfd2016-10-11 10:20:12 -07003086 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003087 try:
3088 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003089 except GerritChangeNotExists:
3090 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003091
3092 if data['status'] in ('ABANDONED', 'MERGED'):
3093 return 'CL %s is closed' % self.GetIssue()
3094
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003095 def GetGerritChange(self, patchset=None):
3096 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003097 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003098 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003099 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003100 data = self._GetChangeDetail(['ALL_REVISIONS'])
3101
3102 assert host and issue and patchset, 'CL must be uploaded first'
3103
3104 has_patchset = any(
3105 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003106 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003107 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003108 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003109 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003110
tandrii8c5a3532016-11-04 07:52:02 -07003111 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003112 'host': host,
3113 'change': issue,
3114 'project': data['project'],
3115 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003116 }
tandriie113dfd2016-10-11 10:20:12 -07003117
tandriide281ae2016-10-12 06:02:30 -07003118 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003119 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003120
Edward Lemur707d70b2018-02-07 00:50:14 +01003121 def GetReviewers(self):
3122 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003123 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003124
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003125
Lei Zhang8a0efc12020-08-05 19:58:45 +00003126def _get_bug_line_values(default_project_prefix, bugs):
3127 """Given default_project_prefix and comma separated list of bugs, yields bug
3128 line values.
tandriif9aefb72016-07-01 09:06:51 -07003129
3130 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003131 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003132 * string, which is left as is.
3133
3134 This function may produce more than one line, because bugdroid expects one
3135 project per line.
3136
Lei Zhang8a0efc12020-08-05 19:58:45 +00003137 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003138 ['v8:123', 'chromium:789']
3139 """
3140 default_bugs = []
3141 others = []
3142 for bug in bugs.split(','):
3143 bug = bug.strip()
3144 if bug:
3145 try:
3146 default_bugs.append(int(bug))
3147 except ValueError:
3148 others.append(bug)
3149
3150 if default_bugs:
3151 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003152 if default_project_prefix:
3153 if not default_project_prefix.endswith(':'):
3154 default_project_prefix += ':'
3155 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003156 else:
3157 yield default_bugs
3158 for other in sorted(others):
3159 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3160 yield other
3161
3162
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003163class ChangeDescription(object):
3164 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003165 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003166 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003167 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003168 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003169 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003170 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3171 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003172 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003173 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003174
Dan Beamd8b04ca2019-10-10 21:23:26 +00003175 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003176 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003177 if bug:
3178 regexp = re.compile(self.BUG_LINE)
3179 prefix = settings.GetBugPrefix()
3180 if not any((regexp.match(line) for line in self._description_lines)):
3181 values = list(_get_bug_line_values(prefix, bug))
3182 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003183 if fixed:
3184 regexp = re.compile(self.FIXED_LINE)
3185 prefix = settings.GetBugPrefix()
3186 if not any((regexp.match(line) for line in self._description_lines)):
3187 values = list(_get_bug_line_values(prefix, fixed))
3188 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003189
agable@chromium.org42c20792013-09-12 17:34:49 +00003190 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003191 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003192 return '\n'.join(self._description_lines)
3193
3194 def set_description(self, desc):
Gavin Makcc976552023-08-28 17:01:52 +00003195 if isinstance(desc, str):
agable@chromium.org42c20792013-09-12 17:34:49 +00003196 lines = desc.splitlines()
3197 else:
3198 lines = [line.rstrip() for line in desc]
3199 while lines and not lines[0]:
3200 lines.pop(0)
3201 while lines and not lines[-1]:
3202 lines.pop(-1)
3203 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003204
Edward Lemur5a644f82020-03-18 16:44:57 +00003205 def ensure_change_id(self, change_id):
3206 description = self.description
3207 footer_change_ids = git_footers.get_footer_change_id(description)
3208 # Make sure that the Change-Id in the description matches the given one.
3209 if footer_change_ids != [change_id]:
3210 if footer_change_ids:
3211 # Remove any existing Change-Id footers since they don't match the
3212 # expected change_id footer.
3213 description = git_footers.remove_footer(description, 'Change-Id')
3214 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3215 'if you want to set a new one.')
3216 # Add the expected Change-Id footer.
3217 description = git_footers.add_footer_change_id(description, change_id)
3218 self.set_description(description)
3219
Joanna Wang39811b12023-01-20 23:09:48 +00003220 def update_reviewers(self, reviewers):
3221 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003222
3223 Args:
3224 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003225 """
Joanna Wang39811b12023-01-20 23:09:48 +00003226 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003227 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003228
3229 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003230
Joanna Wang39811b12023-01-20 23:09:48 +00003231 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003232 regexp = re.compile(self.R_LINE)
3233 matches = [regexp.match(line) for line in self._description_lines]
3234 new_desc = [l for i, l in enumerate(self._description_lines)
3235 if not matches[i]]
3236 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003237
Joanna Wang39811b12023-01-20 23:09:48 +00003238 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003239
Joanna Wang39811b12023-01-20 23:09:48 +00003240 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003241 for match in matches:
3242 if not match:
3243 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003244 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003245
Joanna Wang39811b12023-01-20 23:09:48 +00003246 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003247
3248 # Put the new lines in the description where the old first R= line was.
3249 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3250 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003251 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003252 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003253 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003254
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003255 def set_preserve_tryjobs(self):
3256 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3257 footers = git_footers.parse_footers(self.description)
3258 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3259 if v.lower() == 'true':
3260 return
3261 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3262
Anthony Polito8b955342019-09-24 19:01:36 +00003263 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003265 self.set_description([
3266 '# Enter a description of the change.',
3267 '# This will be displayed on the codereview site.',
3268 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003269 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003270 '--------------------',
3271 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003272 bug_regexp = re.compile(self.BUG_LINE)
3273 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003274 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003275 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003276
Dan Beamd8b04ca2019-10-10 21:23:26 +00003277 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003278 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003279
Bruce Dawsonfc487042020-10-27 19:11:37 +00003280 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003281 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003282 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003283 if not content:
3284 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003285 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003286
Bruce Dawson2377b012018-01-11 16:46:49 -08003287 # Strip off comments and default inserted "Bug:" line.
3288 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003289 (line.startswith('#') or
3290 line.rstrip() == "Bug:" or
3291 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003292 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003293 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003294 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003295
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003296 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003297 """Adds a footer line to the description.
3298
3299 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3300 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3301 that Gerrit footers are always at the end.
3302 """
3303 parsed_footer_line = git_footers.parse_footer(line)
3304 if parsed_footer_line:
3305 # Line is a gerrit footer in the form: Footer-Key: any value.
3306 # Thus, must be appended observing Gerrit footer rules.
3307 self.set_description(
3308 git_footers.add_footer(self.description,
3309 key=parsed_footer_line[0],
3310 value=parsed_footer_line[1]))
3311 return
3312
3313 if not self._description_lines:
3314 self._description_lines.append(line)
3315 return
3316
3317 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3318 if gerrit_footers:
3319 # git_footers.split_footers ensures that there is an empty line before
3320 # actual (gerrit) footers, if any. We have to keep it that way.
3321 assert top_lines and top_lines[-1] == ''
3322 top_lines, separator = top_lines[:-1], top_lines[-1:]
3323 else:
3324 separator = [] # No need for separator if there are no gerrit_footers.
3325
3326 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003327 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3328 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003329 top_lines.append('')
3330 top_lines.append(line)
3331 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003332
tandrii99a72f22016-08-17 14:33:24 -07003333 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003334 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003335 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003336 reviewers = [match.group(2).strip()
3337 for match in matches
3338 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003339 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003340
bradnelsond975b302016-10-23 12:20:23 -07003341 def get_cced(self):
3342 """Retrieves the list of reviewers."""
3343 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3344 cced = [match.group(2).strip() for match in matches if match]
3345 return cleanup_list(cced)
3346
Nodir Turakulov23b82142017-11-16 11:04:25 -08003347 def get_hash_tags(self):
3348 """Extracts and sanitizes a list of Gerrit hashtags."""
3349 subject = (self._description_lines or ('',))[0]
3350 subject = re.sub(
3351 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3352
3353 tags = []
3354 start = 0
3355 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3356 while True:
3357 m = bracket_exp.match(subject, start)
3358 if not m:
3359 break
3360 tags.append(self.sanitize_hash_tag(m.group(1)))
3361 start = m.end()
3362
3363 if not tags:
3364 # Try "Tag: " prefix.
3365 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3366 if m:
3367 tags.append(self.sanitize_hash_tag(m.group(1)))
3368 return tags
3369
3370 @classmethod
3371 def sanitize_hash_tag(cls, tag):
3372 """Returns a sanitized Gerrit hash tag.
3373
3374 A sanitized hashtag can be used as a git push refspec parameter value.
3375 """
3376 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3377
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003379def FindCodereviewSettingsFile(filename='codereview.settings'):
3380 """Finds the given file starting in the cwd and going up.
3381
3382 Only looks up to the top of the repository unless an
3383 'inherit-review-settings-ok' file exists in the root of the repository.
3384 """
3385 inherit_ok_file = 'inherit-review-settings-ok'
3386 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003387 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003388 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003389 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003390 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003391 if os.path.isfile(os.path.join(cwd, filename)):
3392 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003393 if cwd == root:
3394 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003395 parent_dir = os.path.dirname(cwd)
3396 if parent_dir == cwd:
3397 # We hit the system root directory.
3398 break
3399 cwd = parent_dir
3400 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003401
3402
3403def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003404 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003405 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003407 def SetProperty(name, setting, unset_error_ok=False):
3408 fullname = 'rietveld.' + name
3409 if setting in keyvals:
3410 RunGit(['config', fullname, keyvals[setting]])
3411 else:
3412 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3413
tandrii48df5812016-10-17 03:55:37 -07003414 if not keyvals.get('GERRIT_HOST', False):
3415 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003416 # Only server setting is required. Other settings can be absent.
3417 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003418 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003419 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3420 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003421 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003422 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3423 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003424 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3425 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003426 SetProperty(
3427 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003428
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003429 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003430 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003431
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003432 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003433 RunGit(['config', 'gerrit.squash-uploads',
3434 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003435
tandrii@chromium.org28253532016-04-14 13:46:56 +00003436 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003437 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003438 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3439
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003440 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003441 # should be of the form
3442 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3443 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003444 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3445 keyvals['ORIGIN_URL_CONFIG']])
3446
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003447
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003448def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003449 """Downloads a network object to a local file, like urllib.urlretrieve.
3450
3451 This is necessary because urllib is broken for SSL connections via a proxy.
3452 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003453 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003454 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003455
3456
ukai@chromium.org712d6102013-11-27 00:52:58 +00003457def hasSheBang(fname):
3458 """Checks fname is a #! script."""
3459 with open(fname) as f:
3460 return f.read(2).startswith('#!')
3461
3462
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003463def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003464 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003465
3466 Args:
3467 force: True to update hooks. False to install hooks if not present.
3468 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003469 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3471 if not os.access(dst, os.X_OK):
3472 if os.path.exists(dst):
3473 if not force:
3474 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003475 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003476 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003477 if not hasSheBang(dst):
3478 DieWithError('Not a script: %s\n'
3479 'You need to download from\n%s\n'
3480 'into .git/hooks/commit-msg and '
3481 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003482 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3483 except Exception:
3484 if os.path.exists(dst):
3485 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003486 DieWithError('\nFailed to download hooks.\n'
3487 'You need to download from\n%s\n'
3488 'into .git/hooks/commit-msg and '
3489 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003490
3491
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003492class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003493 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003494
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003495 def __init__(self):
3496 # Cached list of [host, identity, source], where source is either
3497 # .gitcookies or .netrc.
3498 self._all_hosts = None
3499
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003500 def ensure_configured_gitcookies(self):
3501 """Runs checks and suggests fixes to make git use .gitcookies from default
3502 path."""
3503 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3504 configured_path = RunGitSilent(
3505 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003506 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003507 if configured_path:
3508 self._ensure_default_gitcookies_path(configured_path, default)
3509 else:
3510 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003511
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003512 @staticmethod
3513 def _ensure_default_gitcookies_path(configured_path, default_path):
3514 assert configured_path
3515 if configured_path == default_path:
3516 print('git is already configured to use your .gitcookies from %s' %
3517 configured_path)
3518 return
3519
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003520 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003521 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3522 (configured_path, default_path))
3523
3524 if not os.path.exists(configured_path):
3525 print('However, your configured .gitcookies file is missing.')
3526 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3527 action='reconfigure')
3528 RunGit(['config', '--global', 'http.cookiefile', default_path])
3529 return
3530
3531 if os.path.exists(default_path):
3532 print('WARNING: default .gitcookies file already exists %s' %
3533 default_path)
3534 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3535 default_path)
3536
3537 confirm_or_exit('Move existing .gitcookies to default location?',
3538 action='move')
3539 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003540 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003541 print('Moved and reconfigured git to use .gitcookies from %s' %
3542 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003543
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003544 @staticmethod
3545 def _configure_gitcookies_path(default_path):
3546 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3547 if os.path.exists(netrc_path):
3548 print('You seem to be using outdated .netrc for git credentials: %s' %
3549 netrc_path)
3550 print('This tool will guide you through setting up recommended '
3551 '.gitcookies store for git credentials.\n'
3552 '\n'
3553 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3554 ' git config --global --unset http.cookiefile\n'
3555 ' mv %s %s.backup\n\n' % (default_path, default_path))
3556 confirm_or_exit(action='setup .gitcookies')
3557 RunGit(['config', '--global', 'http.cookiefile', default_path])
3558 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003559
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003560 def get_hosts_with_creds(self, include_netrc=False):
3561 if self._all_hosts is None:
3562 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003563 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3564 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3565 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3566 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003567
3568 if include_netrc:
3569 return self._all_hosts
3570 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3571
3572 def print_current_creds(self, include_netrc=False):
3573 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3574 if not hosts:
3575 print('No Git/Gerrit credentials found')
3576 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003577 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003578 header = [('Host', 'User', 'Which file'),
3579 ['=' * l for l in lengths]]
3580 for row in (header + hosts):
3581 print('\t'.join((('%%+%ds' % l) % s)
3582 for l, s in zip(lengths, row)))
3583
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003584 @staticmethod
3585 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003586 """Parses identity "git-<username>.domain" into <username> and domain."""
3587 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003588 # distinguishable from sub-domains. But we do know typical domains:
3589 if identity.endswith('.chromium.org'):
3590 domain = 'chromium.org'
3591 username = identity[:-len('.chromium.org')]
3592 else:
3593 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003594 if username.startswith('git-'):
3595 username = username[len('git-'):]
3596 return username, domain
3597
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003598 def has_generic_host(self):
3599 """Returns whether generic .googlesource.com has been configured.
3600
3601 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3602 """
3603 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003604 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003605 return True
3606 return False
3607
3608 def _get_git_gerrit_identity_pairs(self):
3609 """Returns map from canonic host to pair of identities (Git, Gerrit).
3610
3611 One of identities might be None, meaning not configured.
3612 """
3613 host_to_identity_pairs = {}
3614 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003615 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3617 idx = 0 if canonical == host else 1
3618 pair[idx] = identity
3619 return host_to_identity_pairs
3620
3621 def get_partially_configured_hosts(self):
3622 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003623 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003624 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003625 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003626
3627 def get_conflicting_hosts(self):
3628 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003629 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003630 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003631 if None not in (i1, i2) and i1 != i2)
3632
3633 def get_duplicated_hosts(self):
3634 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003635 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003636
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003637
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003639 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003640 hosts = sorted(hosts)
3641 assert hosts
3642 if extra_column_func is None:
3643 extras = [''] * len(hosts)
3644 else:
3645 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003646 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3647 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003648 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003649 lines.append(tmpl % he)
3650 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003651
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003652 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003653 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003654 yield ('.googlesource.com wildcard record detected',
3655 ['Chrome Infrastructure team recommends to list full host names '
3656 'explicitly.'],
3657 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003658
3659 dups = self.get_duplicated_hosts()
3660 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003661 yield ('The following hosts were defined twice',
3662 self._format_hosts(dups),
3663 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003664
3665 partial = self.get_partially_configured_hosts()
3666 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003667 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3668 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003669 self._format_hosts(
3670 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3671 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003672
3673 conflicting = self.get_conflicting_hosts()
3674 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003675 yield ('The following Git hosts have differing credentials from their '
3676 'Gerrit counterparts',
3677 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3678 tuple(self._get_git_gerrit_identity_pairs()[host])),
3679 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003680
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003681 def find_and_report_problems(self):
3682 """Returns True if there was at least one problem, else False."""
3683 found = False
3684 bad_hosts = set()
3685 for title, sublines, hosts in self._find_problems():
3686 if not found:
3687 found = True
3688 print('\n\n.gitcookies problem report:\n')
3689 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003690 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003691 if sublines:
3692 print()
3693 print(' %s' % '\n '.join(sublines))
3694 print()
3695
3696 if bad_hosts:
3697 assert found
3698 print(' You can manually remove corresponding lines in your %s file and '
3699 'visit the following URLs with correct account to generate '
3700 'correct credential lines:\n' %
3701 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003702 print(' %s' % '\n '.join(
3703 sorted(
3704 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3705 _canonical_git_googlesource_host(host))
3706 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003707 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003708
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003709
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003710@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003711def CMDcreds_check(parser, args):
3712 """Checks credentials and suggests changes."""
3713 _, _ = parser.parse_args(args)
3714
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003715 # Code below checks .gitcookies. Abort if using something else.
3716 authn = gerrit_util.Authenticator.get()
3717 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003718 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003719 'This command is not designed for bot environment. It checks '
3720 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003721 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3722 if isinstance(authn, gerrit_util.GceAuthenticator):
3723 message += (
3724 '\n'
3725 'If you need to run this on GCE or a cloudtop instance, '
3726 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3727 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003728
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003729 checker = _GitCookiesChecker()
3730 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003731
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003732 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003733 checker.print_current_creds(include_netrc=True)
3734
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003735 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003736 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003737 return 0
3738 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003739
3740
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003741@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003742def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003743 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003744 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003745 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003746 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003747 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003748 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003749 return RunGit(['config', 'branch.%s.base-url' % branch],
3750 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003751
3752 print('Setting base-url to %s' % args[0])
3753 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3754 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003755
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003756
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003757def color_for_status(status):
3758 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003759 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003760 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003761 'unsent': BOLD + Fore.YELLOW,
3762 'waiting': BOLD + Fore.RED,
3763 'reply': BOLD + Fore.YELLOW,
3764 'not lgtm': BOLD + Fore.RED,
3765 'lgtm': BOLD + Fore.GREEN,
3766 'commit': BOLD + Fore.MAGENTA,
3767 'closed': BOLD + Fore.CYAN,
3768 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003769 }.get(status, Fore.WHITE)
3770
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003771
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003772def get_cl_statuses(changes, fine_grained, max_processes=None):
3773 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003774
3775 If fine_grained is true, this will fetch CL statuses from the server.
3776 Otherwise, simply indicate if there's a matching url for the given branches.
3777
3778 If max_processes is specified, it is used as the maximum number of processes
3779 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3780 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003781
3782 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003783 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003784 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003785 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003786
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003787 if not fine_grained:
3788 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003789 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003790 for cl in changes:
3791 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003792 return
3793
3794 # First, sort out authentication issues.
3795 logging.debug('ensuring credentials exist')
3796 for cl in changes:
3797 cl.EnsureAuthenticated(force=False, refresh=True)
3798
3799 def fetch(cl):
3800 try:
3801 return (cl, cl.GetStatus())
3802 except:
3803 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003804 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003805 raise
3806
3807 threads_count = len(changes)
3808 if max_processes:
3809 threads_count = max(1, min(threads_count, max_processes))
3810 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3811
Edward Lemur61bf4172020-02-24 23:22:37 +00003812 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003813 fetched_cls = set()
3814 try:
3815 it = pool.imap_unordered(fetch, changes).__iter__()
3816 while True:
3817 try:
3818 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003819 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003820 break
3821 fetched_cls.add(cl)
3822 yield cl, status
3823 finally:
3824 pool.close()
3825
3826 # Add any branches that failed to fetch.
3827 for cl in set(changes) - fetched_cls:
3828 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003829
rmistry@google.com2dd99862015-06-22 12:22:18 +00003830
Jose Lopes3863fc52020-04-07 17:00:25 +00003831def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003832 """Uploads CLs of local branches that are dependents of the current branch.
3833
3834 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003835
3836 test1 -> test2.1 -> test3.1
3837 -> test3.2
3838 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839
3840 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3841 run on the dependent branches in this order:
3842 test2.1, test3.1, test3.2, test2.2, test3.3
3843
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003844 Note: This function does not rebase your local dependent branches. Use it
3845 when you make a change to the parent branch that will not conflict
3846 with its dependent branches, and you would like their dependencies
3847 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003848 """
3849 if git_common.is_dirty_git_tree('upload-branch-deps'):
3850 return 1
3851
3852 root_branch = cl.GetBranch()
3853 if root_branch is None:
3854 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3855 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003856 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003857 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3858 'patchset dependencies without an uploaded CL.')
3859
3860 branches = RunGit(['for-each-ref',
3861 '--format=%(refname:short) %(upstream:short)',
3862 'refs/heads'])
3863 if not branches:
3864 print('No local branches found.')
3865 return 0
3866
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003867 # Create a dictionary of all local branches to the branches that are
3868 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003869 tracked_to_dependents = collections.defaultdict(list)
3870 for b in branches.splitlines():
3871 tokens = b.split()
3872 if len(tokens) == 2:
3873 branch_name, tracked = tokens
3874 tracked_to_dependents[tracked].append(branch_name)
3875
vapiera7fbd5a2016-06-16 09:17:49 -07003876 print()
3877 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003878 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003879
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880 def traverse_dependents_preorder(branch, padding=''):
3881 dependents_to_process = tracked_to_dependents.get(branch, [])
3882 padding += ' '
3883 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 dependents.append(dependent)
3886 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003887
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890
3891 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 return 0
3894
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 # Record all dependents that failed to upload.
3896 failures = {}
3897 # Go through all dependents, checkout the branch and upload.
3898 try:
3899 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print()
3901 print('--------------------------------------')
3902 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905 try:
3906 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003909 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003910 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003912 finally:
3913 # Swap back to the original root branch.
3914 RunGit(['checkout', '-q', root_branch])
3915
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
3917 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003918 for dependent_branch in dependents:
3919 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003920 print(' %s : %s' % (dependent_branch, upload_status))
3921 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003922
3923 return 0
3924
3925
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003926def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003927 """Given a proposed tag name, returns a tag name that is guaranteed to be
3928 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3929 or 'foo-3', and so on."""
3930
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003931 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003932 for suffix_num in itertools.count(1):
3933 if suffix_num == 1:
3934 to_check = proposed_tag
3935 else:
3936 to_check = '%s-%d' % (proposed_tag, suffix_num)
3937
3938 if to_check not in existing_tags:
3939 return to_check
3940
3941
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003942@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003943def CMDarchive(parser, args):
3944 """Archives and deletes branches associated with closed changelists."""
3945 parser.add_option(
3946 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003947 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003948 parser.add_option(
3949 '-f', '--force', action='store_true',
3950 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003951 parser.add_option(
3952 '-d', '--dry-run', action='store_true',
3953 help='Skip the branch tagging and removal steps.')
3954 parser.add_option(
3955 '-t', '--notags', action='store_true',
3956 help='Do not tag archived branches. '
3957 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003958 parser.add_option(
3959 '-p',
3960 '--pattern',
3961 default='git-cl-archived-{issue}-{branch}',
3962 help='Format string for archive tags. '
3963 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003964
kmarshall3bff56b2016-06-06 18:31:47 -07003965 options, args = parser.parse_args(args)
3966 if args:
3967 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003968
3969 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3970 if not branches:
3971 return 0
3972
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003973 tags = RunGit(['for-each-ref', '--format=%(refname)',
3974 'refs/tags']).splitlines() or []
3975 tags = [t.split('/')[-1] for t in tags]
3976
vapiera7fbd5a2016-06-16 09:17:49 -07003977 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003978 changes = [Changelist(branchref=b)
3979 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003980 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3981 statuses = get_cl_statuses(changes,
3982 fine_grained=True,
3983 max_processes=options.maxjobs)
3984 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003985 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3986 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003987 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003988 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003989 proposal.sort()
3990
3991 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003992 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003993 return 0
3994
Edward Lemur85153282020-02-14 22:06:29 +00003995 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003996
vapiera7fbd5a2016-06-16 09:17:49 -07003997 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003998 if options.notags:
3999 for next_item in proposal:
4000 print(' ' + next_item[0])
4001 else:
4002 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4003 for next_item in proposal:
4004 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004005
kmarshall9249e012016-08-23 12:02:16 -07004006 # Quit now on precondition failure or if instructed by the user, either
4007 # via an interactive prompt or by command line flags.
4008 if options.dry_run:
4009 print('\nNo changes were made (dry run).\n')
4010 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004011
4012 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004013 print('You are currently on a branch \'%s\' which is associated with a '
4014 'closed codereview issue, so archive cannot proceed. Please '
4015 'checkout another branch and run this command again.' %
4016 current_branch)
4017 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004018
4019 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004020 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004021 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004022 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004023 return 1
4024
4025 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004026 if not options.notags:
4027 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004028
4029 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4030 # Clean up the tag if we failed to delete the branch.
4031 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004032
vapiera7fbd5a2016-06-16 09:17:49 -07004033 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004034
4035 return 0
4036
4037
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004038@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004040 """Show status of changelists.
4041
4042 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004043 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004044 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004045 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004046 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004047 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004048 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004049 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004050
4051 Also see 'git cl comments'.
4052 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004053 parser.add_option(
4054 '--no-branch-color',
4055 action='store_true',
4056 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004058 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004059 parser.add_option('-f', '--fast', action='store_true',
4060 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004061 parser.add_option(
4062 '-j', '--maxjobs', action='store', type=int,
4063 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004064 parser.add_option(
4065 '-i', '--issue', type=int,
4066 help='Operate on this issue instead of the current branch\'s implicit '
4067 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004068 parser.add_option('-d',
4069 '--date-order',
4070 action='store_true',
4071 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004072 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004073 if args:
4074 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075
iannuccie53c9352016-08-17 14:40:40 -07004076 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004077 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004078
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004080 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004081 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004082 if cl.GetIssue():
4083 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084 elif options.field == 'id':
4085 issueid = cl.GetIssue()
4086 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004088 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004089 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004092 elif options.field == 'status':
4093 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004094 elif options.field == 'url':
4095 url = cl.GetIssueURL()
4096 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004097 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004098 return 0
4099
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004100 branches = RunGit([
4101 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4102 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004103 if not branches:
4104 print('No local branch found.')
4105 return 0
4106
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004107 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004108 Changelist(branchref=b, commit_date=ct)
4109 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4110 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004111 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004112 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004113 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004114 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004115
Edward Lemur85153282020-02-14 22:06:29 +00004116 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004117
4118 def FormatBranchName(branch, colorize=False):
4119 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4120 an asterisk when it is the current branch."""
4121
4122 asterisk = ""
4123 color = Fore.RESET
4124 if branch == current_branch:
4125 asterisk = "* "
4126 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004127 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004128
4129 if colorize:
4130 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004131 return asterisk + branch_name
4132
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004133 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004134
4135 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004136
4137 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004138 sorted_changes = sorted(changes,
4139 key=lambda c: c.GetCommitDate(),
4140 reverse=True)
4141 else:
4142 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4143 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004144 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004145 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004146 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004147 branch_statuses[c.GetBranch()] = status
4148 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004149 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004150 if url and (not status or status == 'error'):
4151 # The issue probably doesn't exist anymore.
4152 url += ' (broken)'
4153
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004154 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004155 # Turn off bold as well as colors.
4156 END = '\033[0m'
4157 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004158 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004159 color = ''
4160 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004161 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004162
Alan Cuttera3be9a52019-03-04 18:50:33 +00004163 branch_display = FormatBranchName(branch)
4164 padding = ' ' * (alignment - len(branch_display))
4165 if not options.no_branch_color:
4166 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004167
Alan Cuttera3be9a52019-03-04 18:50:33 +00004168 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4169 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004170
vapiera7fbd5a2016-06-16 09:17:49 -07004171 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004172 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004173 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004174 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004175 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004176 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004178 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004179 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004180 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004182 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004183 return 0
4184
4185
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004186def colorize_CMDstatus_doc():
4187 """To be called once in main() to add colors to git cl status help."""
4188 colors = [i for i in dir(Fore) if i[0].isupper()]
4189
4190 def colorize_line(line):
4191 for color in colors:
4192 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004193 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004194 indent = len(line) - len(line.lstrip(' ')) + 1
4195 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4196 return line
4197
4198 lines = CMDstatus.__doc__.splitlines()
4199 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4200
4201
phajdan.jre328cf92016-08-22 04:12:17 -07004202def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004203 if path == '-':
4204 json.dump(contents, sys.stdout)
4205 else:
4206 with open(path, 'w') as f:
4207 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004208
4209
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004210@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004211@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004213 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214
4215 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004216 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004217 parser.add_option('-r', '--reverse', action='store_true',
4218 help='Lookup the branch(es) for the specified issues. If '
4219 'no issues are specified, all branches with mapped '
4220 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004221 parser.add_option('--json',
4222 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004223 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004224
dnj@chromium.org406c4402015-03-03 17:22:28 +00004225 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004226 branches = RunGit(['for-each-ref', 'refs/heads',
4227 '--format=%(refname)']).splitlines()
4228 # Reverse issue lookup.
4229 issue_branch_map = {}
4230
4231 git_config = {}
4232 for config in RunGit(['config', '--get-regexp',
4233 r'branch\..*issue']).splitlines():
4234 name, _space, val = config.partition(' ')
4235 git_config[name] = val
4236
4237 for branch in branches:
4238 issue = git_config.get(
4239 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4240 if issue:
4241 issue_branch_map.setdefault(int(issue), []).append(branch)
4242 if not args:
4243 args = sorted(issue_branch_map.keys())
4244 result = {}
4245 for issue in args:
4246 try:
4247 issue_num = int(issue)
4248 except ValueError:
4249 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4250 continue
4251 result[issue_num] = issue_branch_map.get(issue_num)
4252 print('Branch for issue number %s: %s' %
4253 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4254 if options.json:
4255 write_json(options.json, result)
4256 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004257
4258 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004259 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004260 if not issue.valid:
4261 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4262 'or no argument to list it.\n'
4263 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004264 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004265 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004266 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004267 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004268 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4269 if options.json:
4270 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004271 'gerrit_host': cl.GetGerritHost(),
4272 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004273 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004274 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004275 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276 return 0
4277
4278
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004279@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004280def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004281 """Shows or posts review comments for any changelist."""
4282 parser.add_option('-a', '--add-comment', dest='comment',
4283 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004284 parser.add_option('-p', '--publish', action='store_true',
4285 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004286 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004287 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004288 parser.add_option('-m', '--machine-readable', dest='readable',
4289 action='store_false', default=True,
4290 help='output comments in a format compatible with '
4291 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004292 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004293 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004294 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004295
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004296 issue = None
4297 if options.issue:
4298 try:
4299 issue = int(options.issue)
4300 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004301 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004302
Edward Lemur934836a2019-09-09 20:16:54 +00004303 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004304
4305 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004306 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307 return 0
4308
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004309 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4310 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004311 for comment in summary:
4312 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004313 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004314 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004315 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004316 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004317 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004318 elif comment.autogenerated:
4319 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004320 else:
4321 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004322 print('\n%s%s %s%s\n%s' % (
4323 color,
4324 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4325 comment.sender,
4326 Fore.RESET,
4327 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4328
smut@google.comc85ac942015-09-15 16:34:43 +00004329 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004330 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004331 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004332 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4333 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004334 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004335 return 0
4336
4337
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004338@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004339@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004340def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004341 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004342 parser.add_option('-d', '--display', action='store_true',
4343 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004344 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004345 help='New description to set for this issue (- for stdin, '
4346 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004347 parser.add_option('-f', '--force', action='store_true',
4348 help='Delete any unpublished Gerrit edits for this issue '
4349 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004350
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004351 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004352
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004353 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004354 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004355 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004356 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004357 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004358
Edward Lemur934836a2019-09-09 20:16:54 +00004359 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004360 if target_issue_arg:
4361 kwargs['issue'] = target_issue_arg.issue
4362 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004363
4364 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004365 if not cl.GetIssue():
4366 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004367
Edward Lemur678a6842019-10-03 22:25:05 +00004368 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004369 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004370
Edward Lemur6c6827c2020-02-06 21:15:18 +00004371 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004372
smut@google.com34fb6b12015-07-13 20:03:26 +00004373 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004374 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004375 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004376
4377 if options.new_description:
4378 text = options.new_description
4379 if text == '-':
4380 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004381 elif text == '+':
4382 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004383 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004384
4385 description.set_description(text)
4386 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004387 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004388 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004389 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004390 return 0
4391
4392
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004393@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004394def CMDlint(parser, args):
4395 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004396 parser.add_option('--filter', action='append', metavar='-x,+y',
4397 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004398 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399
4400 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004401 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004402 try:
4403 import cpplint
4404 import cpplint_chromium
4405 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004406 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 return 1
4408
4409 # Change the current working directory before calling lint so that it
4410 # shows the correct base.
4411 previous_cwd = os.getcwd()
4412 os.chdir(settings.GetRoot())
4413 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004414 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004415 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004416 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004417 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004418 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004419
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004420 # Process cpplint arguments, if any.
4421 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4422 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004423 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004424
Lei Zhang379d1ad2020-07-15 19:40:06 +00004425 include_regex = re.compile(settings.GetLintRegex())
4426 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004427 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4428 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004429 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004430 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004431 continue
4432
4433 if ignore_regex.match(filename):
4434 print('Ignoring file %s' % filename)
4435 continue
4436
4437 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4438 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004439 finally:
4440 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004442 if cpplint._cpplint_state.error_count != 0:
4443 return 1
4444 return 0
4445
4446
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004447@metrics.collector.collect_metrics('git cl presubmit')
mlcuic601e362023-08-14 23:39:46 +00004448@subcommand.usage('[base branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004449def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004450 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004451 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004452 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004453 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004454 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004455 parser.add_option('--all', action='store_true',
4456 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004457 parser.add_option('--files',
4458 nargs=1,
4459 help='Semicolon-separated list of files to be marked as '
4460 'modified when executing presubmit or post-upload hooks. '
4461 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004462 parser.add_option('--parallel', action='store_true',
4463 help='Run all tests specified by input_api.RunTests in all '
4464 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004465 parser.add_option('--resultdb', action='store_true',
4466 help='Run presubmit checks in the ResultSink environment '
4467 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004468 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004469 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004470
sbc@chromium.org71437c02015-04-09 19:29:40 +00004471 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004472 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004473 return 1
4474
Edward Lemur934836a2019-09-09 20:16:54 +00004475 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004476 if args:
4477 base_branch = args[0]
4478 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004479 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004480 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004481
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004482 start = time.time()
4483 try:
4484 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4485 description = cl.FetchDescription()
4486 else:
4487 description = _create_description_from_log([base_branch])
4488 except Exception as e:
4489 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004490 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004491 elapsed = time.time() - start
4492 if elapsed > 5:
4493 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004494
Bruce Dawson13acea32022-05-03 22:13:08 +00004495 if not base_branch:
4496 if not options.force:
4497 print('use --force to check even when not on a branch.')
4498 return 1
4499 base_branch = 'HEAD'
4500
Josip Sokcevic017544d2022-03-31 23:47:53 +00004501 cl.RunHook(committing=not options.upload,
4502 may_prompt=False,
4503 verbose=options.verbose,
4504 parallel=options.parallel,
4505 upstream=base_branch,
4506 description=description,
4507 all_files=options.all,
4508 files=options.files,
4509 resultdb=options.resultdb,
4510 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004511 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004512
4513
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004514def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004515 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004516
4517 Works the same way as
4518 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4519 but can be called on demand on all platforms.
4520
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004521 The basic idea is to generate git hash of a state of the tree, original
4522 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004523 """
4524 lines = []
4525 tree_hash = RunGitSilent(['write-tree'])
4526 lines.append('tree %s' % tree_hash.strip())
4527 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4528 if code == 0:
4529 lines.append('parent %s' % parent.strip())
4530 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4531 lines.append('author %s' % author.strip())
4532 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4533 lines.append('committer %s' % committer.strip())
4534 lines.append('')
4535 # Note: Gerrit's commit-hook actually cleans message of some lines and
4536 # whitespace. This code is not doing this, but it clearly won't decrease
4537 # entropy.
4538 lines.append(message)
4539 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004540 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004541 return 'I%s' % change_hash.strip()
4542
4543
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004544def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004545 """Computes the remote branch ref to use for the CL.
4546
4547 Args:
4548 remote (str): The git remote for the CL.
4549 remote_branch (str): The git remote branch for the CL.
4550 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004551 """
4552 if not (remote and remote_branch):
4553 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004554
wittman@chromium.org455dc922015-01-26 20:15:50 +00004555 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004556 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004557 # refs, which are then translated into the remote full symbolic refs
4558 # below.
4559 if '/' not in target_branch:
4560 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4561 else:
4562 prefix_replacements = (
4563 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4564 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4565 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4566 )
4567 match = None
4568 for regex, replacement in prefix_replacements:
4569 match = re.search(regex, target_branch)
4570 if match:
4571 remote_branch = target_branch.replace(match.group(0), replacement)
4572 break
4573 if not match:
4574 # This is a branch path but not one we recognize; use as-is.
4575 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004576 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004577 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004578 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004579 # Handle the refs that need to land in different refs.
4580 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004581
wittman@chromium.org455dc922015-01-26 20:15:50 +00004582 # Create the true path to the remote branch.
4583 # Does the following translation:
4584 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004585 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004586 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4587 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4588 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4589 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4590 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4591 'refs/heads/')
4592 elif remote_branch.startswith('refs/remotes/branch-heads'):
4593 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004594
wittman@chromium.org455dc922015-01-26 20:15:50 +00004595 return remote_branch
4596
4597
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004598def cleanup_list(l):
4599 """Fixes a list so that comma separated items are put as individual items.
4600
4601 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4602 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4603 """
4604 items = sum((i.split(',') for i in l), [])
4605 stripped_items = (i.strip() for i in items)
4606 return sorted(filter(None, stripped_items))
4607
4608
Aaron Gable4db38df2017-11-03 14:59:07 -07004609@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004610@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004611def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004612 """Uploads the current changelist to codereview.
4613
4614 Can skip dependency patchset uploads for a branch by running:
4615 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004616 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004617 git config --unset branch.branch_name.skip-deps-uploads
4618 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004619
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004620 If the name of the checked out branch starts with "bug-" or "fix-" followed
4621 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004622 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004623
4624 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004625 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004626 [git-cl] add support for hashtags
4627 Foo bar: implement foo
4628 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004629 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004630 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4631 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004632 parser.add_option('--bypass-watchlists', action='store_true',
4633 dest='bypass_watchlists',
4634 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004635 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004636 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004637 parser.add_option('--message', '-m', dest='message',
4638 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004639 parser.add_option('-b', '--bug',
4640 help='pre-populate the bug number(s) for this issue. '
4641 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004642 parser.add_option('--message-file', dest='message_file',
4643 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004644 parser.add_option('--title', '-t', dest='title',
4645 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004646 parser.add_option('-T', '--skip-title', action='store_true',
4647 dest='skip_title',
4648 help='Use the most recent commit message as the title of '
4649 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004650 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004651 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004652 help='reviewer email addresses')
4653 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004654 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004655 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004656 parser.add_option('--hashtag', dest='hashtags',
4657 action='append', default=[],
4658 help=('Gerrit hashtag for new CL; '
4659 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004660 parser.add_option('-s',
4661 '--send-mail',
4662 '--send-email',
4663 dest='send_mail',
4664 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004665 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004666 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004667 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004668 metavar='TARGET',
4669 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004670 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004671 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004672 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004673 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004674 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004675 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004676 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004677 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4678 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004679 parser.add_option('-c',
4680 '--use-commit-queue',
4681 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004682 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004683 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004684 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004685 parser.add_option('-d', '--cq-dry-run',
4686 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004687 help='Send the patchset to do a CQ dry run right after '
4688 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004689 parser.add_option('--set-bot-commit', action='store_true',
4690 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004691 parser.add_option('--preserve-tryjobs', action='store_true',
4692 help='instruct the CQ to let tryjobs running even after '
4693 'new patchsets are uploaded instead of canceling '
4694 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004695 parser.add_option('--dependencies', action='store_true',
4696 help='Uploads CLs of all the local branches that depend on '
4697 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004698 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4699 help='Sends your change to the CQ after an approval. Only '
4700 'works on repos that have the Auto-Submit label '
4701 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004702 parser.add_option('--parallel', action='store_true',
4703 help='Run all tests specified by input_api.RunTests in all '
4704 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004705 parser.add_option('--no-autocc', action='store_true',
4706 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004707 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004708 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004709 parser.add_option('-R', '--retry-failed', action='store_true',
4710 help='Retry failed tryjobs from old patchset immediately '
4711 'after uploading new patchset. Cannot be used with '
4712 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004713 parser.add_option('--fixed', '-x',
4714 help='List of bugs that will be commented on and marked '
4715 'fixed (pre-populates "Fixed:" tag). Same format as '
4716 '-b option / "Bug:" tag. If fixing several issues, '
4717 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004718 parser.add_option('--edit-description', action='store_true', default=False,
4719 help='Modify description before upload. Cannot be used '
4720 'with --force. It is a noop when --no-squash is set '
4721 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004722 parser.add_option('--git-completion-helper', action="store_true",
4723 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004724 parser.add_option('-o',
4725 '--push-options',
4726 action='append',
4727 default=[],
4728 help='Transmit the given string to the server when '
4729 'performing git push (pass-through). See git-push '
4730 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004731 parser.add_option('--no-add-changeid',
4732 action='store_true',
4733 dest='no_add_changeid',
4734 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004735 parser.add_option('--cherry-pick-stacked',
4736 '--cp',
4737 dest='cherry_pick_stacked',
4738 action='store_true',
4739 help='If parent branch has un-uploaded updates, '
4740 'automatically skip parent branches and just upload '
4741 'the current branch cherry-pick on its parent\'s last '
4742 'uploaded commit. Allows users to skip the potential '
4743 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004744 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004745
rmistry@google.com2dd99862015-06-22 12:22:18 +00004746 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004747 (options, args) = parser.parse_args(args)
4748
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004749 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004750 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4751 if opt.help != optparse.SUPPRESS_HELP))
4752 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004753
Aravind Vasudevanb8164182023-08-25 21:49:12 +00004754 # TODO(crbug.com/1475405): Warn users if the project uses submodules and
4755 # they have fsmonitor enabled.
4756 if os.path.isfile('.gitmodules'):
4757 git_common.warn_submodule()
4758
sbc@chromium.org71437c02015-04-09 19:29:40 +00004759 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004760 return 1
4761
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004762 options.reviewers = cleanup_list(options.reviewers)
4763 options.cc = cleanup_list(options.cc)
4764
Josipe827b0f2020-01-30 00:07:20 +00004765 if options.edit_description and options.force:
4766 parser.error('Only one of --force and --edit-description allowed')
4767
tandriib80458a2016-06-23 12:20:07 -07004768 if options.message_file:
4769 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004770 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004771 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004772
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004773 if ([options.cq_dry_run,
4774 options.use_commit_queue,
4775 options.retry_failed].count(True) > 1):
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00004776 parser.error('Only one of --use-commit-queue, --cq-dry-run or '
4777 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004778
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004779 if options.skip_title and options.title:
4780 parser.error('Only one of --title and --skip-title allowed.')
4781
Aaron Gableedbc4132017-09-11 13:22:28 -07004782 if options.use_commit_queue:
4783 options.send_mail = True
4784
Edward Lesmes0dd54822020-03-26 18:24:25 +00004785 if options.squash is None:
4786 # Load default for user, repo, squash=true, in this order.
4787 options.squash = settings.GetSquashGerritUploads()
4788
Joanna Wang5051ffe2023-03-01 22:24:07 +00004789 cl = Changelist(branchref=options.target_branch)
4790
4791 # Warm change details cache now to avoid RPCs later, reducing latency for
4792 # developers.
4793 if cl.GetIssue():
4794 cl._GetChangeDetail(
4795 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4796
4797 if options.retry_failed and not cl.GetIssue():
4798 print('No previous patchsets, so --retry-failed has no effect.')
4799 options.retry_failed = False
4800
Joanna Wang5051ffe2023-03-01 22:24:07 +00004801
Joanna Wang4786a412023-05-16 18:23:08 +00004802 disable_dogfood_stacked_changes = os.environ.get(
4803 DOGFOOD_STACKED_CHANGES_VAR) == '0'
4804 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'
4805
4806 # Only print message for folks who don't have DOGFOOD_STACKED_CHANGES set
4807 # to an expected value.
4808 if (options.squash and not dogfood_stacked_changes
4809 and not disable_dogfood_stacked_changes):
Joanna Wang1398e4f2023-05-01 18:49:13 +00004810 print(
4811 'This repo has been enrolled in the stacked changes dogfood.\n'
4812 '`git cl upload` now uploads the current branch and all upstream '
4813 'branches that have un-uploaded updates.\n'
4814 'Patches can now be reapplied with --force:\n'
4815 '`git cl patch --reapply --force`.\n'
4816 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
Joanna Wang4786a412023-05-16 18:23:08 +00004817 '\n'
4818 'Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4819 '"Set new changes to "work in progress" by default" checkbox at\n'
4820 'https://<host>-review.googlesource.com/settings/\n'
4821 '\n'
4822 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.\n'
4823 'To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004824 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004825
Joanna Wang4786a412023-05-16 18:23:08 +00004826 if options.squash and not disable_dogfood_stacked_changes:
Joanna Wangdd12deb2023-01-26 20:43:28 +00004827 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004828 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004829
Joanna Wangd75fc882023-03-01 21:53:34 +00004830 if options.cherry_pick_stacked:
4831 try:
4832 orig_args.remove('--cherry-pick-stacked')
4833 except ValueError:
4834 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004835 UploadAllSquashed(options, orig_args)
4836 return 0
4837
Joanna Wangd75fc882023-03-01 21:53:34 +00004838 if options.cherry_pick_stacked:
4839 parser.error('--cherry-pick-stacked is not available for this workflow.')
4840
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004841 # cl.GetMostRecentPatchset uses cached information, and can return the last
4842 # patchset before upload. Calling it here makes it clear that it's the
4843 # last patchset before upload. Note that GetMostRecentPatchset will fail
4844 # if no CL has been uploaded yet.
4845 if options.retry_failed:
4846 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004847
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004848 ret = cl.CMDUpload(options, args, orig_args)
4849
4850 if options.retry_failed:
4851 if ret != 0:
4852 print('Upload failed, so --retry-failed has no effect.')
4853 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004854 builds, _ = _fetch_latest_builds(cl,
4855 DEFAULT_BUILDBUCKET_HOST,
4856 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004857 jobs = _filter_failed_for_retry(builds)
4858 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004859 print('No failed tryjobs, so --retry-failed has no effect.')
4860 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004861 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004862
4863 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004864
4865
Daniel Cheng66d0f152023-08-29 23:21:58 +00004866def UploadAllSquashed(options: optparse.Values,
4867 orig_args: Sequence[str]) -> int:
Joanna Wang18de1f62023-01-21 01:24:24 +00004868 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004869 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004870
Joanna Wangc710e2d2023-01-25 14:53:22 +00004871 # Create commits.
Daniel Cheng66d0f152023-08-29 23:21:58 +00004872 uploads_by_cl: list[Tuple[Changelist, _NewUpload]] = []
Joanna Wangc710e2d2023-01-25 14:53:22 +00004873 if cherry_pick_current:
4874 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4875 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4876 uploads_by_cl.append((cls[0], new_upload))
4877 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004878 ordered_cls = list(reversed(cls))
4879
Joanna Wang6215dd02023-02-07 15:58:03 +00004880 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004881 # We can only support external changes when we're only uploading one
4882 # branch.
4883 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004884 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004885 if parent is None:
4886 origin = '.'
4887 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004888
Joanna Wang7603f042023-03-01 22:17:36 +00004889 while origin == '.':
4890 # Search for cl's closest ancestor with a gerrit hash.
4891 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4892 if origin == '.':
4893 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4894
4895 # Support the `git merge` and `git pull` workflow.
4896 if upstream_branch in ['master', 'main']:
4897 parent = cl.GetCommonAncestorWithUpstream()
4898 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004899 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4900 upstream_branch,
4901 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004902 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4903 upstream_branch,
4904 GERRIT_SQUASH_HASH_CONFIG_KEY)
4905 if parent:
4906 break
4907 branch = upstream_branch
4908 else:
4909 # Either the root of the tree is the cl's direct parent and the while
4910 # loop above only found empty branches between cl and the root of the
4911 # tree.
4912 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004913
Joanna Wang05b60342023-03-29 20:25:57 +00004914 if orig_parent is None:
4915 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004916 for i, cl in enumerate(ordered_cls):
4917 # If we're in the middle of the stack, set end_commit to downstream's
4918 # direct ancestor.
4919 if i + 1 < len(ordered_cls):
4920 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4921 else:
4922 child_base_commit = None
4923 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004924 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004925 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004926 end_commit=child_base_commit)
4927 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004928 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004929 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004930
4931 # Create refspec options
4932 cl, new_upload = uploads_by_cl[-1]
4933 refspec_opts = cl._GetRefSpecOptions(
4934 options,
4935 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004936 multi_change_upload=len(uploads_by_cl) > 1,
4937 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004938 refspec_suffix = ''
4939 if refspec_opts:
4940 refspec_suffix = '%' + ','.join(refspec_opts)
4941 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4942 refspec_suffix)
4943
4944 remote, remote_branch = cl.GetRemoteBranch()
4945 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4946 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4947 refspec_suffix)
4948
4949 # Git push
4950 git_push_metadata = {
4951 'gerrit_host':
4952 cl.GetGerritHost(),
4953 'title':
4954 options.title or '<untitled>',
4955 'change_id':
4956 git_footers.get_footer_change_id(new_upload.change_desc.description),
4957 'description':
4958 new_upload.change_desc.description,
4959 }
4960 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004961 git_push_metadata,
4962 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004963
4964 # Post push updates
4965 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4966 change_numbers = [
4967 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4968 ]
4969
4970 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4971 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4972
4973 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004974
4975
4976def _UploadAllPrecheck(options, orig_args):
4977 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4978 """Checks the state of the tree and gives the user uploading options
4979
4980 Returns: A tuple of the ordered list of changes that have new commits
4981 since their last upload and a boolean of whether the user wants to
4982 cherry-pick and upload the current branch instead of uploading all cls.
4983 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004984 cl = Changelist()
4985 if cl.GetBranch() is None:
4986 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4987
Joanna Wang18de1f62023-01-21 01:24:24 +00004988 branch_ref = None
4989 cls = []
4990 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004991 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004992
4993 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4994
4995 while True:
4996 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4997 DieWithError(
4998 'More than %s branches in the stack have not been uploaded.\n'
4999 'Are your branches in a misconfigured state?\n'
5000 'If not, please upload some upstream changes first.' %
5001 (_MAX_STACKED_BRANCHES_UPLOAD))
5002
5003 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005004
Joanna Wang6215dd02023-02-07 15:58:03 +00005005 # Only add CL if it has anything to commit.
5006 base_commit = cl.GetCommonAncestorWithUpstream()
5007 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5008
Daniel Cheng66d0f152023-08-29 23:21:58 +00005009 commit_summary = _GetCommitCountSummary(base_commit, end_commit)
5010 if commit_summary:
Joanna Wang6215dd02023-02-07 15:58:03 +00005011 cls.append(cl)
5012 if (not first_pass and
5013 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5014 # We are mid-stack and the user must upload their upstream branches.
5015 must_upload_upstream = True
Daniel Cheng66d0f152023-08-29 23:21:58 +00005016 print(f'Found change with {commit_summary}...')
Joanna Wang6215dd02023-02-07 15:58:03 +00005017 elif first_pass: # The current branch has nothing to commit. Exit.
5018 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5019 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5020 first_pass = False
5021
5022 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005023 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005024 branch_ref = upstream_branch_ref # set branch for next run.
5025
Joanna Wang6215dd02023-02-07 15:58:03 +00005026 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5027 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5028 upstream_branch,
5029 LAST_UPLOAD_HASH_CONFIG_KEY)
5030
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 # Case 1: We've reached the beginning of the tree.
5032 if origin != '.':
5033 break
5034
Joanna Wang18de1f62023-01-21 01:24:24 +00005035 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005036 # the user MUST upload them unless they are empty. Continue to
5037 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005039 continue
5040
Joanna Wang18de1f62023-01-21 01:24:24 +00005041 # Case 3: If upstream's last_upload == cl.base_commit we do
5042 # not need to upload any more upstreams from this point on.
5043 # (Even if there may be diverged branches higher up the tree)
5044 if base_commit == upstream_last_upload:
5045 break
5046
5047 # Case 4: If upstream's last_upload < cl.base_commit we are
5048 # uploading cl and upstream_cl.
5049 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005050 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005051 continue
5052
5053 # Case 5: If cl.base_commit < upstream's last_upload the user
5054 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005055 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005056 DieWithError(
5057 'At least one branch in the stack has diverged from its upstream '
5058 'branch and does not contain its upstream\'s last upload.\n'
5059 'Please rebase the stack with `git rebase-update` before uploading.')
5060
5061 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5062 # any relation to commits in the tree. Continue up the tree until we hit
5063 # the root.
5064
5065 # We assume all cls in the stack have the same auth requirements and only
5066 # check this once.
5067 cls[0].EnsureAuthenticated(force=options.force)
5068
5069 cherry_pick = False
5070 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005071 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005072 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005073 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005074 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005075 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005076 msg = ('At least one parent branch in `%s` has never been uploaded '
5077 'and must be uploaded before/with `%s`.\n' %
5078 (branches, cls[1].branch))
5079 if options.cherry_pick_stacked:
5080 DieWithError(msg)
5081 if not options.force:
5082 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005083 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005084 if options.cherry_pick_stacked:
5085 print('cherry-picking `%s` on %s\'s last upload' %
5086 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005087 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005088 elif not options.force:
5089 answer = gclient_utils.AskForData(
5090 '\n' + opt_message +
5091 'Press enter to update branches %s.\nOr type `n` to upload only '
5092 '`%s` cherry-picked on %s\'s last upload:' %
5093 (branches, cls[0].branch, cls[1].branch))
5094 if answer.lower() == 'n':
5095 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005096 return cls, cherry_pick
5097
5098
Francois Dorayd42c6812017-05-30 15:10:20 -04005099@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005100@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005101def CMDsplit(parser, args):
5102 """Splits a branch into smaller branches and uploads CLs.
5103
5104 Creates a branch and uploads a CL for each group of files modified in the
5105 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005106 comment, the string '$directory', is replaced with the directory containing
5107 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005108 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005109 parser.add_option('-d', '--description', dest='description_file',
5110 help='A text file containing a CL description in which '
5111 '$directory will be replaced by each CL\'s directory.')
5112 parser.add_option('-c', '--comment', dest='comment_file',
5113 help='A text file containing a CL comment.')
5114 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005115 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005116 help='List the files and reviewers for each CL that would '
5117 'be created, but don\'t create branches or CLs.')
5118 parser.add_option('--cq-dry-run', action='store_true',
5119 help='If set, will do a cq dry run for each uploaded CL. '
5120 'Please be careful when doing this; more than ~10 CLs '
5121 'has the potential to overload our build '
5122 'infrastructure. Try to upload these not during high '
5123 'load times (usually 11-3 Mountain View time). Email '
5124 'infra-dev@chromium.org with any questions.')
Anne Redulla072d06e2023-07-06 23:12:16 +00005125 parser.add_option('-a',
5126 '--enable-auto-submit',
5127 action='store_true',
5128 dest='enable_auto_submit',
Takuto Ikuta51eca592019-02-14 19:40:52 +00005129 default=True,
5130 help='Sends your change to the CQ after an approval. Only '
Anne Redulla072d06e2023-07-06 23:12:16 +00005131 'works on repos that have the Auto-Submit label '
5132 'enabled')
5133 parser.add_option('--disable-auto-submit',
5134 action='store_false',
5135 dest='enable_auto_submit',
5136 help='Disables automatic sending of the changes to the CQ '
5137 'after approval. Note that auto-submit only works for '
5138 'repos that have the Auto-Submit label enabled.')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005139 parser.add_option('--max-depth',
5140 type='int',
5141 default=0,
5142 help='The max depth to look for OWNERS files. Useful for '
5143 'controlling the granularity of the split CLs, e.g. '
5144 '--max-depth=1 will only split by top-level '
5145 'directory. Specifying a value less than 1 means no '
5146 'limit on max depth.')
Rachael Newitt03e49122023-06-28 21:39:21 +00005147 parser.add_option('--topic',
5148 default=None,
5149 help='Topic to specify when uploading')
Francois Dorayd42c6812017-05-30 15:10:20 -04005150 options, _ = parser.parse_args(args)
5151
5152 if not options.description_file:
5153 parser.error('No --description flag specified.')
5154
5155 def WrappedCMDupload(args):
5156 return CMDupload(OptionParser(), args)
5157
Daniel Cheng403c44e2022-10-05 22:24:58 +00005158 return split_cl.SplitCl(options.description_file, options.comment_file,
5159 Changelist, WrappedCMDupload, options.dry_run,
5160 options.cq_dry_run, options.enable_auto_submit,
Rachael Newitt03e49122023-06-28 21:39:21 +00005161 options.max_depth, options.topic, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005162
5163
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005164@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005165@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005166def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005167 """DEPRECATED: Used to commit the current changelist via git-svn."""
5168 message = ('git-cl no longer supports committing to SVN repositories via '
5169 'git-svn. You probably want to use `git cl land` instead.')
5170 print(message)
5171 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005172
5173
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005174@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005175@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005176def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005177 """Commits the current changelist via git.
5178
5179 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5180 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005181 """
5182 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5183 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005184 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005185 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005186 parser.add_option('--parallel', action='store_true',
5187 help='Run all tests specified by input_api.RunTests in all '
5188 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005189 parser.add_option('--resultdb', action='store_true',
5190 help='Run presubmit checks in the ResultSink environment '
5191 'and send results to the ResultDB database.')
5192 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005193 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005194
Edward Lemur934836a2019-09-09 20:16:54 +00005195 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005196
Robert Iannucci2e73d432018-03-14 01:10:47 -07005197 if not cl.GetIssue():
5198 DieWithError('You must upload the change first to Gerrit.\n'
5199 ' If you would rather have `git cl land` upload '
5200 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005201 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5202 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005203
5204
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005205@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005206@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207def CMDpatch(parser, args):
Victor Hugo Vianna Silvadeff9a22023-07-11 18:07:18 +00005208 """Applies (cherry-picks) a Gerrit changelist locally."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005209 parser.add_option('-b', dest='newbranch',
5210 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005211 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005212 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005214 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005216 group = optparse.OptionGroup(
5217 parser,
5218 'Options for continuing work on the current issue uploaded from a '
5219 'different clone (e.g. different machine). Must be used independently '
5220 'from the other options. No issue number should be specified, and the '
5221 'branch must have an issue number associated with it')
5222 group.add_option('--reapply', action='store_true', dest='reapply',
5223 help='Reset the branch and reapply the issue.\n'
5224 'CAUTION: This will undo any local changes in this '
5225 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005226
5227 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005228 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005229 parser.add_option_group(group)
5230
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005231 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005232
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005233 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005234 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005235 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005236 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005237 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005238
Edward Lemur934836a2019-09-09 20:16:54 +00005239 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005240 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005241 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005242
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005243 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005244 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005245 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005246
5247 RunGit(['reset', '--hard', upstream])
5248 if options.pull:
5249 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005250
Edward Lemur678a6842019-10-03 22:25:05 +00005251 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005252 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5253 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005254
5255 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005256 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005257
Edward Lemurf38bc172019-09-03 21:02:13 +00005258 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005259 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005260 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005261
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005262 # We don't want uncommitted changes mixed up with the patch.
5263 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005264 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005266 if options.newbranch:
5267 if options.force:
5268 RunGit(['branch', '-D', options.newbranch],
5269 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005270 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005271
Edward Lemur678a6842019-10-03 22:25:05 +00005272 cl = Changelist(
5273 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005274
Edward Lemur678a6842019-10-03 22:25:05 +00005275 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005276 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005277
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005278 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5279 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005280
5281
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005282def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 """Fetches the tree status and returns either 'open', 'closed',
5284 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005285 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005286 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005287 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005288 if status.find('closed') != -1 or status == '0':
5289 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005290
5291 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005292 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005293
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005295 return 'unset'
5296
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005298def GetTreeStatusReason():
5299 """Fetches the tree status from a json url and returns the message
5300 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005301 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005302 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005303 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005304 status = json.loads(connection.read())
5305 connection.close()
5306 return status['message']
5307
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005308
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005309@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005310def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005311 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005312 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005313 status = GetTreeStatus()
5314 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005315 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005316 return 2
5317
vapiera7fbd5a2016-06-16 09:17:49 -07005318 print('The tree is %s' % status)
5319 print()
5320 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005321 if status != 'open':
5322 return 1
5323 return 0
5324
5325
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005326@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005327def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005328 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5329 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005330 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005331 '-b', '--bot', action='append',
5332 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5333 'times to specify multiple builders. ex: '
5334 '"-b win_rel -b win_layout". See '
5335 'the try server waterfall for the builders name and the tests '
5336 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005338 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005339 help=('Buildbucket bucket to send the try requests. Format: '
5340 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005341 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005342 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005343 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005344 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005345 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005346 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005347 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005348 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005349 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005350 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005351 '--category', default='git_cl_try', help='Specify custom build category.')
5352 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005353 '--project',
5354 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005355 'in recipe to determine to which repository or directory to '
5356 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005357 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005358 '-p', '--property', dest='properties', action='append', default=[],
5359 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005360 'key2=value2 etc. The value will be treated as '
5361 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005362 'NOTE: using this may make your tryjob not usable for CQ, '
5363 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005364 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005365 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5366 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005367 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005368 parser.add_option(
5369 '-R', '--retry-failed', action='store_true', default=False,
5370 help='Retry failed jobs from the latest set of tryjobs. '
5371 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005372 parser.add_option(
5373 '-i', '--issue', type=int,
5374 help='Operate on this issue instead of the current branch\'s implicit '
5375 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005376 options, args = parser.parse_args(args)
5377
machenbach@chromium.org45453142015-09-15 08:45:22 +00005378 # Make sure that all properties are prop=value pairs.
5379 bad_params = [x for x in options.properties if '=' not in x]
5380 if bad_params:
5381 parser.error('Got properties with missing "=": %s' % bad_params)
5382
maruel@chromium.org15192402012-09-06 12:38:29 +00005383 if args:
5384 parser.error('Unknown arguments: %s' % args)
5385
Edward Lemur934836a2019-09-09 20:16:54 +00005386 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005387 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005388 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005389
Edward Lemurf38bc172019-09-03 21:02:13 +00005390 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005391 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005392
tandriie113dfd2016-10-11 10:20:12 -07005393 error_message = cl.CannotTriggerTryJobReason()
5394 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005395 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005396
Edward Lemur45768512020-03-02 19:03:14 +00005397 if options.bot:
5398 if options.retry_failed:
5399 parser.error('--bot is not compatible with --retry-failed.')
5400 if not options.bucket:
5401 parser.error('A bucket (e.g. "chromium/try") is required.')
5402
5403 triggered = [b for b in options.bot if 'triggered' in b]
5404 if triggered:
5405 parser.error(
5406 'Cannot schedule builds on triggered bots: %s.\n'
5407 'This type of bot requires an initial job from a parent (usually a '
5408 'builder). Schedule a job on the parent instead.\n' % triggered)
5409
5410 if options.bucket.startswith('.master'):
5411 parser.error('Buildbot masters are not supported.')
5412
5413 project, bucket = _parse_bucket(options.bucket)
5414 if project is None or bucket is None:
5415 parser.error('Invalid bucket: %s.' % options.bucket)
5416 jobs = sorted((project, bucket, bot) for bot in options.bot)
5417 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005418 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005419 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005420 if options.verbose:
5421 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005422 jobs = _filter_failed_for_retry(builds)
5423 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005424 print('There are no failed jobs in the latest set of jobs '
5425 '(patchset #%d), doing nothing.' % patchset)
5426 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005427 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005428 if num_builders > 10:
5429 confirm_or_exit('There are %d builders with failed builds.'
5430 % num_builders, action='continue')
5431 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005432 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005433 print('git cl try with no bots now defaults to CQ dry run.')
5434 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5435 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005436
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005437 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005438 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005439 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005440 except BuildbucketResponseException as ex:
5441 print('ERROR: %s' % ex)
5442 return 1
5443 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005444
5445
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005446@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005448 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005449 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005450 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005451 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005453 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005454 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005455 '--color', action='store_true', default=setup_color.IS_TTY,
5456 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005458 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5459 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005460 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005461 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005462 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005463 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005464 parser.add_option(
5465 '-i', '--issue', type=int,
5466 help='Operate on this issue instead of the current branch\'s implicit '
5467 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005468 options, args = parser.parse_args(args)
5469 if args:
5470 parser.error('Unrecognized args: %s' % ' '.join(args))
5471
Edward Lemur934836a2019-09-09 20:16:54 +00005472 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005473 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005474 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475
tandrii221ab252016-10-06 08:12:04 -07005476 patchset = options.patchset
5477 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005478 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005479 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005480 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005481 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005482 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005483 cl.GetIssue())
5484
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005485 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005486 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005487 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005489 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005490 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005491 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005492 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005493 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005494 return 0
5495
5496
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005497@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005498@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005499def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005500 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005501 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005502 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005503 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005504
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005505 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005506 if args:
5507 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005508 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005509 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005510 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005511 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005512
5513 # Clear configured merge-base, if there is one.
5514 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005515 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005516 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005517 return 0
5518
5519
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005520@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005521def CMDweb(parser, args):
5522 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005523 parser.add_option('-p',
5524 '--print-only',
5525 action='store_true',
5526 dest='print_only',
5527 help='Only print the Gerrit URL, don\'t open it in the '
5528 'browser.')
5529 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005530 if args:
5531 parser.error('Unrecognized args: %s' % ' '.join(args))
5532
5533 issue_url = Changelist().GetIssueURL()
5534 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005535 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005536 return 1
5537
Orr Bernstein0b960582022-12-22 20:16:18 +00005538 if options.print_only:
5539 print(issue_url)
5540 return 0
5541
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005542 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005543 # allows us to hide the "Created new window in existing browser session."
5544 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005545 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005546 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005547 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005548 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005549 os.open(os.devnull, os.O_RDWR)
5550 try:
5551 webbrowser.open(issue_url)
5552 finally:
5553 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005554 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005555 return 0
5556
5557
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005558@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005559def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005560 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005561 parser.add_option('-d', '--dry-run', action='store_true',
5562 help='trigger in dry run mode')
5563 parser.add_option('-c', '--clear', action='store_true',
5564 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005565 parser.add_option(
5566 '-i', '--issue', type=int,
5567 help='Operate on this issue instead of the current branch\'s implicit '
5568 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005569 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005570 if args:
5571 parser.error('Unrecognized args: %s' % ' '.join(args))
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00005572 if [options.dry_run, options.clear].count(True) > 1:
5573 parser.error('Only one of --dry-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005574
Edward Lemur934836a2019-09-09 20:16:54 +00005575 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005576 if not cl.GetIssue():
5577 parser.error('Must upload the issue first.')
5578
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005579 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005580 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005581 elif options.dry_run:
5582 state = _CQState.DRY_RUN
5583 else:
5584 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005585 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005586 return 0
5587
5588
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005589@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005590def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005591 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005592 parser.add_option(
5593 '-i', '--issue', type=int,
5594 help='Operate on this issue instead of the current branch\'s implicit '
5595 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005596 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005597 if args:
5598 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005599 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005600 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005601 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005602 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005603 cl.CloseIssue()
5604 return 0
5605
5606
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005607@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005608def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005609 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005610 parser.add_option(
5611 '--stat',
5612 action='store_true',
5613 dest='stat',
5614 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005615 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005616 if args:
5617 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005618
Edward Lemur934836a2019-09-09 20:16:54 +00005619 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005620 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005621 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005622 if not issue:
5623 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005624
Gavin Makbe2e9262022-11-08 23:41:55 +00005625 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005626 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005627 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005628 if not base:
5629 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5630 revision_info = detail['revisions'][detail['current_revision']]
5631 fetch_info = revision_info['fetch']['http']
5632 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5633 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005634
Aaron Gablea718c3e2017-08-28 17:47:28 -07005635 cmd = ['git', 'diff']
5636 if options.stat:
5637 cmd.append('--stat')
5638 cmd.append(base)
5639 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005640
5641 return 0
5642
5643
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005644@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005645def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005646 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005647 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005648 '--ignore-current',
5649 action='store_true',
5650 help='Ignore the CL\'s current reviewers and start from scratch.')
5651 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005652 '--ignore-self',
5653 action='store_true',
5654 help='Do not consider CL\'s author as an owners.')
5655 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005656 '--no-color',
5657 action='store_true',
5658 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005659 parser.add_option(
5660 '--batch',
5661 action='store_true',
5662 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005663 # TODO: Consider moving this to another command, since other
5664 # git-cl owners commands deal with owners for a given CL.
5665 parser.add_option(
5666 '--show-all',
5667 action='store_true',
5668 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005669 options, args = parser.parse_args(args)
5670
Edward Lemur934836a2019-09-09 20:16:54 +00005671 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005672 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005673
Yang Guo6e269a02019-06-26 11:17:02 +00005674 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005675 if len(args) == 0:
5676 print('No files specified for --show-all. Nothing to do.')
5677 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005678 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005679 for path in args:
5680 print('Owners for %s:' % path)
5681 print('\n'.join(
5682 ' - %s' % owner
5683 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005684 return 0
5685
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005686 if args:
5687 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005688 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005689 base_branch = args[0]
5690 else:
5691 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005692 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005693
Edward Lemur2c62b332020-03-12 22:12:33 +00005694 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005695
5696 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005697 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5698 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005699 return 0
5700
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005701 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005702 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005703 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005704 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005705 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005706 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005707 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005708
5709
Aiden Bennerc08566e2018-10-03 17:52:42 +00005710def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005711 """Generates a diff command."""
5712 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005713 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5714
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005715 if allow_prefix:
5716 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5717 # case that diff.noprefix is set in the user's git config.
5718 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5719 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005720 diff_cmd += ['--no-prefix']
5721
5722 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005723
5724 if args:
5725 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005726 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005727 diff_cmd.append(arg)
5728 else:
5729 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005730
5731 return diff_cmd
5732
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005733
Jamie Madill5e96ad12020-01-13 16:08:35 +00005734def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5735 """Runs clang-format-diff and sets a return value if necessary."""
5736
5737 if not clang_diff_files:
5738 return 0
5739
5740 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5741 # formatted. This is used to block during the presubmit.
5742 return_value = 0
5743
5744 # Locate the clang-format binary in the checkout
5745 try:
5746 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5747 except clang_format.NotFoundError as e:
5748 DieWithError(e)
5749
5750 if opts.full or settings.GetFormatFullByDefault():
5751 cmd = [clang_format_tool]
5752 if not opts.dry_run and not opts.diff:
5753 cmd.append('-i')
5754 if opts.dry_run:
5755 for diff_file in clang_diff_files:
5756 with open(diff_file, 'r') as myfile:
5757 code = myfile.read().replace('\r\n', '\n')
5758 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5759 stdout = stdout.replace('\r\n', '\n')
5760 if opts.diff:
5761 sys.stdout.write(stdout)
5762 if code != stdout:
5763 return_value = 2
5764 else:
5765 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5766 if opts.diff:
5767 sys.stdout.write(stdout)
5768 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005769 try:
5770 script = clang_format.FindClangFormatScriptInChromiumTree(
5771 'clang-format-diff.py')
5772 except clang_format.NotFoundError as e:
5773 DieWithError(e)
5774
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005775 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005776 if not opts.dry_run and not opts.diff:
5777 cmd.append('-i')
5778
5779 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005780 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005781
Edward Lesmes89624cd2020-04-06 17:51:56 +00005782 env = os.environ.copy()
5783 env['PATH'] = (
5784 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5785 stdout = RunCommand(
5786 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005787 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005788 if opts.diff:
5789 sys.stdout.write(stdout)
5790 if opts.dry_run and len(stdout) > 0:
5791 return_value = 2
5792
5793 return return_value
5794
5795
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005796def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5797 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5798 presubmit checks have failed (and returns 0 otherwise)."""
5799
5800 if not rust_diff_files:
5801 return 0
5802
5803 # Locate the rustfmt binary.
5804 try:
5805 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5806 except rustfmt.NotFoundError as e:
5807 DieWithError(e)
5808
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005809 # TODO(crbug.com/1440869): Support formatting only the changed lines
5810 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005811 cmd = [rustfmt_tool]
5812 if opts.dry_run:
5813 cmd.append('--check')
5814 cmd += rust_diff_files
5815 rustfmt_exitcode = subprocess2.call(cmd)
5816
5817 if opts.presubmit and rustfmt_exitcode != 0:
5818 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005819
5820 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005821
5822
Olivier Robin0a6b5442022-04-07 07:25:04 +00005823def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5824 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5825 that presubmit checks have failed (and returns 0 otherwise)."""
5826
5827 if not swift_diff_files:
5828 return 0
5829
5830 # Locate the swift-format binary.
5831 try:
5832 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5833 except swift_format.NotFoundError as e:
5834 DieWithError(e)
5835
5836 cmd = [swift_format_tool]
5837 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005838 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005839 else:
5840 cmd += ['format', '-i']
5841 cmd += swift_diff_files
5842 swift_format_exitcode = subprocess2.call(cmd)
5843
5844 if opts.presubmit and swift_format_exitcode != 0:
5845 return 2
5846
5847 return 0
5848
5849
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005850def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005851 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005852 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005853
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005854
enne@chromium.org555cfe42014-01-29 18:21:39 +00005855@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005856@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005857def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005858 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005859 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005860 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005861 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005862 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005863 parser.add_option('--full', action='store_true',
5864 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005865 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005866 parser.add_option('--dry-run', action='store_true',
5867 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005868 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005869 '--no-clang-format',
5870 dest='clang_format',
5871 action='store_false',
5872 default=True,
5873 help='Disables formatting of various file types using clang-format.')
5874 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005875 '--python',
5876 action='store_true',
5877 default=None,
5878 help='Enables python formatting on all python files.')
5879 parser.add_option(
5880 '--no-python',
5881 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005882 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005883 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005884 'If neither --python or --no-python are set, python files that have a '
5885 '.style.yapf file in an ancestor directory will be formatted. '
5886 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005887 parser.add_option(
5888 '--js',
5889 action='store_true',
5890 help='Format javascript code with clang-format. '
5891 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005892 parser.add_option('--diff', action='store_true',
5893 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005894 parser.add_option('--presubmit', action='store_true',
5895 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005896
5897 parser.add_option('--rust-fmt',
5898 dest='use_rust_fmt',
5899 action='store_true',
5900 default=rustfmt.IsRustfmtSupported(),
5901 help='Enables formatting of Rust file types using rustfmt.')
5902 parser.add_option(
5903 '--no-rust-fmt',
5904 dest='use_rust_fmt',
5905 action='store_false',
5906 help='Disables formatting of Rust file types using rustfmt.')
5907
Olivier Robin0a6b5442022-04-07 07:25:04 +00005908 parser.add_option(
5909 '--swift-format',
5910 dest='use_swift_format',
5911 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005912 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005913 help='Enables formatting of Swift file types using swift-format '
5914 '(macOS host only).')
5915 parser.add_option(
5916 '--no-swift-format',
5917 dest='use_swift_format',
5918 action='store_false',
5919 help='Disables formatting of Swift file types using swift-format.')
5920
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005921 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005922
Garrett Beaty91a6f332020-01-06 16:57:24 +00005923 if opts.python is not None and opts.no_python:
5924 raise parser.error('Cannot set both --python and --no-python')
5925 if opts.no_python:
5926 opts.python = False
5927
Daniel Chengc55eecf2016-12-30 03:11:02 -08005928 # Normalize any remaining args against the current path, so paths relative to
5929 # the current directory are still resolved as expected.
5930 args = [os.path.join(os.getcwd(), arg) for arg in args]
5931
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005932 # git diff generates paths against the root of the repository. Change
5933 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005934 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005935 if rel_base_path:
5936 os.chdir(rel_base_path)
5937
digit@chromium.org29e47272013-05-17 17:01:46 +00005938 # Grab the merge-base commit, i.e. the upstream commit of the current
5939 # branch when it was created or the last time it was rebased. This is
5940 # to cover the case where the user may have called "git fetch origin",
5941 # moving the origin branch to a newer commit, but hasn't rebased yet.
5942 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005943 upstream_branch = opts.upstream
5944 if not upstream_branch:
5945 cl = Changelist()
5946 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005947 if upstream_branch:
5948 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5949 upstream_commit = upstream_commit.strip()
5950
5951 if not upstream_commit:
5952 DieWithError('Could not find base commit for this branch. '
5953 'Are you in detached state?')
5954
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005955 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5956 diff_output = RunGit(changed_files_cmd)
5957 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005958 # Filter out files deleted by this CL
5959 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005960
Andreas Haas417d89c2020-02-06 10:24:27 +00005961 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005962 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005963
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005964 clang_diff_files = []
5965 if opts.clang_format:
5966 clang_diff_files = [
5967 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5968 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005969 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005970 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005971 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005972 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005973
Edward Lesmes50da7702020-03-30 19:23:43 +00005974 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005975
Jamie Madill5e96ad12020-01-13 16:08:35 +00005976 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5977 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005978
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005979 if opts.use_rust_fmt:
5980 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5981 upstream_commit)
5982 if rust_fmt_return_value == 2:
5983 return_value = 2
5984
Olivier Robin0a6b5442022-04-07 07:25:04 +00005985 if opts.use_swift_format:
5986 if sys.platform != 'darwin':
5987 DieWithError('swift-format is only supported on macOS.')
5988 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5989 upstream_commit)
5990 if swift_format_return_value == 2:
5991 return_value = 2
5992
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005993 # Similar code to above, but using yapf on .py files rather than clang-format
5994 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005995 py_explicitly_disabled = opts.python is not None and not opts.python
5996 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005997 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5998 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005999
Aiden Bennerc08566e2018-10-03 17:52:42 +00006000 # Used for caching.
6001 yapf_configs = {}
6002 for f in python_diff_files:
6003 # Find the yapf style config for the current file, defaults to depot
6004 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006005 _FindYapfConfigFile(f, yapf_configs, top_dir)
6006
6007 # Turn on python formatting by default if a yapf config is specified.
6008 # This breaks in the case of this repo though since the specified
6009 # style file is also the global default.
6010 if opts.python is None:
6011 filtered_py_files = []
6012 for f in python_diff_files:
6013 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6014 filtered_py_files.append(f)
6015 else:
6016 filtered_py_files = python_diff_files
6017
6018 # Note: yapf still seems to fix indentation of the entire file
6019 # even if line ranges are specified.
6020 # See https://github.com/google/yapf/issues/499
6021 if not opts.full and filtered_py_files:
6022 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6023
Brian Sheedyb4307d52019-12-02 19:18:17 +00006024 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6025 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6026 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006027
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006028 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006029 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6030 # Default to pep8 if not .style.yapf is found.
6031 if not yapf_style:
6032 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006033
Peter Wend9399922020-06-17 17:33:49 +00006034 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006035 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006036 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006037 else:
6038 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006039
6040 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006041
6042 has_formattable_lines = False
6043 if not opts.full:
6044 # Only run yapf over changed line ranges.
6045 for diff_start, diff_len in py_line_diffs[f]:
6046 diff_end = diff_start + diff_len - 1
6047 # Yapf errors out if diff_end < diff_start but this
6048 # is a valid line range diff for a removal.
6049 if diff_end >= diff_start:
6050 has_formattable_lines = True
6051 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6052 # If all line diffs were removals we have nothing to format.
6053 if not has_formattable_lines:
6054 continue
6055
6056 if opts.diff or opts.dry_run:
6057 cmd += ['--diff']
6058 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006059 stdout = RunCommand(cmd,
6060 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006061 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006062 cwd=top_dir,
6063 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006064 if opts.diff:
6065 sys.stdout.write(stdout)
6066 elif len(stdout) > 0:
6067 return_value = 2
6068 else:
6069 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006070 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006071
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006072 # Format GN build files. Always run on full build files for canonical form.
6073 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006074 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006075 if opts.dry_run or opts.diff:
6076 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006077 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006078 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006079 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006080 cwd=top_dir)
6081 if opts.dry_run and gn_ret == 2:
6082 return_value = 2 # Not formatted.
6083 elif opts.diff and gn_ret == 2:
6084 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006085 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006086 elif gn_ret != 0:
6087 # For non-dry run cases (and non-2 return values for dry-run), a
6088 # nonzero error code indicates a failure, probably because the file
6089 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006090 DieWithError('gn format failed on ' + gn_diff_file +
6091 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006092
Ilya Shermane081cbe2017-08-15 17:51:04 -07006093 # Skip the metrics formatting from the global presubmit hook. These files have
6094 # a separate presubmit hook that issues an error if the files need formatting,
6095 # whereas the top-level presubmit script merely issues a warning. Formatting
6096 # these files is somewhat slow, so it's important not to duplicate the work.
6097 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006098 for diff_xml in GetDiffXMLs(diff_files):
6099 xml_dir = GetMetricsDir(diff_xml)
6100 if not xml_dir:
6101 continue
6102
Ilya Shermane081cbe2017-08-15 17:51:04 -07006103 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006104 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006105 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006106
6107 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6108 # command as histograms/pretty_print.py now needs a relative path argument
6109 # after splitting the histograms into multiple directories.
6110 # For example, in tools/metrics/ukm, pretty-print could be run using:
6111 # $ python pretty_print.py
6112 # But in tools/metrics/histogrmas, pretty-print should be run with an
6113 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006114 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006115 # $ python pretty_print.py enums.xml
6116
Alexei Svitkined40cda52023-08-29 21:24:41 +00006117 if xml_dir == os.path.join('tools', 'metrics', 'histograms'):
6118 if os.path.basename(diff_xml) not in ('histograms.xml', 'enums.xml',
6119 'histogram_suffixes_list.xml'):
6120 # Skip this XML file if it's not one of the known types.
6121 continue
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006122 cmd.append(diff_xml)
6123
Ilya Shermane081cbe2017-08-15 17:51:04 -07006124 if opts.dry_run or opts.diff:
6125 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006126
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006127 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6128 # `shell` param and instead replace `'vpython'` with
6129 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006130 stdout = RunCommand(cmd,
6131 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006132 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006133 if opts.diff:
6134 sys.stdout.write(stdout)
6135 if opts.dry_run and stdout:
6136 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006137
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006138 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006139
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006140
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006141def GetDiffXMLs(diff_files):
6142 return [
6143 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6144 ]
6145
6146
6147def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006148 metrics_xml_dirs = [
6149 os.path.join('tools', 'metrics', 'actions'),
6150 os.path.join('tools', 'metrics', 'histograms'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006151 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006152 os.path.join('tools', 'metrics', 'ukm'),
6153 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006154 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006155 if diff_xml.startswith(xml_dir):
6156 return xml_dir
6157 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006158
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006159
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006160@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006161@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006162def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006163 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006164 _, args = parser.parse_args(args)
6165
6166 if len(args) != 1:
6167 parser.print_help()
6168 return 1
6169
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006170 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006171 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006172 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006173
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006174 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006175
Edward Lemur52969c92020-02-06 18:15:28 +00006176 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006177 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006178 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006179
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006180 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006181 for key, issue in [x.split() for x in output.splitlines()]:
6182 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006183 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006184
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006185 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006186 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006187 return 1
6188 if len(branches) == 1:
6189 RunGit(['checkout', branches[0]])
6190 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006191 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006192 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006193 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006194 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006195 try:
6196 RunGit(['checkout', branches[int(which)]])
6197 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006198 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006199 return 1
6200
6201 return 0
6202
6203
maruel@chromium.org29404b52014-09-08 22:58:00 +00006204def CMDlol(parser, args):
6205 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006206 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006207 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6208 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6209 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006210 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006211 return 0
6212
6213
Josip Sokcevic0399e172022-03-21 23:11:51 +00006214def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006215 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006216 print(utils.depot_tools_version())
6217
6218
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006219class OptionParser(optparse.OptionParser):
6220 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006221
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006222 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006223 optparse.OptionParser.__init__(
6224 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006225 self.add_option(
6226 '-v', '--verbose', action='count', default=0,
6227 help='Use 2 times for more debugging info')
6228
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006229 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006230 try:
6231 return self._parse_args(args)
6232 finally:
6233 # Regardless of success or failure of args parsing, we want to report
6234 # metrics, but only after logging has been initialized (if parsing
6235 # succeeded).
6236 global settings
6237 settings = Settings()
6238
Edward Lesmes9c349062021-05-06 20:02:39 +00006239 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006240 try:
6241 # GetViewVCUrl ultimately calls logging method.
6242 project_url = settings.GetViewVCUrl().strip('/+')
6243 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6244 metrics.collector.add('project_urls', [project_url])
6245 except subprocess2.CalledProcessError:
6246 # Occurs when command is not executed in a git repository
6247 # We should not fail here. If the command needs to be executed
6248 # in a repo, it will be raised later.
6249 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006250
6251 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006252 # Create an optparse.Values object that will store only the actual passed
6253 # options, without the defaults.
6254 actual_options = optparse.Values()
6255 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6256 # Create an optparse.Values object with the default options.
6257 options = optparse.Values(self.get_default_values().__dict__)
6258 # Update it with the options passed by the user.
6259 options._update_careful(actual_options.__dict__)
6260 # Store the options passed by the user in an _actual_options attribute.
6261 # We store only the keys, and not the values, since the values can contain
6262 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006263 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006264
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006265 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006266 logging.basicConfig(
6267 level=levels[min(options.verbose, len(levels) - 1)],
6268 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6269 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006270
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006271 return options, args
6272
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006273
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006274def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006275 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006276 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006277 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006278 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006279
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006280 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006281 dispatcher = subcommand.CommandDispatcher(__name__)
6282 try:
6283 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006284 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006285 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006286 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006287 if e.code != 500:
6288 raise
6289 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006290 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006291 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006292 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006293
6294
6295if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006296 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6297 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006298 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006299 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006300 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006301 sys.exit(main(sys.argv[1:]))