blob: 0f0b36417f55be8d6242f181ad1830957102441e [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Josip Sokcevic512fd3b2023-03-01 21:06:41 +000058from lib import utils
Edward Lemur79d4f992019-11-11 23:49:02 +000059from third_party import six
60from six.moves import urllib
61
62
63if sys.version_info.major == 3:
64 basestring = (str,) # pylint: disable=redefined-builtin
65
Edward Lemurb9830242019-10-30 22:19:20 +000066
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
Edward Lemur0f58ae42019-04-30 17:24:12 +000069# Traces for git push will be stored in a traces directory inside the
70# depot_tools checkout.
71DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
72TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000073PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000074
75# When collecting traces, Git hashes will be reduced to 6 characters to reduce
76# the size after compression.
77GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
78# Used to redact the cookies from the gitcookies file.
79GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
80
Edward Lemurd4d1ba42019-09-20 21:46:37 +000081MAX_ATTEMPTS = 3
82
Edward Lemur1b52d872019-05-09 21:12:12 +000083# The maximum number of traces we will keep. Multiplied by 3 since we store
84# 3 files per trace.
85MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000086# Message to be displayed to the user to inform where to find the traces for a
87# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000088TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000089'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000091' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000092'Copies of your gitcookies file and git config have been recorded at:\n'
93' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000094# Format of the message to be stored as part of the traces to give developers a
95# better context when they go through traces.
96TRACES_README_FORMAT = (
97'Date: %(now)s\n'
98'\n'
99'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
100'Title: %(title)s\n'
101'\n'
102'%(description)s\n'
103'\n'
104'Execution time: %(execution_time)s\n'
105'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000106
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800107POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000108DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000109REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000110 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
111 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000112}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000114DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
115DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
116
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000117DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
118
thestig@chromium.org44202a22014-03-11 19:22:18 +0000119# Valid extensions for files we want to lint.
120DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
121DEFAULT_LINT_IGNORE_REGEX = r"$^"
122
Aiden Bennerc08566e2018-10-03 17:52:42 +0000123# File name for yapf style config files.
124YAPF_CONFIG_FILENAME = '.style.yapf'
125
Edward Lesmes50da7702020-03-30 19:23:43 +0000126# The issue, patchset and codereview server are stored on git config for each
127# branch under branch.<branch-name>.<config-key>.
128ISSUE_CONFIG_KEY = 'gerritissue'
129PATCHSET_CONFIG_KEY = 'gerritpatchset'
130CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000131# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
132# you make to Gerrit. Instead, it creates a new commit object that contains all
133# changes you've made, diffed against a parent/merge base.
134# This is the hash of the new squashed commit and you can find this on Gerrit.
135GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
136# This is the latest uploaded local commit hash.
137LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000138
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000139# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000140Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000141
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000142# Initialized in main()
143settings = None
144
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100145# Used by tests/git_cl_test.py to add extra logging.
146# Inside the weirdly failing test, add this:
147# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700148# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100149_IS_BEING_TESTED = False
150
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000151_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000152
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000153_KNOWN_GERRIT_TO_SHORT_URLS = {
154 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
155 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
156}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000157assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
158 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000159
160
Joanna Wang18de1f62023-01-21 01:24:24 +0000161# Maximum number of branches in a stack that can be traversed and uploaded
162# at once. Picked arbitrarily.
163_MAX_STACKED_BRANCHES_UPLOAD = 20
164
165
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000166class GitPushError(Exception):
167 pass
168
169
Christopher Lamf732cd52017-01-24 12:40:11 +1100170def DieWithError(message, change_desc=None):
171 if change_desc:
172 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000173 print('\n ** Content of CL description **\n' +
174 '='*72 + '\n' +
175 change_desc.description + '\n' +
176 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100177
vapiera7fbd5a2016-06-16 09:17:49 -0700178 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 sys.exit(1)
180
181
Christopher Lamf732cd52017-01-24 12:40:11 +1100182def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000183 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000184 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000185 with open(backup_path, 'wb') as backup_file:
186 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100187
188
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000189def GetNoGitPagerEnv():
190 env = os.environ.copy()
191 # 'cat' is a magical git string that disables pagers on all platforms.
192 env['GIT_PAGER'] = 'cat'
193 return env
194
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000195
bsep@chromium.org627d9002016-04-29 00:00:52 +0000196def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000198 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
199 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000200 except subprocess2.CalledProcessError as e:
201 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000202 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000203 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
204 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000205 out = e.stdout.decode('utf-8', 'replace')
206 if e.stderr:
207 out += e.stderr.decode('utf-8', 'replace')
208 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000209
210
211def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000212 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000213 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000214
215
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000216def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000217 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700218 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000219 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700220 else:
221 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000222 try:
tandrii5d48c322016-08-18 16:19:37 -0700223 (out, _), code = subprocess2.communicate(['git'] + args,
224 env=GetNoGitPagerEnv(),
225 stdout=subprocess2.PIPE,
226 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000227 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700228 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900229 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000230 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000231
232
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000233def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000234 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000235 return RunGitWithCode(args, suppress_stderr=True)[1]
236
237
tandrii2a16b952016-10-19 07:09:44 -0700238def time_sleep(seconds):
239 # Use this so that it can be mocked in tests without interfering with python
240 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700241 return time.sleep(seconds)
242
243
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000244def time_time():
245 # Use this so that it can be mocked in tests without interfering with python
246 # system machinery.
247 return time.time()
248
249
Edward Lemur1b52d872019-05-09 21:12:12 +0000250def datetime_now():
251 # Use this so that it can be mocked in tests without interfering with python
252 # system machinery.
253 return datetime.datetime.now()
254
255
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256def confirm_or_exit(prefix='', action='confirm'):
257 """Asks user to press enter to continue or press Ctrl+C to abort."""
258 if not prefix or prefix.endswith('\n'):
259 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100260 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100261 mid = ' Press'
262 elif prefix.endswith(' '):
263 mid = 'press'
264 else:
265 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000266 gclient_utils.AskForData(
267 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100268
269
270def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000271 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000272 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100273 while True:
274 if 'yes'.startswith(result):
275 return True
276 if 'no'.startswith(result):
277 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000278 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100279
280
machenbach@chromium.org45453142015-09-15 08:45:22 +0000281def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000282 prop_list = getattr(options, 'properties', [])
283 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000284 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285 try:
286 properties[key] = json.loads(val)
287 except ValueError:
288 pass # If a value couldn't be evaluated, treat it as a string.
289 return properties
290
291
Edward Lemur4c707a22019-09-24 21:13:43 +0000292def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000293 """Calls a buildbucket v2 method and returns the parsed json response."""
294 headers = {
295 'Accept': 'application/json',
296 'Content-Type': 'application/json',
297 }
298 request = json.dumps(request)
299 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
300
301 logging.info('POST %s with %s' % (url, request))
302
303 attempts = 1
304 time_to_sleep = 1
305 while True:
306 response, content = http.request(url, 'POST', body=request, headers=headers)
307 if response.status == 200:
308 return json.loads(content[4:])
309 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
310 msg = '%s error when calling POST %s with %s: %s' % (
311 response.status, url, request, content)
312 raise BuildbucketResponseException(msg)
313 logging.debug(
314 '%s error when calling POST %s with %s. '
315 'Sleeping for %d seconds and retrying...' % (
316 response.status, url, request, time_to_sleep))
317 time.sleep(time_to_sleep)
318 time_to_sleep *= 2
319 attempts += 1
320
321 assert False, 'unreachable'
322
323
Edward Lemur6215c792019-10-03 21:59:05 +0000324def _parse_bucket(raw_bucket):
325 legacy = True
326 project = bucket = None
327 if '/' in raw_bucket:
328 legacy = False
329 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000331 elif raw_bucket.startswith('luci.'):
332 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000334 elif '.' in raw_bucket:
335 project = raw_bucket.split('.')[0]
336 bucket = raw_bucket
337 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000338 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000339 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
340 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000341
342
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000343def _canonical_git_googlesource_host(host):
344 """Normalizes Gerrit hosts (with '-review') to Git host."""
345 assert host.endswith(_GOOGLESOURCE)
346 # Prefix doesn't include '.' at the end.
347 prefix = host[:-(1 + len(_GOOGLESOURCE))]
348 if prefix.endswith('-review'):
349 prefix = prefix[:-len('-review')]
350 return prefix + '.' + _GOOGLESOURCE
351
352
353def _canonical_gerrit_googlesource_host(host):
354 git_host = _canonical_git_googlesource_host(host)
355 prefix = git_host.split('.', 1)[0]
356 return prefix + '-review.' + _GOOGLESOURCE
357
358
359def _get_counterpart_host(host):
360 assert host.endswith(_GOOGLESOURCE)
361 git = _canonical_git_googlesource_host(host)
362 gerrit = _canonical_gerrit_googlesource_host(git)
363 return git if gerrit == host else gerrit
364
365
Quinten Yearsley777660f2020-03-04 23:37:06 +0000366def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700368
369 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000370 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000371 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700372 options: Command-line options.
373 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000374 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000375 for project, bucket, builder in jobs:
376 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377 print('To see results here, run: git cl try-results')
378 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700379
Quinten Yearsley777660f2020-03-04 23:37:06 +0000380 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000381 if not requests:
382 return
383
Edward Lemur5b929a42019-10-21 17:57:39 +0000384 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 http.force_exception_to_status_code = True
386
387 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000388 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
389 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000390
391 errors = [
392 ' ' + response['error']['message']
393 for response in batch_response.get('responses', [])
394 if 'error' in response
395 ]
396 if errors:
397 raise BuildbucketResponseException(
398 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
399
400
Quinten Yearsley777660f2020-03-04 23:37:06 +0000401def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000402 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000403 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000404 shared_properties = {
405 'category': options.ensure_value('category', 'git_cl_try')
406 }
407 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000408 shared_properties['clobber'] = True
409 shared_properties.update(_get_properties_from_options(options) or {})
410
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000411 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000412 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000413 shared_tags.append({'key': 'retry_failed',
414 'value': '1'})
415
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000416 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000417 for (project, bucket, builder) in jobs:
418 properties = shared_properties.copy()
419 if 'presubmit' in builder.lower():
420 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000421
Edward Lemur45768512020-03-02 19:03:14 +0000422 requests.append({
423 'scheduleBuild': {
424 'requestId': str(uuid.uuid4()),
425 'builder': {
426 'project': getattr(options, 'project', None) or project,
427 'bucket': bucket,
428 'builder': builder,
429 },
430 'gerritChanges': gerrit_changes,
431 'properties': properties,
432 'tags': [
433 {'key': 'builder', 'value': builder},
434 ] + shared_tags,
435 }
436 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000437
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000438 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000439 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000440 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000441 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000442 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 'id': options.revision,
444 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000446
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000447 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000448
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000449
Quinten Yearsley777660f2020-03-04 23:37:06 +0000450def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000451 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000452
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000453 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000454 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000455 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000456 request = {
457 'predicate': {
458 'gerritChanges': [changelist.GetGerritChange(patchset)],
459 },
460 'fields': ','.join('builds.*.' + field for field in fields),
461 }
tandrii221ab252016-10-06 08:12:04 -0700462
Edward Lemur5b929a42019-10-21 17:57:39 +0000463 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000464 if authenticator.has_cached_credentials():
465 http = authenticator.authorize(httplib2.Http())
466 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700467 print('Warning: Some results might be missing because %s' %
468 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000469 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000470 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000471 http.force_exception_to_status_code = True
472
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000473 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
474 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475
Edward Lemur45768512020-03-02 19:03:14 +0000476
Edward Lemur5b929a42019-10-21 17:57:39 +0000477def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000478 """Fetches builds from the latest patchset that has builds (within
479 the last few patchsets).
480
481 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 changelist (Changelist): The CL to fetch builds for
483 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000484 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
485 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000487 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
488 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 """
490 assert buildbucket_host
491 assert changelist.GetIssue(), 'CL must be uploaded first'
492 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000493 if latest_patchset is None:
494 assert changelist.GetMostRecentPatchset()
495 ps = changelist.GetMostRecentPatchset()
496 else:
497 assert latest_patchset > 0, latest_patchset
498 ps = latest_patchset
499
Quinten Yearsley983111f2019-09-26 17:18:48 +0000500 min_ps = max(1, ps - 5)
501 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000502 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000503 if len(builds):
504 return builds, ps
505 ps -= 1
506 return [], 0
507
508
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000509def _filter_failed_for_retry(all_builds):
510 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000511
512 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000513 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000514 i.e. a list of buildbucket.v2.Builds which includes status and builder
515 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000516
517 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000518 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000519 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520 """
Edward Lemur45768512020-03-02 19:03:14 +0000521 grouped = {}
522 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000523 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000524 key = (builder['project'], builder['bucket'], builder['builder'])
525 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000526
Edward Lemur45768512020-03-02 19:03:14 +0000527 jobs = []
528 for (project, bucket, builder), builds in grouped.items():
529 if 'triggered' in builder:
530 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
531 'from a parent. Please schedule a manual job for the parent '
532 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000533 continue
534 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
535 # Don't retry if any are running.
536 continue
Edward Lemur45768512020-03-02 19:03:14 +0000537 # If builder had several builds, retry only if the last one failed.
538 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
539 # build, but in case of retrying failed jobs retrying a flaky one makes
540 # sense.
541 builds = sorted(builds, key=lambda b: b['createTime'])
542 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
543 continue
544 # Don't retry experimental build previously triggered by CQ.
545 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
546 for t in builds[-1]['tags']):
547 continue
548 jobs.append((project, bucket, builder))
549
550 # Sort the jobs to make testing easier.
551 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000552
553
Quinten Yearsley777660f2020-03-04 23:37:06 +0000554def _print_tryjobs(options, builds):
555 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000557 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 return
559
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000560 longest_builder = max(len(b['builder']['builder']) for b in builds)
561 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
564 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 builds_by_status = {}
567 for b in builds:
568 builds_by_status.setdefault(b['status'], []).append({
569 'id': b['id'],
570 'name': name_fmt.format(
571 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
572 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000574 sort_key = lambda b: (b['name'], b['id'])
575
576 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 if not builds:
579 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000581 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000582 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000583 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584 else:
585 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
586
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 print(colorize(title))
588 for b in sorted(builds, key=sort_key):
589 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590
591 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 print_builds(
593 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
594 print_builds(
595 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
596 color=Fore.MAGENTA)
597 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
598 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
599 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000600 print_builds('Started:', builds_by_status.pop('STARTED', []),
601 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print_builds(
603 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000604 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 print_builds(
606 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000607 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608
609
Aiden Bennerc08566e2018-10-03 17:52:42 +0000610def _ComputeDiffLineRanges(files, upstream_commit):
611 """Gets the changed line ranges for each file since upstream_commit.
612
613 Parses a git diff on provided files and returns a dict that maps a file name
614 to an ordered list of range tuples in the form (start_line, count).
615 Ranges are in the same format as a git diff.
616 """
617 # If files is empty then diff_output will be a full diff.
618 if len(files) == 0:
619 return {}
620
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000621 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000622 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 diff_output = RunGit(diff_cmd)
624
625 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
626 # 2 capture groups
627 # 0 == fname of diff file
628 # 1 == 'diff_start,diff_count' or 'diff_start'
629 # will match each of
630 # diff --git a/foo.foo b/foo.py
631 # @@ -12,2 +14,3 @@
632 # @@ -12,2 +17 @@
633 # running re.findall on the above string with pattern will give
634 # [('foo.py', ''), ('', '14,3'), ('', '17')]
635
636 curr_file = None
637 line_diffs = {}
638 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
639 if match[0] != '':
640 # Will match the second filename in diff --git a/a.py b/b.py.
641 curr_file = match[0]
642 line_diffs[curr_file] = []
643 else:
644 # Matches +14,3
645 if ',' in match[1]:
646 diff_start, diff_count = match[1].split(',')
647 else:
648 # Single line changes are of the form +12 instead of +12,1.
649 diff_start = match[1]
650 diff_count = 1
651
652 diff_start = int(diff_start)
653 diff_count = int(diff_count)
654
655 # If diff_count == 0 this is a removal we can ignore.
656 line_diffs[curr_file].append((diff_start, diff_count))
657
658 return line_diffs
659
660
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000661def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000662 """Checks if a yapf file is in any parent directory of fpath until top_dir.
663
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000664 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000665 is found returns None. Uses yapf_config_cache as a cache for previously found
666 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000667 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000669 # Return result if we've already computed it.
670 if fpath in yapf_config_cache:
671 return yapf_config_cache[fpath]
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673 parent_dir = os.path.dirname(fpath)
674 if os.path.isfile(fpath):
675 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 # Otherwise fpath is a directory
678 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
679 if os.path.isfile(yapf_file):
680 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000681 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000682 # If we're at the top level directory, or if we're at root
683 # there is no provided style.
684 ret = None
685 else:
686 # Otherwise recurse on the current directory.
687 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 yapf_config_cache[fpath] = ret
689 return ret
690
691
Brian Sheedyb4307d52019-12-02 19:18:17 +0000692def _GetYapfIgnorePatterns(top_dir):
693 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000694
695 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
696 but this functionality appears to break when explicitly passing files to
697 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000698 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000699 the .yapfignore file should be in the directory that yapf is invoked from,
700 which we assume to be the top level directory in this case.
701
702 Args:
703 top_dir: The top level directory for the repository being formatted.
704
705 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000707 """
708 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000709 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000710 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000711 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000712
Anthony Politoc64e3902021-04-30 21:55:25 +0000713 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
714 stripped_line = line.strip()
715 # Comments and blank lines should be ignored.
716 if stripped_line.startswith('#') or stripped_line == '':
717 continue
718 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000719 return ignore_patterns
720
721
722def _FilterYapfIgnoredFiles(filepaths, patterns):
723 """Filters out any filepaths that match any of the given patterns.
724
725 Args:
726 filepaths: An iterable of strings containing filepaths to filter.
727 patterns: An iterable of strings containing fnmatch patterns to filter on.
728
729 Returns:
730 A list of strings containing all the elements of |filepaths| that did not
731 match any of the patterns in |patterns|.
732 """
733 # Not inlined so that tests can use the same implementation.
734 return [f for f in filepaths
735 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000736
737
Aaron Gable13101a62018-02-09 13:20:41 -0800738def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000739 """Prints statistics about the change to the user."""
740 # --no-ext-diff is broken in some versions of Git, so try to work around
741 # this by overriding the environment (but there is still a problem if the
742 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000743 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000744 if 'GIT_EXTERNAL_DIFF' in env:
745 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000747 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800748 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000749 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750
751
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000752class BuildbucketResponseException(Exception):
753 pass
754
755
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756class Settings(object):
757 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000759 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000760 self.tree_status_url = None
761 self.viewvc_url = None
762 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000763 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000764 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000765 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000766 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000767 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000768 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769
Edward Lemur26964072020-02-19 19:18:51 +0000770 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000772 if self.updated:
773 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000774
Edward Lemur26964072020-02-19 19:18:51 +0000775 # The only value that actually changes the behavior is
776 # autoupdate = "false". Everything else means "true".
777 autoupdate = (
778 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
779
780 cr_settings_file = FindCodereviewSettingsFile()
781 if autoupdate != 'false' and cr_settings_file:
782 LoadCodereviewSettingsFromFile(cr_settings_file)
783 cr_settings_file.close()
784
785 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000786
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000787 @staticmethod
788 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000789 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000791 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000792 if self.root is None:
793 self.root = os.path.abspath(self.GetRelativeRoot())
794 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000796 def GetTreeStatusUrl(self, error_ok=False):
797 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000798 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
799 if self.tree_status_url is None and not error_ok:
800 DieWithError(
801 'You must configure your tree status URL by running '
802 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 return self.tree_status_url
804
805 def GetViewVCUrl(self):
806 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 return self.viewvc_url
809
rmistry@google.com90752582014-01-14 21:04:50 +0000810 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000811 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000812
rmistry@google.com5626a922015-02-26 14:03:30 +0000813 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000814 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000815 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000816 return run_post_upload_hook == "True"
817
Joanna Wangc8f23e22023-01-19 21:18:10 +0000818 def GetDefaultCCList(self):
819 return self._GetConfig('rietveld.cc')
820
Dirk Pranke6f0df682021-06-25 00:42:33 +0000821 def GetUsePython3(self):
822 return self._GetConfig('rietveld.use-python3')
823
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000824 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000825 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000826 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000827 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
828 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000829 # Default is squash now (http://crbug.com/611892#c23).
830 self.squash_gerrit_uploads = self._GetConfig(
831 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000832 return self.squash_gerrit_uploads
833
Edward Lesmes4de54132020-05-05 19:41:33 +0000834 def GetSquashGerritUploadsOverride(self):
835 """Return True or False if codereview.settings should be overridden.
836
837 Returns None if no override has been defined.
838 """
839 # See also http://crbug.com/611892#c23
840 result = self._GetConfig('gerrit.override-squash-uploads').lower()
841 if result == 'true':
842 return True
843 if result == 'false':
844 return False
845 return None
846
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000847 def GetIsGerrit(self):
848 """Return True if gerrit.host is set."""
849 if self.is_gerrit is None:
850 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
851 return self.is_gerrit
852
tandrii@chromium.org28253532016-04-14 13:46:56 +0000853 def GetGerritSkipEnsureAuthenticated(self):
854 """Return True if EnsureAuthenticated should not be done for Gerrit
855 uploads."""
856 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000857 self.gerrit_skip_ensure_authenticated = self._GetConfig(
858 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 return self.gerrit_skip_ensure_authenticated
860
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000861 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000862 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000863 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000864 # Git requires single quotes for paths with spaces. We need to replace
865 # them with double quotes for Windows to treat such paths as a single
866 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000867 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000868 return self.git_editor or None
869
thestig@chromium.org44202a22014-03-11 19:22:18 +0000870 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000871 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000872
873 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000874 return self._GetConfig(
875 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000877 def GetFormatFullByDefault(self):
878 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000879 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000880 result = (
881 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
882 error_ok=True).strip())
883 self.format_full_by_default = (result == 'true')
884 return self.format_full_by_default
885
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000886 def IsStatusCommitOrderByDate(self):
887 if self.is_status_commit_order_by_date is None:
888 result = (RunGit(['config', '--bool', 'cl.date-order'],
889 error_ok=True).strip())
890 self.is_status_commit_order_by_date = (result == 'true')
891 return self.is_status_commit_order_by_date
892
Edward Lemur26964072020-02-19 19:18:51 +0000893 def _GetConfig(self, key, default=''):
894 self._LazyUpdateIfNeeded()
895 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000896
897
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000898class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000899 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000900 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000901 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000902 DRY_RUN = 'dry_run'
903 COMMIT = 'commit'
904
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000905 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906
907
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000908class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000909 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000910 self.issue = issue
911 self.patchset = patchset
912 self.hostname = hostname
913
914 @property
915 def valid(self):
916 return self.issue is not None
917
918
Edward Lemurf38bc172019-09-03 21:02:13 +0000919def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
921 fail_result = _ParsedIssueNumberArgument()
922
Edward Lemur678a6842019-10-03 22:25:05 +0000923 if isinstance(arg, int):
924 return _ParsedIssueNumberArgument(issue=arg)
925 if not isinstance(arg, basestring):
926 return fail_result
927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000929 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700930
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000932 if not url.startswith('http'):
933 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000934 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
935 if url.startswith(short_url):
936 url = gerrit_url + url[len(short_url):]
937 break
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000940 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000941 except ValueError:
942 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200943
Alex Turner30ae6372022-01-04 02:32:52 +0000944 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
945 # URL.
946 if not arg.startswith('http') and '.' not in parsed_url.netloc:
947 return fail_result
948
Edward Lemur678a6842019-10-03 22:25:05 +0000949 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
950 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
951 # Short urls like https://domain/<issue_number> can be used, but don't allow
952 # specifying the patchset (you'd 404), but we allow that here.
953 if parsed_url.path == '/':
954 part = parsed_url.fragment
955 else:
956 part = parsed_url.path
957
958 match = re.match(
959 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
960 if not match:
961 return fail_result
962
963 issue = int(match.group('issue'))
964 patchset = match.group('patchset')
965 return _ParsedIssueNumberArgument(
966 issue=issue,
967 patchset=int(patchset) if patchset else None,
968 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000969
970
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000971def _create_description_from_log(args):
972 """Pulls out the commit log to use as a base for the CL description."""
973 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000974 if len(args) == 1 and args[0] == None:
975 # Handle the case where None is passed as the branch.
976 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000977 if len(args) == 1 and not args[0].endswith('.'):
978 log_args = [args[0] + '..']
979 elif len(args) == 1 and args[0].endswith('...'):
980 log_args = [args[0][:-1]]
981 elif len(args) == 2:
982 log_args = [args[0] + '..' + args[1]]
983 else:
984 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000985 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000986
987
Aaron Gablea45ee112016-11-22 15:14:38 -0800988class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700989 def __init__(self, issue, url):
990 self.issue = issue
991 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800992 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700993
994 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800995 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700996 self.issue, self.url)
997
998
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100999_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001000 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001001 # TODO(tandrii): these two aren't known in Gerrit.
1002 'approval', 'disapproval'])
1003
1004
Joanna Wang6215dd02023-02-07 15:58:03 +00001005# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001006_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001007 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wange8523912023-01-21 02:05:40 +00001008 'change_desc'
1009])
1010
1011
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013 """Changelist works with one changelist in local branch.
1014
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001015 Notes:
1016 * Not safe for concurrent multi-{thread,process} use.
1017 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001018 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """
1020
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001021 def __init__(self,
1022 branchref=None,
1023 issue=None,
1024 codereview_host=None,
1025 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001026 """Create a new ChangeList instance.
1027
Edward Lemurf38bc172019-09-03 21:02:13 +00001028 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001029 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001031 global settings
1032 if not settings:
1033 # Happens when git_cl.py is used as a utility library.
1034 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001035
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.branchref = branchref
1037 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001038 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001039 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 else:
1041 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001042 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001044 self.lookedup_issue = False
1045 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001047 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001049 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001051 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001052 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001053
Edward Lemur125d60a2019-09-13 18:25:41 +00001054 # Lazily cached values.
1055 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1056 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001057 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001058 # Map from change number (issue) to its detail cache.
1059 self._detail_cache = {}
1060
1061 if codereview_host is not None:
1062 assert not codereview_host.startswith('https://'), codereview_host
1063 self._gerrit_host = codereview_host
1064 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065
Edward Lesmese1576912021-02-16 21:53:34 +00001066 @property
1067 def owners_client(self):
1068 if self._owners_client is None:
1069 remote, remote_branch = self.GetRemoteBranch()
1070 branch = GetTargetRef(remote, remote_branch, None)
1071 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001072 host=self.GetGerritHost(),
1073 project=self.GetGerritProject(),
1074 branch=branch)
1075 return self._owners_client
1076
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001078 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001079
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001080 The return value is a string suitable for passing to git cl with the --cc
1081 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001082 """
1083 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001084 base_cc = settings.GetDefaultCCList()
1085 more_cc = ','.join(self.more_cc)
1086 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001087 return self.cc
1088
Daniel Cheng7227d212017-11-17 08:12:37 -08001089 def ExtendCC(self, more_cc):
1090 """Extends the list of users to cc on this CL based on the changed files."""
1091 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001093 def GetCommitDate(self):
1094 """Returns the commit date as provided in the constructor"""
1095 return self.commit_date
1096
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001098 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001100 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001101 if not branchref:
1102 return None
1103 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001104 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 return self.branch
1106
1107 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001108 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 self.GetBranch() # Poke the lazy loader.
1110 return self.branchref
1111
Edward Lemur85153282020-02-14 22:06:29 +00001112 def _GitGetBranchConfigValue(self, key, default=None):
1113 return scm.GIT.GetBranchConfig(
1114 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001115
Edward Lemur85153282020-02-14 22:06:29 +00001116 def _GitSetBranchConfigValue(self, key, value):
1117 action = 'set %s to %r' % (key, value)
1118 if not value:
1119 action = 'unset %s' % key
1120 assert self.GetBranch(), 'a branch is needed to ' + action
1121 return scm.GIT.SetBranchConfig(
1122 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 @staticmethod
1125 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001126 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001127 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001129 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1130 settings.GetRoot(), branch)
1131 if not remote or not upstream_branch:
1132 DieWithError(
1133 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001134 'Verify this branch is set up to track another \n'
1135 '(via the --track argument to "git checkout -b ..."). \n'
1136 'or pass complete "git diff"-style arguments if supported, like\n'
1137 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138
1139 return remote, upstream_branch
1140
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001141 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001142 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001143 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001144 DieWithError('The upstream for the current branch (%s) does not exist '
1145 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001146 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001147 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 def GetUpstreamBranch(self):
1150 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001151 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001152 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001153 upstream_branch = upstream_branch.replace('refs/heads/',
1154 'refs/remotes/%s/' % remote)
1155 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1156 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 self.upstream_branch = upstream_branch
1158 return self.upstream_branch
1159
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001160 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001161 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, branch = None, self.GetBranch()
1163 seen_branches = set()
1164 while branch not in seen_branches:
1165 seen_branches.add(branch)
1166 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001167 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 if remote != '.' or branch.startswith('refs/remotes'):
1169 break
1170 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001171 remotes = RunGit(['remote'], error_ok=True).split()
1172 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001174 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001176 logging.warning('Could not determine which remote this change is '
1177 'associated with, so defaulting to "%s".' %
1178 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 else:
Gavin Make6a62332020-12-04 21:57:10 +00001180 logging.warning('Could not determine which remote this change is '
1181 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 branch = 'HEAD'
1183 if branch.startswith('refs/remotes'):
1184 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001185 elif branch.startswith('refs/branch-heads/'):
1186 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 else:
1188 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001189 return self._remote
1190
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 def GetRemoteUrl(self):
1192 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1193
1194 Returns None if there is no remote.
1195 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001196 is_cached, value = self._cached_remote_url
1197 if is_cached:
1198 return value
1199
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001201 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001202
Edward Lemur298f2cf2019-02-22 21:40:39 +00001203 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001204 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001205 if host:
1206 self._cached_remote_url = (True, url)
1207 return url
1208
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001209 # If it cannot be parsed as an url, assume it is a local directory,
1210 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 logging.warning('"%s" doesn\'t appear to point to a git host. '
1212 'Interpreting it as a local directory.', url)
1213 if not os.path.isdir(url):
1214 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001215 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1216 'but it doesn\'t exist.',
1217 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 return None
1219
1220 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001221 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222
Edward Lemur79d4f992019-11-11 23:49:02 +00001223 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 if not host:
1225 logging.error(
1226 'Remote "%(remote)s" for branch "%(branch)s" points to '
1227 '"%(cache_path)s", but it is misconfigured.\n'
1228 '"%(cache_path)s" must be a git repo and must have a remote named '
1229 '"%(remote)s" pointing to the git host.', {
1230 'remote': remote,
1231 'cache_path': cache_path,
1232 'branch': self.GetBranch()})
1233 return None
1234
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001235 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001236 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001238 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001239 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001240 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001241 if self.GetBranch():
1242 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001243 if self.issue is not None:
1244 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 return self.issue
1247
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001248 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001250 issue = self.GetIssue()
1251 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001252 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001253 server = self.GetCodereviewServer()
1254 if short:
1255 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1256 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257
Dirk Pranke6f0df682021-06-25 00:42:33 +00001258 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001259 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001260
Edward Lemur6c6827c2020-02-06 21:15:18 +00001261 def FetchDescription(self, pretty=False):
1262 assert self.GetIssue(), 'issue is required to query Gerrit'
1263
Edward Lemur9aa1a962020-02-25 00:58:38 +00001264 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001265 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1266 current_rev = data['current_revision']
1267 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268
1269 if not pretty:
1270 return self.description
1271
1272 # Set width to 72 columns + 2 space indent.
1273 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1274 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1275 lines = self.description.splitlines()
1276 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277
1278 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001279 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001280 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001281 if self.GetBranch():
1282 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001283 if self.patchset is not None:
1284 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001285 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001286 return self.patchset
1287
Edward Lemur9aa1a962020-02-25 00:58:38 +00001288 def GetAuthor(self):
1289 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1290
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001292 """Set this branch's patchset. If patchset=0, clears the patchset."""
1293 assert self.GetBranch()
1294 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001295 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001296 else:
1297 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001298 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001300 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001301 """Set this branch's issue. If issue isn't given, clears the issue."""
1302 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001304 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001305 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001307 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001308 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001309 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001310 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311 else:
tandrii5d48c322016-08-18 16:19:37 -07001312 # Reset all of these just to be clean.
1313 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001314 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001315 ISSUE_CONFIG_KEY,
1316 PATCHSET_CONFIG_KEY,
1317 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001318 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001319 ]
tandrii5d48c322016-08-18 16:19:37 -07001320 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001321 try:
1322 self._GitSetBranchConfigValue(prop, None)
1323 except subprocess2.CalledProcessError:
1324 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001325 msg = RunGit(['log', '-1', '--format=%B']).strip()
1326 if msg and git_footers.get_footer_change_id(msg):
1327 print('WARNING: The change patched into this branch has a Change-Id. '
1328 'Removing it.')
1329 RunGit(['commit', '--amend', '-m',
1330 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001331 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001332 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001333 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001334
Joanna Wangb46232e2023-01-21 01:58:46 +00001335 def GetAffectedFiles(self, upstream, end_commit=None):
1336 # type: (str, Optional[str]) -> Sequence[str]
1337 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001338 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001339 return [
1340 f for _, f in scm.GIT.CaptureStatus(
1341 settings.GetRoot(), upstream, end_commit=end_commit)
1342 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001343 except subprocess2.CalledProcessError:
1344 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001345 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001346 'This branch probably doesn\'t exist anymore. To reset the\n'
1347 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001348 ' git branch --set-upstream-to origin/main %s\n'
1349 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001350 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001351
dsansomee2d6fd92016-09-08 00:10:47 -07001352 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001353 assert self.GetIssue(), 'issue is required to update description'
1354
1355 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001356 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001357 if not force:
1358 confirm_or_exit(
1359 'The description cannot be modified while the issue has a pending '
1360 'unpublished edit. Either publish the edit in the Gerrit web UI '
1361 'or delete it.\n\n', action='delete the unpublished edit')
1362
1363 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001364 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001366 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001367 description, notify='NONE')
1368
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001369 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001370
Edward Lemur75526302020-02-27 22:31:05 +00001371 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001372 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001373 '--root', settings.GetRoot(),
1374 '--upstream', upstream,
1375 ]
1376
1377 args.extend(['--verbose'] * verbose)
1378
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001379 remote, remote_branch = self.GetRemoteBranch()
1380 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001381 if settings.GetIsGerrit():
1382 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1383 args.extend(['--gerrit_project', self.GetGerritProject()])
1384 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001385
Edward Lemur99df04e2020-03-05 19:39:43 +00001386 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001387 issue = self.GetIssue()
1388 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001389 if author:
1390 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001391 if issue:
1392 args.extend(['--issue', str(issue)])
1393 if patchset:
1394 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001395
Edward Lemur75526302020-02-27 22:31:05 +00001396 return args
1397
Josip Sokcevic017544d2022-03-31 23:47:53 +00001398 def RunHook(self,
1399 committing,
1400 may_prompt,
1401 verbose,
1402 parallel,
1403 upstream,
1404 description,
1405 all_files,
1406 files=None,
1407 resultdb=False,
1408 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001409 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1410 args = self._GetCommonPresubmitArgs(verbose, upstream)
1411 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001412 if may_prompt:
1413 args.append('--may_prompt')
1414 if parallel:
1415 args.append('--parallel')
1416 if all_files:
1417 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001418 if files:
1419 args.extend(files.split(';'))
1420 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001421 if files or all_files:
1422 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001423
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001424 if resultdb and not realm:
1425 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1426 # it is not required to pass the realm flag
1427 print('Note: ResultDB reporting will NOT be performed because --realm'
1428 ' was not specified. To enable ResultDB, please run the command'
1429 ' again with the --realm argument to specify the LUCI realm.')
1430
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001431 py3_results = self._RunPresubmit(args,
1432 description,
1433 use_python3=True,
1434 resultdb=resultdb,
1435 realm=realm)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001436 if py3_results.get('skipped_presubmits', 1) == 0:
1437 print('No more presubmits to run - skipping Python 2 presubmits.')
1438 return py3_results
1439
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001440 py2_results = self._RunPresubmit(args,
1441 description,
1442 use_python3=False,
1443 resultdb=resultdb,
1444 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001445 return self._MergePresubmitResults(py2_results, py3_results)
1446
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001447 def _RunPresubmit(self,
1448 args,
1449 description,
1450 use_python3,
1451 resultdb=None,
1452 realm=None):
1453 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1454 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001455 args = args[:]
1456 vpython = 'vpython3' if use_python3 else 'vpython'
1457
Edward Lemur227d5102020-02-25 23:45:35 +00001458 with gclient_utils.temporary_file() as description_file:
1459 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001460 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001461 args.extend(['--json_output', json_output])
1462 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001463 if self.GetUsePython3():
1464 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001465 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001466 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001467 if resultdb and realm:
1468 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001469
1470 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001471 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001472
Edward Lemur227d5102020-02-25 23:45:35 +00001473 metrics.collector.add_repeated('sub_commands', {
1474 'command': 'presubmit',
1475 'execution_time': time_time() - start,
1476 'exit_code': exit_code,
1477 })
1478
1479 if exit_code:
1480 sys.exit(exit_code)
1481
1482 json_results = gclient_utils.FileRead(json_output)
1483 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001484
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001485 def _MergePresubmitResults(self, py2_results, py3_results):
1486 return {
1487 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1488 py3_results.get('more_cc', []))),
1489 'errors': (
1490 py2_results.get('errors', []) + py3_results.get('errors', [])),
1491 'notifications': (
1492 py2_results.get('notifications', []) +
1493 py3_results.get('notifications', [])),
1494 'warnings': (
1495 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1496 }
1497
Brian Sheedy7326ca22022-11-02 18:36:17 +00001498 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001499 args = self._GetCommonPresubmitArgs(verbose, upstream)
1500 args.append('--post_upload')
1501
1502 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001503 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001504 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001505 if not py3_only:
1506 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001507 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1508 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001509 if not py3_only:
1510 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001511 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001512
Edward Lemur5a644f82020-03-18 16:44:57 +00001513 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001514 # type: (optparse.Values, Sequence[str], Sequence[str]
1515 # ) -> ChangeDescription
1516 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001517 if self.GetIssue():
1518 description = self.FetchDescription()
1519 elif options.message:
1520 description = options.message
1521 else:
1522 description = _create_description_from_log(git_diff_args)
1523 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001524 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001525
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 bug = options.bug
1527 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001528 if not self.GetIssue():
1529 # Extract bug number from branch name, but only if issue is being created.
1530 # It must start with bug or fix, followed by _ or - and number.
1531 # Optionally, it may contain _ or - after number with arbitrary text.
1532 # Examples:
1533 # bug-123
1534 # bug_123
1535 # fix-123
1536 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001537 branch = self.GetBranch()
1538 if branch is not None:
1539 match = re.match(
1540 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1541 if not bug and not fixed and match:
1542 if match.group('type') == 'bug':
1543 bug = match.group('bugnum')
1544 else:
1545 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001546
1547 change_description = ChangeDescription(description, bug, fixed)
1548
Joanna Wang39811b12023-01-20 23:09:48 +00001549 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001550 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001551 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001552 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001553 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001554 missing_files = [
1555 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001556 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001557 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001558 owners = self.owners_client.SuggestOwners(
1559 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001560 assert isinstance(options.reviewers, list), options.reviewers
1561 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562
Edward Lemur5a644f82020-03-18 16:44:57 +00001563 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001564 if options.reviewers:
1565 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001566
1567 return change_description
1568
Joanna Wanga1abbed2023-01-24 01:41:05 +00001569 def _GetTitleForUpload(self, options, multi_change_upload=False):
1570 # type: (optparse.Values, Optional[bool]) -> str
1571
1572 # Getting titles for multipl commits is not supported so we return the
1573 # default.
1574 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001575 return options.title
1576
1577 # On first upload, patchset title is always this string, while options.title
1578 # gets converted to first line of message.
1579 if not self.GetIssue():
1580 return 'Initial upload'
1581
1582 # When uploading subsequent patchsets, options.message is taken as the title
1583 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001584 if options.message:
1585 return options.message.strip()
1586
1587 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001588 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001589 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001590 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001591 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001592
1593 # Use the default title if the user confirms the default with a 'y'.
1594 if user_title.lower() == 'y':
1595 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001596 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001597
Joanna Wang562481d2023-01-26 21:57:14 +00001598 def _GetRefSpecOptions(self,
1599 options,
1600 change_desc,
1601 multi_change_upload=False,
1602 dogfood_path=False):
1603 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1604 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001605
1606 # Extra options that can be specified at push time. Doc:
1607 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1608 refspec_opts = []
1609
1610 # By default, new changes are started in WIP mode, and subsequent patchsets
1611 # don't send email. At any time, passing --send-mail or --send-email will
1612 # mark the change ready and send email for that particular patch.
1613 if options.send_mail:
1614 refspec_opts.append('ready')
1615 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001616 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001617 refspec_opts.append('wip')
1618 else:
1619 refspec_opts.append('notify=NONE')
1620
1621 # TODO(tandrii): options.message should be posted as a comment if
1622 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1623 # to do it.
1624
1625 # Set options.title in case user was prompted in _GetTitleForUpload and
1626 # _CMDUploadChange needs to be called again.
1627 options.title = self._GetTitleForUpload(
1628 options, multi_change_upload=multi_change_upload)
1629
1630 if options.title:
1631 # Punctuation and whitespace in |title| must be percent-encoded.
1632 refspec_opts.append('m=' +
1633 gerrit_util.PercentEncodeForGitRef(options.title))
1634
1635 if options.private:
1636 refspec_opts.append('private')
1637
1638 if options.topic:
1639 # Documentation on Gerrit topics is here:
1640 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1641 refspec_opts.append('topic=%s' % options.topic)
1642
1643 if options.enable_auto_submit:
1644 refspec_opts.append('l=Auto-Submit+1')
1645 if options.set_bot_commit:
1646 refspec_opts.append('l=Bot-Commit+1')
1647 if options.use_commit_queue:
1648 refspec_opts.append('l=Commit-Queue+2')
1649 elif options.cq_dry_run:
1650 refspec_opts.append('l=Commit-Queue+1')
1651 elif options.cq_quick_run:
1652 refspec_opts.append('l=Commit-Queue+1')
1653 refspec_opts.append('l=Quick-Run+1')
1654
1655 if change_desc.get_reviewers(tbr_only=True):
1656 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1657 self.GetGerritProject())
1658 refspec_opts.append('l=Code-Review+%s' % score)
1659
Joanna Wang40497912023-01-24 21:18:16 +00001660 # Gerrit sorts hashtags, so order is not important.
1661 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1662 # We check GetIssue because we only add hashtags from the
1663 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001664 # TODO(b/265929888): When we fully launch the new path:
1665 # 1) remove fetching hashtags from description alltogether
1666 # 2) Or use descrtiption hashtags for:
1667 # `not (self.GetIssue() and multi_change_upload)`
1668 # 3) Or enabled change description tags for multi and single changes
1669 # by adding them post `git push`.
1670 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001671 hashtags.update(change_desc.get_hash_tags())
1672 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001673
1674 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001675 # branch/change.
1676 return refspec_opts
1677
Joanna Wang6215dd02023-02-07 15:58:03 +00001678 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1679 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001680 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001681
1682 if end_commit is None:
1683 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1684
1685 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1686 end_commit)
1687 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1688 with gclient_utils.temporary_file() as desc_tempfile:
1689 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1690 commit_to_push = RunGit(
1691 ['commit-tree', latest_tree, '-p', parent, '-F',
1692 desc_tempfile]).strip()
1693
Joanna Wang40497912023-01-24 21:18:16 +00001694 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
1695 change_desc)
Joanna Wangb88a4342023-01-24 01:28:22 +00001696
Joanna Wang6215dd02023-02-07 15:58:03 +00001697 def PrepareCherryPickSquashedCommit(self, options, parent):
1698 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001699 """Create a commit cherry-picked on parent to push."""
1700
Joanna Wang6215dd02023-02-07 15:58:03 +00001701 # The `parent` is what we will cherry-pick on top of.
1702 # The `cherry_pick_base` is the beginning range of what
1703 # we are cherry-picking.
1704 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1705 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001706 self.branchref)
1707
1708 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1709 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1710 with gclient_utils.temporary_file() as desc_tempfile:
1711 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001712 commit_to_cp = RunGit([
1713 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1714 desc_tempfile
1715 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001716
Joanna Wang6215dd02023-02-07 15:58:03 +00001717 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001718 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1719 if ret:
1720 RunGit(['cherry-pick', '--abort'])
1721 RunGit(['checkout', '-q', self.branch])
1722 DieWithError('Could not cleanly cherry-pick')
1723
Joanna Wang6215dd02023-02-07 15:58:03 +00001724 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001725 RunGit(['checkout', '-q', self.branch])
1726
Joanna Wang6215dd02023-02-07 15:58:03 +00001727 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
1728 cherry_pick_base, change_desc)
Joanna Wange8523912023-01-21 02:05:40 +00001729
Joanna Wangb46232e2023-01-21 01:58:46 +00001730 def _PrepareChange(self, options, parent, end_commit):
1731 # type: (optparse.Values, str, str) ->
1732 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1733 """Prepares the change to be uploaded."""
1734 self.EnsureCanUploadPatchset(options.force)
1735
1736 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1737 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1738 files)
1739
1740 watchlist = watchlists.Watchlists(settings.GetRoot())
1741 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1742 if not options.bypass_hooks:
1743 hook_results = self.RunHook(committing=False,
1744 may_prompt=not options.force,
1745 verbose=options.verbose,
1746 parallel=options.parallel,
1747 upstream=parent,
1748 description=change_desc.description,
1749 all_files=False)
1750 self.ExtendCC(hook_results['more_cc'])
1751
1752 # Update the change description and ensure we have a Change Id.
1753 if self.GetIssue():
1754 if options.edit_description:
1755 change_desc.prompt()
1756 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1757 change_id = change_detail['change_id']
1758 change_desc.ensure_change_id(change_id)
1759
1760 # TODO(b/265929888): Pull in external changes for the current branch
1761 # only. No clear way to pull in external changes for upstream branches
1762 # yet. Potentially offer a separate command to pull in external changes.
1763 else: # No change issue. First time uploading
1764 if not options.force and not options.message_file:
1765 change_desc.prompt()
1766
1767 # Check if user added a change_id in the descripiton.
1768 change_ids = git_footers.get_footer_change_id(change_desc.description)
1769 if len(change_ids) == 1:
1770 change_id = change_ids[0]
1771 else:
1772 change_id = GenerateGerritChangeId(change_desc.description)
1773 change_desc.ensure_change_id(change_id)
1774
1775 if options.preserve_tryjobs:
1776 change_desc.set_preserve_tryjobs()
1777
1778 SaveDescriptionBackup(change_desc)
1779
1780 # Add ccs
1781 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001782 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001783 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001784 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001785 ccs = self.GetCCList().split(',')
1786 if len(ccs) > 100:
1787 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1788 'process/lsc/lsc_workflow.md')
1789 print('WARNING: This will auto-CC %s users.' % len(ccs))
1790 print('LSC may be more appropriate: %s' % lsc)
1791 print('You can also use the --no-autocc flag to disable auto-CC.')
1792 confirm_or_exit(action='continue')
1793
1794 # Add ccs from the --cc flag.
1795 if options.cc:
1796 ccs.extend(options.cc)
1797
1798 ccs = [email.strip() for email in ccs if email.strip()]
1799 if change_desc.get_cced():
1800 ccs.extend(change_desc.get_cced())
1801
1802 return change_desc.get_reviewers(), ccs, change_desc
1803
Joanna Wang40497912023-01-24 21:18:16 +00001804 def PostUploadUpdates(self, options, new_upload, change_number):
1805 # type: (optparse.Values, _NewUpload, change_number) -> None
1806 """Makes necessary post upload changes to the local and remote cl."""
1807 if not self.GetIssue():
1808 self.SetIssue(change_number)
1809
1810 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1811 new_upload.commit_to_push)
1812 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1813 new_upload.new_last_uploaded_commit)
1814
1815 if settings.GetRunPostUploadHook():
1816 self.RunPostUploadHook(options.verbose, new_upload.parent,
1817 new_upload.change_desc.description,
1818 options.no_python2_post_upload_hooks)
1819
1820 if new_upload.reviewers or new_upload.ccs:
1821 gerrit_util.AddReviewers(self.GetGerritHost(),
1822 self._GerritChangeIdentifier(),
1823 reviewers=new_upload.reviewers,
1824 ccs=new_upload.ccs,
1825 notify=bool(options.send_mail))
1826
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001827 def CMDUpload(self, options, git_diff_args, orig_args):
1828 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001829 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001830 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001831 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832 else:
1833 if self.GetBranch() is None:
1834 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1835
1836 # Default to diffing against common ancestor of upstream branch
1837 base_branch = self.GetCommonAncestorWithUpstream()
1838 git_diff_args = [base_branch, 'HEAD']
1839
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001840 # Fast best-effort checks to abort before running potentially expensive
1841 # hooks if uploading is likely to fail anyway. Passing these checks does
1842 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001843 self.EnsureAuthenticated(force=options.force)
1844 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845
1846 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001847 watchlist = watchlists.Watchlists(settings.GetRoot())
1848 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001849 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001850 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001851
Edward Lemur5a644f82020-03-18 16:44:57 +00001852 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001853 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001854 hook_results = self.RunHook(committing=False,
1855 may_prompt=not options.force,
1856 verbose=options.verbose,
1857 parallel=options.parallel,
1858 upstream=base_branch,
1859 description=change_desc.description,
1860 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001861 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001862
Aaron Gable13101a62018-02-09 13:20:41 -08001863 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001864 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001865 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001866 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001867 if self.GetBranch() is not None:
1868 self._GitSetBranchConfigValue(
1869 LAST_UPLOAD_HASH_CONFIG_KEY,
1870 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001871 # Run post upload hooks, if specified.
1872 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001873 self.RunPostUploadHook(options.verbose, base_branch,
1874 change_desc.description,
1875 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001876
1877 # Upload all dependencies if specified.
1878 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001879 print()
1880 print('--dependencies has been specified.')
1881 print('All dependent local branches will be re-uploaded.')
1882 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001883 # Remove the dependencies flag from args so that we do not end up in a
1884 # loop.
1885 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001886 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001887 return ret
1888
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001889 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001890 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001891
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001892 Issue must have been already uploaded and known. Optionally allows for
1893 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001894 """
1895 assert new_state in _CQState.ALL_STATES
1896 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001897 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001898 vote_map = {
1899 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001900 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001901 _CQState.DRY_RUN: 1,
1902 _CQState.COMMIT: 2,
1903 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001904 if new_state == _CQState.QUICK_RUN:
1905 labels = {
1906 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1907 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1908 }
1909 else:
1910 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001911 notify = False if new_state == _CQState.DRY_RUN else None
1912 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001913 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001914 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001915 return 0
1916 except KeyboardInterrupt:
1917 raise
1918 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001919 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001920 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001921 ' * Your project has no CQ,\n'
1922 ' * You don\'t have permission to change the CQ state,\n'
1923 ' * There\'s a bug in this code (see stack trace below).\n'
1924 'Consider specifying which bots to trigger manually or asking your '
1925 'project owners for permissions or contacting Chrome Infra at:\n'
1926 'https://www.chromium.org/infra\n\n' %
1927 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001928 # Still raise exception so that stack trace is printed.
1929 raise
1930
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001931 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932 # Lazy load of configs.
1933 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001934 if self._gerrit_host and '.' not in self._gerrit_host:
1935 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1936 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001937 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001938 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001939 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001940 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001941 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1942 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 return self._gerrit_host
1944
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001945 def _GetGitHost(self):
1946 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001947 remote_url = self.GetRemoteUrl()
1948 if not remote_url:
1949 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001950 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001951
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 def GetCodereviewServer(self):
1953 if not self._gerrit_server:
1954 # If we're on a branch then get the server potentially associated
1955 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001956 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001957 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001958 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001959 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001960 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001961 if not self._gerrit_server:
1962 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1963 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001964 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965 parts[0] = parts[0] + '-review'
1966 self._gerrit_host = '.'.join(parts)
1967 self._gerrit_server = 'https://%s' % self._gerrit_host
1968 return self._gerrit_server
1969
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001970 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001971 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001972 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001973 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001974 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001975 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001976 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001977 if project.endswith('.git'):
1978 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001979 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1980 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1981 # gitiles/git-over-https protocol. E.g.,
1982 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1983 # as
1984 # https://chromium.googlesource.com/v8/v8
1985 if project.startswith('a/'):
1986 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001987 return project
1988
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001989 def _GerritChangeIdentifier(self):
1990 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1991
1992 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001993 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001994 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001995 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001996 if project:
1997 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1998 # Fall back on still unique, but less efficient change number.
1999 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002000
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002001 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002002 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002003 if settings.GetGerritSkipEnsureAuthenticated():
2004 # For projects with unusual authentication schemes.
2005 # See http://crbug.com/603378.
2006 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002007
2008 # Check presence of cookies only if using cookies-based auth method.
2009 cookie_auth = gerrit_util.Authenticator.get()
2010 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002011 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002012
Florian Mayerae510e82020-01-30 21:04:48 +00002013 remote_url = self.GetRemoteUrl()
2014 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002015 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002016 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002017 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2018 logging.warning(
2019 'Ignoring branch %(branch)s with non-https/sso remote '
2020 '%(remote)s', {
2021 'branch': self.branch,
2022 'remote': self.GetRemoteUrl()
2023 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002024 return
2025
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002026 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002027 self.GetCodereviewServer()
2028 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002029 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002030
2031 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2032 git_auth = cookie_auth.get_auth_header(git_host)
2033 if gerrit_auth and git_auth:
2034 if gerrit_auth == git_auth:
2035 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002036 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002037 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002038 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002039 ' %s\n'
2040 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002041 ' Consider running the following command:\n'
2042 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002043 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002044 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002045 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002046 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002047 cookie_auth.get_new_password_message(git_host)))
2048 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002049 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002050 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002051
2052 missing = (
2053 ([] if gerrit_auth else [self._gerrit_host]) +
2054 ([] if git_auth else [git_host]))
2055 DieWithError('Credentials for the following hosts are required:\n'
2056 ' %s\n'
2057 'These are read from %s (or legacy %s)\n'
2058 '%s' % (
2059 '\n '.join(missing),
2060 cookie_auth.get_gitcookies_path(),
2061 cookie_auth.get_netrc_path(),
2062 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002063
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002064 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002065 if not self.GetIssue():
2066 return
2067
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002068 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002069 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002070 DieWithError(
2071 'Change %s has been abandoned, new uploads are not allowed' %
2072 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002073 if status == 'MERGED':
2074 answer = gclient_utils.AskForData(
2075 'Change %s has been submitted, new uploads are not allowed. '
2076 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2077 ).lower()
2078 if answer not in ('y', ''):
2079 DieWithError('New uploads are not allowed.')
2080 self.SetIssue()
2081 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002082
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002083 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2084 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2085 # Apparently this check is not very important? Otherwise get_auth_email
2086 # could have been added to other implementations of Authenticator.
2087 cookies_auth = gerrit_util.Authenticator.get()
2088 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002089 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002090
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002091 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002092 if self.GetIssueOwner() == cookies_user:
2093 return
2094 logging.debug('change %s owner is %s, cookies user is %s',
2095 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002096 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002097 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002098 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002099 if details['email'] == self.GetIssueOwner():
2100 return
2101 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002102 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002103 'as %s.\n'
2104 'Uploading may fail due to lack of permissions.' %
2105 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2106 confirm_or_exit(action='upload')
2107
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002108 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002109 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002110 or CQ status, assuming adherence to a common workflow.
2111
2112 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002113 * 'error' - error from review tool (including deleted issues)
2114 * 'unsent' - no reviewers added
2115 * 'waiting' - waiting for review
2116 * 'reply' - waiting for uploader to reply to review
2117 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002118 * 'dry-run' - dry-running in the CQ
2119 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002120 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002121 """
2122 if not self.GetIssue():
2123 return None
2124
2125 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002126 data = self._GetChangeDetail([
2127 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002128 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002129 return 'error'
2130
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002131 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002132 return 'closed'
2133
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002134 cq_label = data['labels'].get('Commit-Queue', {})
2135 max_cq_vote = 0
2136 for vote in cq_label.get('all', []):
2137 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2138 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002139 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002140 if max_cq_vote == 1:
2141 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002142
Aaron Gable9ab38c62017-04-06 14:36:33 -07002143 if data['labels'].get('Code-Review', {}).get('approved'):
2144 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002145
2146 if not data.get('reviewers', {}).get('REVIEWER', []):
2147 return 'unsent'
2148
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002149 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002150 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002151 while messages:
2152 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002153 if (m.get('tag', '').startswith('autogenerated:cq') or
2154 m.get('tag', '').startswith('autogenerated:cv')):
2155 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002156 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002157 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002158 # Most recent message was by owner.
2159 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002160
2161 # Some reply from non-owner.
2162 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002163
2164 # Somehow there are no messages even though there are reviewers.
2165 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002166
Gavin Mak4e5e3992022-11-14 22:40:12 +00002167 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002168 if not self.GetIssue():
2169 return None
2170
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002171 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002172 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002173 if update:
2174 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002175 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002176
Gavin Makf35a9eb2022-11-17 18:34:36 +00002177 def _IsPatchsetRangeSignificant(self, lower, upper):
2178 """Returns True if the inclusive range of patchsets contains any reworks or
2179 rebases."""
2180 if not self.GetIssue():
2181 return False
2182
2183 data = self._GetChangeDetail(['ALL_REVISIONS'])
2184 ps_kind = {}
2185 for rev_info in data.get('revisions', {}).values():
2186 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2187
2188 for ps in range(lower, upper + 1):
2189 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2190 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2191 return True
2192 return False
2193
Gavin Make61ccc52020-11-13 00:12:57 +00002194 def GetMostRecentDryRunPatchset(self):
2195 """Get patchsets equivalent to the most recent patchset and return
2196 the patchset with the latest dry run. If none have been dry run, return
2197 the latest patchset."""
2198 if not self.GetIssue():
2199 return None
2200
2201 data = self._GetChangeDetail(['ALL_REVISIONS'])
2202 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002203 dry_run = {int(m['_revision_number'])
2204 for m in data.get('messages', [])
2205 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002206
2207 for revision_info in sorted(data.get('revisions', {}).values(),
2208 key=lambda c: c['_number'], reverse=True):
2209 if revision_info['_number'] in dry_run:
2210 patchset = revision_info['_number']
2211 break
2212 if revision_info.get('kind', '') not in \
2213 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2214 break
2215 self.SetPatchset(patchset)
2216 return patchset
2217
Aaron Gable636b13f2017-07-14 10:42:48 -07002218 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002219 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002220 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002221 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002222
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002223 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002224 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002225 # CURRENT_REVISION is included to get the latest patchset so that
2226 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002227 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002228 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2229 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002230 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002231 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002232 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002233 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002234
2235 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002236 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002237 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002238 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002239 line_comments = file_comments.setdefault(path, [])
2240 line_comments.extend(
2241 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002242
2243 # Build dictionary of file comments for easy access and sorting later.
2244 # {author+date: {path: {patchset: {line: url+message}}}}
2245 comments = collections.defaultdict(
2246 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002247
2248 server = self.GetCodereviewServer()
2249 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2250 # /c/ is automatically added by short URL server.
2251 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2252 self.GetIssue())
2253 else:
2254 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2255
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002256 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002257 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002258 tag = comment.get('tag', '')
2259 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002260 continue
2261 key = (comment['author']['email'], comment['updated'])
2262 if comment.get('side', 'REVISION') == 'PARENT':
2263 patchset = 'Base'
2264 else:
2265 patchset = 'PS%d' % comment['patch_set']
2266 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002267 url = ('%s/%s/%s#%s%s' %
2268 (url_prefix, comment['patch_set'], path,
2269 'b' if comment.get('side') == 'PARENT' else '',
2270 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002271 comments[key][path][patchset][line] = (url, comment['message'])
2272
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002273 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002274 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002275 summary = self._BuildCommentSummary(msg, comments, readable)
2276 if summary:
2277 summaries.append(summary)
2278 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002279
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002280 @staticmethod
2281 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002282 if 'email' not in msg['author']:
2283 # Some bot accounts may not have an email associated.
2284 return None
2285
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002286 key = (msg['author']['email'], msg['date'])
2287 # Don't bother showing autogenerated messages that don't have associated
2288 # file or line comments. this will filter out most autogenerated
2289 # messages, but will keep robot comments like those from Tricium.
2290 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2291 if is_autogenerated and not comments.get(key):
2292 return None
2293 message = msg['message']
2294 # Gerrit spits out nanoseconds.
2295 assert len(msg['date'].split('.')[-1]) == 9
2296 date = datetime.datetime.strptime(msg['date'][:-3],
2297 '%Y-%m-%d %H:%M:%S.%f')
2298 if key in comments:
2299 message += '\n'
2300 for path, patchsets in sorted(comments.get(key, {}).items()):
2301 if readable:
2302 message += '\n%s' % path
2303 for patchset, lines in sorted(patchsets.items()):
2304 for line, (url, content) in sorted(lines.items()):
2305 if line:
2306 line_str = 'Line %d' % line
2307 path_str = '%s:%d:' % (path, line)
2308 else:
2309 line_str = 'File comment'
2310 path_str = '%s:0:' % path
2311 if readable:
2312 message += '\n %s, %s: %s' % (patchset, line_str, url)
2313 message += '\n %s\n' % content
2314 else:
2315 message += '\n%s ' % path_str
2316 message += '\n%s\n' % content
2317
2318 return _CommentSummary(
2319 date=date,
2320 message=message,
2321 sender=msg['author']['email'],
2322 autogenerated=is_autogenerated,
2323 # These could be inferred from the text messages and correlated with
2324 # Code-Review label maximum, however this is not reliable.
2325 # Leaving as is until the need arises.
2326 approval=False,
2327 disapproval=False,
2328 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002329
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002330 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002331 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002332 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002333
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002334 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002335 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002336 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002337
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002338 def _GetChangeDetail(self, options=None):
2339 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002340 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002341 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002342
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002343 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002344 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002345 options.append('CURRENT_COMMIT')
2346
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002347 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002348 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002349 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002350
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002351 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2352 # Assumption: data fetched before with extra options is suitable
2353 # for return for a smaller set of options.
2354 # For example, if we cached data for
2355 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2356 # and request is for options=[CURRENT_REVISION],
2357 # THEN we can return prior cached data.
2358 if options_set.issubset(cached_options_set):
2359 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002360
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002361 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002362 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002363 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002364 except gerrit_util.GerritError as e:
2365 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002366 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002367 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002368
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002369 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002370 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002371
Gavin Mak4e5e3992022-11-14 22:40:12 +00002372 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002373 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002374 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002375 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2376 self._GerritChangeIdentifier(),
2377 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002378 except gerrit_util.GerritError as e:
2379 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002380 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002381 raise
agable32978d92016-11-01 12:55:02 -07002382 return data
2383
Karen Qian40c19422019-03-13 21:28:29 +00002384 def _IsCqConfigured(self):
2385 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002386 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002387
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002388 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002389 if git_common.is_dirty_git_tree('land'):
2390 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002391
tandriid60367b2016-06-22 05:25:12 -07002392 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002393 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002394 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002395 'which can test and land changes for you. '
2396 'Are you sure you wish to bypass it?\n',
2397 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002398 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002399 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 # Note: git diff outputs nothing if there is no diff.
2401 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002402 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002403 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002404 if detail['current_revision'] == last_upload:
2405 differs = False
2406 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002407 print('WARNING: Local branch contents differ from latest uploaded '
2408 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002409 if differs:
2410 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002411 confirm_or_exit(
2412 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2413 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002414 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002415 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002416 upstream = self.GetCommonAncestorWithUpstream()
2417 if self.GetIssue():
2418 description = self.FetchDescription()
2419 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002420 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002421 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002422 committing=True,
2423 may_prompt=not force,
2424 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002425 parallel=parallel,
2426 upstream=upstream,
2427 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002428 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002429 resultdb=resultdb,
2430 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002431
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002432 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002433 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002434 links = self._GetChangeCommit().get('web_links', [])
2435 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002436 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002437 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002438 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002439 return 0
2440
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002441 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2442 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002443 assert parsed_issue_arg.valid
2444
Edward Lemur125d60a2019-09-13 18:25:41 +00002445 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002446
2447 if parsed_issue_arg.hostname:
2448 self._gerrit_host = parsed_issue_arg.hostname
2449 self._gerrit_server = 'https://%s' % self._gerrit_host
2450
tandriic2405f52016-10-10 08:13:15 -07002451 try:
2452 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002453 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002454 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002455
2456 if not parsed_issue_arg.patchset:
2457 # Use current revision by default.
2458 revision_info = detail['revisions'][detail['current_revision']]
2459 patchset = int(revision_info['_number'])
2460 else:
2461 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002462 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002463 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2464 break
2465 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002466 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002467 (parsed_issue_arg.patchset, self.GetIssue()))
2468
Edward Lemur125d60a2019-09-13 18:25:41 +00002469 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002470 if remote_url.endswith('.git'):
2471 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002472 remote_url = remote_url.rstrip('/')
2473
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002474 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002475 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002476
2477 if remote_url != fetch_info['url']:
2478 DieWithError('Trying to patch a change from %s but this repo appears '
2479 'to be %s.' % (fetch_info['url'], remote_url))
2480
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002481 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002482
Joanna Wangc023a632023-01-26 17:59:25 +00002483 # Set issue immediately in case the cherry-pick fails, which happens
2484 # when resolving conflicts.
2485 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002486 self.SetIssue(parsed_issue_arg.issue)
2487
Aaron Gable62619a32017-06-16 08:22:09 -07002488 if force:
2489 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2490 print('Checked out commit for change %i patchset %i locally' %
2491 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002492 elif nocommit:
2493 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2494 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002495 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002496 RunGit(['cherry-pick', 'FETCH_HEAD'])
2497 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002498 (parsed_issue_arg.issue, patchset))
2499 print('Note: this created a local commit which does not have '
2500 'the same hash as the one uploaded for review. This will make '
2501 'uploading changes based on top of this branch difficult.\n'
2502 'If you want to do that, use "git cl patch --force" instead.')
2503
Stefan Zagerd08043c2017-10-12 12:07:02 -07002504 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002505 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002506 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002507 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2508 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002509 else:
2510 print('WARNING: You are in detached HEAD state.\n'
2511 'The patch has been applied to your checkout, but you will not be '
2512 'able to upload a new patch set to the gerrit issue.\n'
2513 'Try using the \'-b\' option if you would like to work on a '
2514 'branch and/or upload a new patch set.')
2515
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002516 return 0
2517
Joanna Wang18de1f62023-01-21 01:24:24 +00002518 @staticmethod
2519 def _GerritCommitMsgHookCheck(offer_removal):
2520 # type: (bool) -> None
2521 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002522 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2523 if not os.path.exists(hook):
2524 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002525 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2526 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002527 data = gclient_utils.FileRead(hook)
2528 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2529 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002530 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002531 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002532 'and may interfere with it in subtle ways.\n'
2533 'We recommend you remove the commit-msg hook.')
2534 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002535 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002536 gclient_utils.rm_file_or_tree(hook)
2537 print('Gerrit commit-msg hook removed.')
2538 else:
2539 print('OK, will keep Gerrit commit-msg hook in place.')
2540
Edward Lemur1b52d872019-05-09 21:12:12 +00002541 def _CleanUpOldTraces(self):
2542 """Keep only the last |MAX_TRACES| traces."""
2543 try:
2544 traces = sorted([
2545 os.path.join(TRACES_DIR, f)
2546 for f in os.listdir(TRACES_DIR)
2547 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2548 and not f.startswith('tmp'))
2549 ])
2550 traces_to_delete = traces[:-MAX_TRACES]
2551 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002552 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002553 except OSError:
2554 print('WARNING: Failed to remove old git traces from\n'
2555 ' %s'
2556 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002557
Edward Lemur5737f022019-05-17 01:24:00 +00002558 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002559 """Zip and write the git push traces stored in traces_dir."""
2560 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002561 traces_zip = trace_name + '-traces'
2562 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002563 # Create a temporary dir to store git config and gitcookies in. It will be
2564 # compressed and stored next to the traces.
2565 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002566 git_info_zip = trace_name + '-git-info'
2567
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002568 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002569
Edward Lemur1b52d872019-05-09 21:12:12 +00002570 git_push_metadata['trace_name'] = trace_name
2571 gclient_utils.FileWrite(
2572 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2573
2574 # Keep only the first 6 characters of the git hashes on the packet
2575 # trace. This greatly decreases size after compression.
2576 packet_traces = os.path.join(traces_dir, 'trace-packet')
2577 if os.path.isfile(packet_traces):
2578 contents = gclient_utils.FileRead(packet_traces)
2579 gclient_utils.FileWrite(
2580 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2581 shutil.make_archive(traces_zip, 'zip', traces_dir)
2582
2583 # Collect and compress the git config and gitcookies.
2584 git_config = RunGit(['config', '-l'])
2585 gclient_utils.FileWrite(
2586 os.path.join(git_info_dir, 'git-config'),
2587 git_config)
2588
2589 cookie_auth = gerrit_util.Authenticator.get()
2590 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2591 gitcookies_path = cookie_auth.get_gitcookies_path()
2592 if os.path.isfile(gitcookies_path):
2593 gitcookies = gclient_utils.FileRead(gitcookies_path)
2594 gclient_utils.FileWrite(
2595 os.path.join(git_info_dir, 'gitcookies'),
2596 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2597 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2598
Edward Lemur1b52d872019-05-09 21:12:12 +00002599 gclient_utils.rmtree(git_info_dir)
2600
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002601 def _RunGitPushWithTraces(self,
2602 refspec,
2603 refspec_opts,
2604 git_push_metadata,
2605 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002606 """Run git push and collect the traces resulting from the execution."""
2607 # Create a temporary directory to store traces in. Traces will be compressed
2608 # and stored in a 'traces' dir inside depot_tools.
2609 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002610 trace_name = os.path.join(
2611 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002612
2613 env = os.environ.copy()
2614 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2615 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002616 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002617 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2618 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2619 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2620
2621 try:
2622 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002623 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002624 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002625 push_cmd = ['git', 'push', remote_url, refspec]
2626 if git_push_options:
2627 for opt in git_push_options:
2628 push_cmd.extend(['-o', opt])
2629
Edward Lemur0f58ae42019-04-30 17:24:12 +00002630 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002631 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002632 env=env,
2633 print_stdout=True,
2634 # Flush after every line: useful for seeing progress when running as
2635 # recipe.
2636 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002637 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002638 except subprocess2.CalledProcessError as e:
2639 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002640 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002641 raise GitPushError(
2642 'Failed to create a change, very likely due to blocked keyword. '
2643 'Please examine output above for the reason of the failure.\n'
2644 'If this is a false positive, you can try to bypass blocked '
2645 'keyword by using push option '
2646 '-o uploadvalidator~skip, e.g.:\n'
2647 'git cl upload -o uploadvalidator~skip\n\n'
2648 'If git-cl is not working correctly, file a bug under the '
2649 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002650 if 'git push -o nokeycheck' in str(e.stdout):
2651 raise GitPushError(
2652 'Failed to create a change, very likely due to a private key being '
2653 'detected. Please examine output above for the reason of the '
2654 'failure.\n'
2655 'If this is a false positive, you can try to bypass private key '
2656 'detection by using push option '
2657 '-o nokeycheck, e.g.:\n'
2658 'git cl upload -o nokeycheck\n\n'
2659 'If git-cl is not working correctly, file a bug under the '
2660 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002661
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002662 raise GitPushError(
2663 'Failed to create a change. Please examine output above for the '
2664 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002665 'For emergencies, Googlers can escalate to '
2666 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002667 'Hint: run command below to diagnose common Git/Gerrit '
2668 'credential problems:\n'
2669 ' git cl creds-check\n'
2670 '\n'
2671 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2672 'component including the files below.\n'
2673 'Review the files before upload, since they might contain sensitive '
2674 'information.\n'
2675 'Set the Restrict-View-Google label so that they are not publicly '
2676 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002677 finally:
2678 execution_time = time_time() - before_push
2679 metrics.collector.add_repeated('sub_commands', {
2680 'command': 'git push',
2681 'execution_time': execution_time,
2682 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002683 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002684 })
2685
Edward Lemur1b52d872019-05-09 21:12:12 +00002686 git_push_metadata['execution_time'] = execution_time
2687 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002688 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002689
Edward Lemur1b52d872019-05-09 21:12:12 +00002690 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002691 gclient_utils.rmtree(traces_dir)
2692
2693 return push_stdout
2694
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002695 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2696 change_desc):
2697 """Upload the current branch to Gerrit, retry if new remote HEAD is
2698 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002699 remote, remote_branch = self.GetRemoteBranch()
2700 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2701
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002702 try:
2703 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002704 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002705 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002706 # Repository might be in the middle of transition to main branch as
2707 # default, and uploads to old default might be blocked.
2708 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002709 DieWithError(str(e), change_desc)
2710
Josip Sokcevicb631a882021-01-06 18:18:10 +00002711 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2712 self.GetGerritProject())
2713 if project_head == branch:
2714 DieWithError(str(e), change_desc)
2715 branch = project_head
2716
2717 print("WARNING: Fetching remote state and retrying upload to default "
2718 "branch...")
2719 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002720 options.edit_description = False
2721 options.force = True
2722 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002723 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2724 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002725 except GitPushError as e:
2726 DieWithError(str(e), change_desc)
2727
2728 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002729 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002731 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002732 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002733 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002734 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002735 # User requested to change description
2736 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002737 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002738 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2739 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002740 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002741
2742 # Check if changes outside of this workspace have been uploaded.
2743 current_rev = change_detail['current_revision']
2744 last_uploaded_rev = self._GitGetBranchConfigValue(
2745 GERRIT_SQUASH_HASH_CONFIG_KEY)
2746 if last_uploaded_rev and current_rev != last_uploaded_rev:
2747 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002748 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002749 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002750 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002751 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002752 if len(change_ids) == 1:
2753 change_id = change_ids[0]
2754 else:
2755 change_id = GenerateGerritChangeId(change_desc.description)
2756 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002757
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002758 if options.preserve_tryjobs:
2759 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002760
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002762 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002763 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002764 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002765 with gclient_utils.temporary_file() as desc_tempfile:
2766 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2767 ref_to_push = RunGit(
2768 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002769 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002770 if options.no_add_changeid:
2771 pass
2772 else: # adding Change-Ids is okay.
2773 if not git_footers.get_footer_change_id(change_desc.description):
2774 DownloadGerritHook(False)
2775 change_desc.set_description(
2776 self._AddChangeIdToCommitMessage(change_desc.description,
2777 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002778 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002779 # For no-squash mode, we assume the remote called "origin" is the one we
2780 # want. It is not worthwhile to support different workflows for
2781 # no-squash mode.
2782 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002783 # attempt to extract the changeid from the current description
2784 # fail informatively if not possible.
2785 change_id_candidates = git_footers.get_footer_change_id(
2786 change_desc.description)
2787 if not change_id_candidates:
2788 DieWithError("Unable to extract change-id from message.")
2789 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002791 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002792 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2793 ref_to_push)]).splitlines()
2794 if len(commits) > 1:
2795 print('WARNING: This will upload %d commits. Run the following command '
2796 'to see which commits will be uploaded: ' % len(commits))
2797 print('git log %s..%s' % (parent, ref_to_push))
2798 print('You can also use `git squash-branch` to squash these into a '
2799 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002800 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002801
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002802 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002803 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002804 # Add default, watchlist, presubmit ccs if this is the initial upload
2805 # and CL is not private and auto-ccing has not been disabled.
2806 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002807 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002808 if len(cc) > 100:
2809 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2810 'process/lsc/lsc_workflow.md')
2811 print('WARNING: This will auto-CC %s users.' % len(cc))
2812 print('LSC may be more appropriate: %s' % lsc)
2813 print('You can also use the --no-autocc flag to disable auto-CC.')
2814 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002815 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002816 if options.cc:
2817 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002818 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002819 if change_desc.get_cced():
2820 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002821 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002822 valid_accounts = set(reviewers + cc)
2823 # TODO(crbug/877717): relax this for all hosts.
2824 else:
2825 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002826 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002827 logging.info('accounts %s are recognized, %s invalid',
2828 sorted(valid_accounts),
2829 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002830
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002831 # Extra options that can be specified at push time. Doc:
2832 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002833 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002834
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002835 for r in sorted(reviewers):
2836 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002837 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002838 reviewers.remove(r)
2839 else:
2840 # TODO(tandrii): this should probably be a hard failure.
2841 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2842 % r)
2843 for c in sorted(cc):
2844 # refspec option will be rejected if cc doesn't correspond to an
2845 # account, even though REST call to add such arbitrary cc may succeed.
2846 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002847 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002848 cc.remove(c)
2849
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002850 refspec_suffix = ''
2851 if refspec_opts:
2852 refspec_suffix = '%' + ','.join(refspec_opts)
2853 assert ' ' not in refspec_suffix, (
2854 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2855 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002856
Edward Lemur1b52d872019-05-09 21:12:12 +00002857 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002858 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002859 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002860 'change_id': change_id,
2861 'description': change_desc.description,
2862 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002863
Gavin Mak4e5e3992022-11-14 22:40:12 +00002864 # Gerrit may or may not update fast enough to return the correct patchset
2865 # number after we push. Get the pre-upload patchset and increment later.
2866 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2867
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002868 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002869 git_push_metadata,
2870 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002871
2872 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002873 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002874 change_numbers = [m.group(1)
2875 for m in map(regex.match, push_stdout.splitlines())
2876 if m]
2877 if len(change_numbers) != 1:
2878 DieWithError(
2879 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002880 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002881 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002882 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002883 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002884
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002885 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002886 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002887 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002888 gerrit_util.AddReviewers(self.GetGerritHost(),
2889 self._GerritChangeIdentifier(),
2890 reviewers,
2891 cc,
2892 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002893
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002894 return 0
2895
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002896 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2897 change_desc):
2898 """Computes parent of the generated commit to be uploaded to Gerrit.
2899
2900 Returns revision or a ref name.
2901 """
2902 if custom_cl_base:
2903 # Try to avoid creating additional unintended CLs when uploading, unless
2904 # user wants to take this risk.
2905 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2906 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2907 local_ref_of_target_remote])
2908 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002909 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002910 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2911 'If you proceed with upload, more than 1 CL may be created by '
2912 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2913 'If you are certain that specified base `%s` has already been '
2914 'uploaded to Gerrit as another CL, you may proceed.\n' %
2915 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2916 if not force:
2917 confirm_or_exit(
2918 'Do you take responsibility for cleaning up potential mess '
2919 'resulting from proceeding with upload?',
2920 action='upload')
2921 return custom_cl_base
2922
Aaron Gablef97e33d2017-03-30 15:44:27 -07002923 if remote != '.':
2924 return self.GetCommonAncestorWithUpstream()
2925
2926 # If our upstream branch is local, we base our squashed commit on its
2927 # squashed version.
2928 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2929
Aaron Gablef97e33d2017-03-30 15:44:27 -07002930 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002931 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002932 if upstream_branch_name == 'main':
2933 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002934
2935 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002936 # TODO(tandrii): consider checking parent change in Gerrit and using its
2937 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2938 # the tree hash of the parent branch. The upside is less likely bogus
2939 # requests to reupload parent change just because it's uploadhash is
2940 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002941 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2942 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002943 # Verify that the upstream branch has been uploaded too, otherwise
2944 # Gerrit will create additional CLs when uploading.
2945 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2946 RunGitSilent(['rev-parse', parent + ':'])):
2947 DieWithError(
2948 '\nUpload upstream branch %s first.\n'
2949 'It is likely that this branch has been rebased since its last '
2950 'upload, so you just need to upload it again.\n'
2951 '(If you uploaded it with --no-squash, then branch dependencies '
2952 'are not supported, and you should reupload with --squash.)'
2953 % upstream_branch_name,
2954 change_desc)
2955 return parent
2956
Gavin Mak4e5e3992022-11-14 22:40:12 +00002957 def _UpdateWithExternalChanges(self):
2958 """Updates workspace with external changes.
2959
2960 Returns the commit hash that should be used as the merge base on upload.
2961 """
2962 local_ps = self.GetPatchset()
2963 if local_ps is None:
2964 return
2965
2966 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002967 if external_ps is None or local_ps == external_ps or \
2968 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002969 return
2970
2971 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002972 if num_changes > 1:
2973 change_words = 'changes were'
2974 else:
2975 change_words = 'change was'
2976 print('\n%d external %s published to %s:\n' %
2977 (num_changes, change_words, self.GetIssueURL(short=True)))
2978
2979 # Print an overview of external changes.
2980 ps_to_commit = {}
2981 ps_to_info = {}
2982 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2983 for commit_id, revision_info in revisions.get('revisions', {}).items():
2984 ps_num = revision_info['_number']
2985 ps_to_commit[ps_num] = commit_id
2986 ps_to_info[ps_num] = revision_info
2987
2988 for ps in range(external_ps, local_ps, -1):
2989 commit = ps_to_commit[ps][:8]
2990 desc = ps_to_info[ps].get('description', '')
2991 print('Patchset %d [%s] %s' % (ps, commit, desc))
2992
2993 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2994 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002995 return
2996
2997 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2998 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2999 external_base = external_parent['commit']
3000
3001 branch = git_common.current_branch()
3002 local_base = self.GetCommonAncestorWithUpstream()
3003 if local_base != external_base:
3004 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3005 (local_base, external_base))
3006 if git_common.upstream(branch):
3007 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3008 'to make these the same.')
3009 print('No upstream branch set. Consider setting it and using '
3010 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3011
3012 # Fetch Gerrit's CL base if it doesn't exist locally.
3013 remote, _ = self.GetRemoteBranch()
3014 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3015 RunGitSilent(['fetch', remote, external_base])
3016
3017 # Get the diff between local_ps and external_ps.
3018 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003019 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003020 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3021 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3022 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3023 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3024 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3025
3026 # Diff can be empty in the case of trivial rebases.
3027 if not diff:
3028 return external_base
3029
3030 # Apply the diff.
3031 with gclient_utils.temporary_file() as diff_tempfile:
3032 gclient_utils.FileWrite(diff_tempfile, diff)
3033 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3034 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3035 if not clean_patch:
3036 # Normally patchset is set after upload. But because we exit, that never
3037 # happens. Updating here makes sure that subsequent uploads don't need
3038 # to fetch/apply the same diff again.
3039 self.SetPatchset(external_ps)
3040 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3041 'conflicts and reupload.')
3042
3043 message = 'Incorporate external changes from '
3044 if num_changes == 1:
3045 message += 'patchset %d' % external_ps
3046 else:
3047 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3048 RunGitSilent(['commit', '-am', message])
3049 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3050 # patchset title instead of this 'Incorporate' message.
3051 return external_base
3052
Edward Lemura12175c2020-03-09 16:58:26 +00003053 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003054 """Re-commits using the current message, assumes the commit hook is in
3055 place.
3056 """
Edward Lemura12175c2020-03-09 16:58:26 +00003057 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003058 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003059 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003060 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003061 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003062
3063 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003064
tandriie113dfd2016-10-11 10:20:12 -07003065 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003066 try:
3067 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003068 except GerritChangeNotExists:
3069 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003070
3071 if data['status'] in ('ABANDONED', 'MERGED'):
3072 return 'CL %s is closed' % self.GetIssue()
3073
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003074 def GetGerritChange(self, patchset=None):
3075 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003076 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003077 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003078 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003079 data = self._GetChangeDetail(['ALL_REVISIONS'])
3080
3081 assert host and issue and patchset, 'CL must be uploaded first'
3082
3083 has_patchset = any(
3084 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003085 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003086 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003087 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003088 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003089
tandrii8c5a3532016-11-04 07:52:02 -07003090 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003091 'host': host,
3092 'change': issue,
3093 'project': data['project'],
3094 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003095 }
tandriie113dfd2016-10-11 10:20:12 -07003096
tandriide281ae2016-10-12 06:02:30 -07003097 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003098 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003099
Edward Lemur707d70b2018-02-07 00:50:14 +01003100 def GetReviewers(self):
3101 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003102 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003103
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003104
Lei Zhang8a0efc12020-08-05 19:58:45 +00003105def _get_bug_line_values(default_project_prefix, bugs):
3106 """Given default_project_prefix and comma separated list of bugs, yields bug
3107 line values.
tandriif9aefb72016-07-01 09:06:51 -07003108
3109 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003110 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003111 * string, which is left as is.
3112
3113 This function may produce more than one line, because bugdroid expects one
3114 project per line.
3115
Lei Zhang8a0efc12020-08-05 19:58:45 +00003116 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003117 ['v8:123', 'chromium:789']
3118 """
3119 default_bugs = []
3120 others = []
3121 for bug in bugs.split(','):
3122 bug = bug.strip()
3123 if bug:
3124 try:
3125 default_bugs.append(int(bug))
3126 except ValueError:
3127 others.append(bug)
3128
3129 if default_bugs:
3130 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003131 if default_project_prefix:
3132 if not default_project_prefix.endswith(':'):
3133 default_project_prefix += ':'
3134 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003135 else:
3136 yield default_bugs
3137 for other in sorted(others):
3138 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3139 yield other
3140
3141
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003142class ChangeDescription(object):
3143 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003144 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003145 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003146 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003147 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003148 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003149 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3150 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003151 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003152 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003153
Dan Beamd8b04ca2019-10-10 21:23:26 +00003154 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003155 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003156 if bug:
3157 regexp = re.compile(self.BUG_LINE)
3158 prefix = settings.GetBugPrefix()
3159 if not any((regexp.match(line) for line in self._description_lines)):
3160 values = list(_get_bug_line_values(prefix, bug))
3161 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003162 if fixed:
3163 regexp = re.compile(self.FIXED_LINE)
3164 prefix = settings.GetBugPrefix()
3165 if not any((regexp.match(line) for line in self._description_lines)):
3166 values = list(_get_bug_line_values(prefix, fixed))
3167 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003168
agable@chromium.org42c20792013-09-12 17:34:49 +00003169 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003170 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003171 return '\n'.join(self._description_lines)
3172
3173 def set_description(self, desc):
3174 if isinstance(desc, basestring):
3175 lines = desc.splitlines()
3176 else:
3177 lines = [line.rstrip() for line in desc]
3178 while lines and not lines[0]:
3179 lines.pop(0)
3180 while lines and not lines[-1]:
3181 lines.pop(-1)
3182 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003183
Edward Lemur5a644f82020-03-18 16:44:57 +00003184 def ensure_change_id(self, change_id):
3185 description = self.description
3186 footer_change_ids = git_footers.get_footer_change_id(description)
3187 # Make sure that the Change-Id in the description matches the given one.
3188 if footer_change_ids != [change_id]:
3189 if footer_change_ids:
3190 # Remove any existing Change-Id footers since they don't match the
3191 # expected change_id footer.
3192 description = git_footers.remove_footer(description, 'Change-Id')
3193 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3194 'if you want to set a new one.')
3195 # Add the expected Change-Id footer.
3196 description = git_footers.add_footer_change_id(description, change_id)
3197 self.set_description(description)
3198
Joanna Wang39811b12023-01-20 23:09:48 +00003199 def update_reviewers(self, reviewers):
3200 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003201
3202 Args:
3203 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003204 """
Joanna Wang39811b12023-01-20 23:09:48 +00003205 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003206 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003207
3208 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003209
Joanna Wang39811b12023-01-20 23:09:48 +00003210 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003211 regexp = re.compile(self.R_LINE)
3212 matches = [regexp.match(line) for line in self._description_lines]
3213 new_desc = [l for i, l in enumerate(self._description_lines)
3214 if not matches[i]]
3215 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003216
Joanna Wang39811b12023-01-20 23:09:48 +00003217 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003218
Joanna Wang39811b12023-01-20 23:09:48 +00003219 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003220 for match in matches:
3221 if not match:
3222 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003223 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003224
Joanna Wang39811b12023-01-20 23:09:48 +00003225 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003226
3227 # Put the new lines in the description where the old first R= line was.
3228 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3229 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003230 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003231 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003232 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003233
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003234 def set_preserve_tryjobs(self):
3235 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3236 footers = git_footers.parse_footers(self.description)
3237 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3238 if v.lower() == 'true':
3239 return
3240 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3241
Anthony Polito8b955342019-09-24 19:01:36 +00003242 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003243 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003244 self.set_description([
3245 '# Enter a description of the change.',
3246 '# This will be displayed on the codereview site.',
3247 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003248 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003249 '--------------------',
3250 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003251 bug_regexp = re.compile(self.BUG_LINE)
3252 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003253 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003254 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003255
Dan Beamd8b04ca2019-10-10 21:23:26 +00003256 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003257 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003258
Bruce Dawsonfc487042020-10-27 19:11:37 +00003259 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003260 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003261 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003262 if not content:
3263 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003264 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003265
Bruce Dawson2377b012018-01-11 16:46:49 -08003266 # Strip off comments and default inserted "Bug:" line.
3267 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003268 (line.startswith('#') or
3269 line.rstrip() == "Bug:" or
3270 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003271 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003272 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003273 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003274
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003275 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003276 """Adds a footer line to the description.
3277
3278 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3279 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3280 that Gerrit footers are always at the end.
3281 """
3282 parsed_footer_line = git_footers.parse_footer(line)
3283 if parsed_footer_line:
3284 # Line is a gerrit footer in the form: Footer-Key: any value.
3285 # Thus, must be appended observing Gerrit footer rules.
3286 self.set_description(
3287 git_footers.add_footer(self.description,
3288 key=parsed_footer_line[0],
3289 value=parsed_footer_line[1]))
3290 return
3291
3292 if not self._description_lines:
3293 self._description_lines.append(line)
3294 return
3295
3296 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3297 if gerrit_footers:
3298 # git_footers.split_footers ensures that there is an empty line before
3299 # actual (gerrit) footers, if any. We have to keep it that way.
3300 assert top_lines and top_lines[-1] == ''
3301 top_lines, separator = top_lines[:-1], top_lines[-1:]
3302 else:
3303 separator = [] # No need for separator if there are no gerrit_footers.
3304
3305 prev_line = top_lines[-1] if top_lines else ''
3306 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3307 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3308 top_lines.append('')
3309 top_lines.append(line)
3310 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003311
tandrii99a72f22016-08-17 14:33:24 -07003312 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003313 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003314 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003315 reviewers = [match.group(2).strip()
3316 for match in matches
3317 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003318 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003319
bradnelsond975b302016-10-23 12:20:23 -07003320 def get_cced(self):
3321 """Retrieves the list of reviewers."""
3322 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3323 cced = [match.group(2).strip() for match in matches if match]
3324 return cleanup_list(cced)
3325
Nodir Turakulov23b82142017-11-16 11:04:25 -08003326 def get_hash_tags(self):
3327 """Extracts and sanitizes a list of Gerrit hashtags."""
3328 subject = (self._description_lines or ('',))[0]
3329 subject = re.sub(
3330 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3331
3332 tags = []
3333 start = 0
3334 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3335 while True:
3336 m = bracket_exp.match(subject, start)
3337 if not m:
3338 break
3339 tags.append(self.sanitize_hash_tag(m.group(1)))
3340 start = m.end()
3341
3342 if not tags:
3343 # Try "Tag: " prefix.
3344 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3345 if m:
3346 tags.append(self.sanitize_hash_tag(m.group(1)))
3347 return tags
3348
3349 @classmethod
3350 def sanitize_hash_tag(cls, tag):
3351 """Returns a sanitized Gerrit hash tag.
3352
3353 A sanitized hashtag can be used as a git push refspec parameter value.
3354 """
3355 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3356
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003357
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003358def FindCodereviewSettingsFile(filename='codereview.settings'):
3359 """Finds the given file starting in the cwd and going up.
3360
3361 Only looks up to the top of the repository unless an
3362 'inherit-review-settings-ok' file exists in the root of the repository.
3363 """
3364 inherit_ok_file = 'inherit-review-settings-ok'
3365 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003366 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003367 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003368 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003369 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003370 if os.path.isfile(os.path.join(cwd, filename)):
3371 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003372 if cwd == root:
3373 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003374 parent_dir = os.path.dirname(cwd)
3375 if parent_dir == cwd:
3376 # We hit the system root directory.
3377 break
3378 cwd = parent_dir
3379 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380
3381
3382def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003383 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003384 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003385
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003386 def SetProperty(name, setting, unset_error_ok=False):
3387 fullname = 'rietveld.' + name
3388 if setting in keyvals:
3389 RunGit(['config', fullname, keyvals[setting]])
3390 else:
3391 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3392
tandrii48df5812016-10-17 03:55:37 -07003393 if not keyvals.get('GERRIT_HOST', False):
3394 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003395 # Only server setting is required. Other settings can be absent.
3396 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003397 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003398 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3399 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003400 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003401 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3402 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003403 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3404 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003405 SetProperty(
3406 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003407 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003408
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003409 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003410 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003411
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003412 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003413 RunGit(['config', 'gerrit.squash-uploads',
3414 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003415
tandrii@chromium.org28253532016-04-14 13:46:56 +00003416 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003417 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003418 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3419
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003420 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003421 # should be of the form
3422 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3423 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003424 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3425 keyvals['ORIGIN_URL_CONFIG']])
3426
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003427
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003428def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003429 """Downloads a network object to a local file, like urllib.urlretrieve.
3430
3431 This is necessary because urllib is broken for SSL connections via a proxy.
3432 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003433 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003434 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003435
3436
ukai@chromium.org712d6102013-11-27 00:52:58 +00003437def hasSheBang(fname):
3438 """Checks fname is a #! script."""
3439 with open(fname) as f:
3440 return f.read(2).startswith('#!')
3441
3442
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003443def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003444 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003445
3446 Args:
3447 force: True to update hooks. False to install hooks if not present.
3448 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003449 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003450 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3451 if not os.access(dst, os.X_OK):
3452 if os.path.exists(dst):
3453 if not force:
3454 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003455 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003456 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003457 if not hasSheBang(dst):
3458 DieWithError('Not a script: %s\n'
3459 'You need to download from\n%s\n'
3460 'into .git/hooks/commit-msg and '
3461 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003462 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3463 except Exception:
3464 if os.path.exists(dst):
3465 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003466 DieWithError('\nFailed to download hooks.\n'
3467 'You need to download from\n%s\n'
3468 'into .git/hooks/commit-msg and '
3469 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470
3471
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003472class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003473 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003474
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003475 def __init__(self):
3476 # Cached list of [host, identity, source], where source is either
3477 # .gitcookies or .netrc.
3478 self._all_hosts = None
3479
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003480 def ensure_configured_gitcookies(self):
3481 """Runs checks and suggests fixes to make git use .gitcookies from default
3482 path."""
3483 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3484 configured_path = RunGitSilent(
3485 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003486 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003487 if configured_path:
3488 self._ensure_default_gitcookies_path(configured_path, default)
3489 else:
3490 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003491
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003492 @staticmethod
3493 def _ensure_default_gitcookies_path(configured_path, default_path):
3494 assert configured_path
3495 if configured_path == default_path:
3496 print('git is already configured to use your .gitcookies from %s' %
3497 configured_path)
3498 return
3499
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003500 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003501 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3502 (configured_path, default_path))
3503
3504 if not os.path.exists(configured_path):
3505 print('However, your configured .gitcookies file is missing.')
3506 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3507 action='reconfigure')
3508 RunGit(['config', '--global', 'http.cookiefile', default_path])
3509 return
3510
3511 if os.path.exists(default_path):
3512 print('WARNING: default .gitcookies file already exists %s' %
3513 default_path)
3514 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3515 default_path)
3516
3517 confirm_or_exit('Move existing .gitcookies to default location?',
3518 action='move')
3519 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003520 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003521 print('Moved and reconfigured git to use .gitcookies from %s' %
3522 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 @staticmethod
3525 def _configure_gitcookies_path(default_path):
3526 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3527 if os.path.exists(netrc_path):
3528 print('You seem to be using outdated .netrc for git credentials: %s' %
3529 netrc_path)
3530 print('This tool will guide you through setting up recommended '
3531 '.gitcookies store for git credentials.\n'
3532 '\n'
3533 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3534 ' git config --global --unset http.cookiefile\n'
3535 ' mv %s %s.backup\n\n' % (default_path, default_path))
3536 confirm_or_exit(action='setup .gitcookies')
3537 RunGit(['config', '--global', 'http.cookiefile', default_path])
3538 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003539
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003540 def get_hosts_with_creds(self, include_netrc=False):
3541 if self._all_hosts is None:
3542 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003543 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3544 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3545 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3546 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003547
3548 if include_netrc:
3549 return self._all_hosts
3550 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3551
3552 def print_current_creds(self, include_netrc=False):
3553 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3554 if not hosts:
3555 print('No Git/Gerrit credentials found')
3556 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003557 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003558 header = [('Host', 'User', 'Which file'),
3559 ['=' * l for l in lengths]]
3560 for row in (header + hosts):
3561 print('\t'.join((('%%+%ds' % l) % s)
3562 for l, s in zip(lengths, row)))
3563
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003564 @staticmethod
3565 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003566 """Parses identity "git-<username>.domain" into <username> and domain."""
3567 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003568 # distinguishable from sub-domains. But we do know typical domains:
3569 if identity.endswith('.chromium.org'):
3570 domain = 'chromium.org'
3571 username = identity[:-len('.chromium.org')]
3572 else:
3573 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003574 if username.startswith('git-'):
3575 username = username[len('git-'):]
3576 return username, domain
3577
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003578 def has_generic_host(self):
3579 """Returns whether generic .googlesource.com has been configured.
3580
3581 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3582 """
3583 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003584 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003585 return True
3586 return False
3587
3588 def _get_git_gerrit_identity_pairs(self):
3589 """Returns map from canonic host to pair of identities (Git, Gerrit).
3590
3591 One of identities might be None, meaning not configured.
3592 """
3593 host_to_identity_pairs = {}
3594 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003595 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003596 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3597 idx = 0 if canonical == host else 1
3598 pair[idx] = identity
3599 return host_to_identity_pairs
3600
3601 def get_partially_configured_hosts(self):
3602 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003603 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003604 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003605 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003606
3607 def get_conflicting_hosts(self):
3608 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003609 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003610 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003611 if None not in (i1, i2) and i1 != i2)
3612
3613 def get_duplicated_hosts(self):
3614 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003615 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003617
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003618 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003619 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003620 hosts = sorted(hosts)
3621 assert hosts
3622 if extra_column_func is None:
3623 extras = [''] * len(hosts)
3624 else:
3625 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003626 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3627 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003628 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003629 lines.append(tmpl % he)
3630 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003632 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 yield ('.googlesource.com wildcard record detected',
3635 ['Chrome Infrastructure team recommends to list full host names '
3636 'explicitly.'],
3637 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638
3639 dups = self.get_duplicated_hosts()
3640 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 yield ('The following hosts were defined twice',
3642 self._format_hosts(dups),
3643 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003644
3645 partial = self.get_partially_configured_hosts()
3646 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003647 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3648 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003649 self._format_hosts(
3650 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3651 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003652
3653 conflicting = self.get_conflicting_hosts()
3654 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003655 yield ('The following Git hosts have differing credentials from their '
3656 'Gerrit counterparts',
3657 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3658 tuple(self._get_git_gerrit_identity_pairs()[host])),
3659 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003660
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003661 def find_and_report_problems(self):
3662 """Returns True if there was at least one problem, else False."""
3663 found = False
3664 bad_hosts = set()
3665 for title, sublines, hosts in self._find_problems():
3666 if not found:
3667 found = True
3668 print('\n\n.gitcookies problem report:\n')
3669 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003670 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003671 if sublines:
3672 print()
3673 print(' %s' % '\n '.join(sublines))
3674 print()
3675
3676 if bad_hosts:
3677 assert found
3678 print(' You can manually remove corresponding lines in your %s file and '
3679 'visit the following URLs with correct account to generate '
3680 'correct credential lines:\n' %
3681 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003682 print(' %s' % '\n '.join(
3683 sorted(
3684 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3685 _canonical_git_googlesource_host(host))
3686 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003687 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003688
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003689
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003690@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003691def CMDcreds_check(parser, args):
3692 """Checks credentials and suggests changes."""
3693 _, _ = parser.parse_args(args)
3694
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003695 # Code below checks .gitcookies. Abort if using something else.
3696 authn = gerrit_util.Authenticator.get()
3697 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003698 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003699 'This command is not designed for bot environment. It checks '
3700 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003701 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3702 if isinstance(authn, gerrit_util.GceAuthenticator):
3703 message += (
3704 '\n'
3705 'If you need to run this on GCE or a cloudtop instance, '
3706 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3707 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003708
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003709 checker = _GitCookiesChecker()
3710 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003711
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003712 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003713 checker.print_current_creds(include_netrc=True)
3714
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003715 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003716 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003717 return 0
3718 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003719
3720
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003721@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003722def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003723 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003724 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003725 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003726 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003727 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003729 return RunGit(['config', 'branch.%s.base-url' % branch],
3730 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003731
3732 print('Setting base-url to %s' % args[0])
3733 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3734 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003735
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003736
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003737def color_for_status(status):
3738 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003739 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003740 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003741 'unsent': BOLD + Fore.YELLOW,
3742 'waiting': BOLD + Fore.RED,
3743 'reply': BOLD + Fore.YELLOW,
3744 'not lgtm': BOLD + Fore.RED,
3745 'lgtm': BOLD + Fore.GREEN,
3746 'commit': BOLD + Fore.MAGENTA,
3747 'closed': BOLD + Fore.CYAN,
3748 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003749 }.get(status, Fore.WHITE)
3750
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003751
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003752def get_cl_statuses(changes, fine_grained, max_processes=None):
3753 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003754
3755 If fine_grained is true, this will fetch CL statuses from the server.
3756 Otherwise, simply indicate if there's a matching url for the given branches.
3757
3758 If max_processes is specified, it is used as the maximum number of processes
3759 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3760 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003761
3762 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003763 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003764 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003765 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003766
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003767 if not fine_grained:
3768 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003769 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003770 for cl in changes:
3771 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003772 return
3773
3774 # First, sort out authentication issues.
3775 logging.debug('ensuring credentials exist')
3776 for cl in changes:
3777 cl.EnsureAuthenticated(force=False, refresh=True)
3778
3779 def fetch(cl):
3780 try:
3781 return (cl, cl.GetStatus())
3782 except:
3783 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003784 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003785 raise
3786
3787 threads_count = len(changes)
3788 if max_processes:
3789 threads_count = max(1, min(threads_count, max_processes))
3790 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3791
Edward Lemur61bf4172020-02-24 23:22:37 +00003792 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003793 fetched_cls = set()
3794 try:
3795 it = pool.imap_unordered(fetch, changes).__iter__()
3796 while True:
3797 try:
3798 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003799 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003800 break
3801 fetched_cls.add(cl)
3802 yield cl, status
3803 finally:
3804 pool.close()
3805
3806 # Add any branches that failed to fetch.
3807 for cl in set(changes) - fetched_cls:
3808 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003809
rmistry@google.com2dd99862015-06-22 12:22:18 +00003810
Jose Lopes3863fc52020-04-07 17:00:25 +00003811def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003812 """Uploads CLs of local branches that are dependents of the current branch.
3813
3814 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003815
3816 test1 -> test2.1 -> test3.1
3817 -> test3.2
3818 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003819
3820 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3821 run on the dependent branches in this order:
3822 test2.1, test3.1, test3.2, test2.2, test3.3
3823
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003824 Note: This function does not rebase your local dependent branches. Use it
3825 when you make a change to the parent branch that will not conflict
3826 with its dependent branches, and you would like their dependencies
3827 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003828 """
3829 if git_common.is_dirty_git_tree('upload-branch-deps'):
3830 return 1
3831
3832 root_branch = cl.GetBranch()
3833 if root_branch is None:
3834 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3835 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003836 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003837 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3838 'patchset dependencies without an uploaded CL.')
3839
3840 branches = RunGit(['for-each-ref',
3841 '--format=%(refname:short) %(upstream:short)',
3842 'refs/heads'])
3843 if not branches:
3844 print('No local branches found.')
3845 return 0
3846
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003847 # Create a dictionary of all local branches to the branches that are
3848 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003849 tracked_to_dependents = collections.defaultdict(list)
3850 for b in branches.splitlines():
3851 tokens = b.split()
3852 if len(tokens) == 2:
3853 branch_name, tracked = tokens
3854 tracked_to_dependents[tracked].append(branch_name)
3855
vapiera7fbd5a2016-06-16 09:17:49 -07003856 print()
3857 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003858 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003859
rmistry@google.com2dd99862015-06-22 12:22:18 +00003860 def traverse_dependents_preorder(branch, padding=''):
3861 dependents_to_process = tracked_to_dependents.get(branch, [])
3862 padding += ' '
3863 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003864 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003865 dependents.append(dependent)
3866 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003867
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003869 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870
3871 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003872 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 return 0
3874
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 # Record all dependents that failed to upload.
3876 failures = {}
3877 # Go through all dependents, checkout the branch and upload.
3878 try:
3879 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print()
3881 print('--------------------------------------')
3882 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 try:
3886 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003889 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003892 finally:
3893 # Swap back to the original root branch.
3894 RunGit(['checkout', '-q', root_branch])
3895
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print()
3897 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 for dependent_branch in dependents:
3899 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print(' %s : %s' % (dependent_branch, upload_status))
3901 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003902
3903 return 0
3904
3905
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003906def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003907 """Given a proposed tag name, returns a tag name that is guaranteed to be
3908 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3909 or 'foo-3', and so on."""
3910
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003911 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003912 for suffix_num in itertools.count(1):
3913 if suffix_num == 1:
3914 to_check = proposed_tag
3915 else:
3916 to_check = '%s-%d' % (proposed_tag, suffix_num)
3917
3918 if to_check not in existing_tags:
3919 return to_check
3920
3921
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003922@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003923def CMDarchive(parser, args):
3924 """Archives and deletes branches associated with closed changelists."""
3925 parser.add_option(
3926 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003927 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003928 parser.add_option(
3929 '-f', '--force', action='store_true',
3930 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003931 parser.add_option(
3932 '-d', '--dry-run', action='store_true',
3933 help='Skip the branch tagging and removal steps.')
3934 parser.add_option(
3935 '-t', '--notags', action='store_true',
3936 help='Do not tag archived branches. '
3937 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003938 parser.add_option(
3939 '-p',
3940 '--pattern',
3941 default='git-cl-archived-{issue}-{branch}',
3942 help='Format string for archive tags. '
3943 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003944
kmarshall3bff56b2016-06-06 18:31:47 -07003945 options, args = parser.parse_args(args)
3946 if args:
3947 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003948
3949 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3950 if not branches:
3951 return 0
3952
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003953 tags = RunGit(['for-each-ref', '--format=%(refname)',
3954 'refs/tags']).splitlines() or []
3955 tags = [t.split('/')[-1] for t in tags]
3956
vapiera7fbd5a2016-06-16 09:17:49 -07003957 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003958 changes = [Changelist(branchref=b)
3959 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003960 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3961 statuses = get_cl_statuses(changes,
3962 fine_grained=True,
3963 max_processes=options.maxjobs)
3964 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003965 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3966 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003967 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003968 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003969 proposal.sort()
3970
3971 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003973 return 0
3974
Edward Lemur85153282020-02-14 22:06:29 +00003975 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003976
vapiera7fbd5a2016-06-16 09:17:49 -07003977 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003978 if options.notags:
3979 for next_item in proposal:
3980 print(' ' + next_item[0])
3981 else:
3982 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3983 for next_item in proposal:
3984 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003985
kmarshall9249e012016-08-23 12:02:16 -07003986 # Quit now on precondition failure or if instructed by the user, either
3987 # via an interactive prompt or by command line flags.
3988 if options.dry_run:
3989 print('\nNo changes were made (dry run).\n')
3990 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003991
3992 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003993 print('You are currently on a branch \'%s\' which is associated with a '
3994 'closed codereview issue, so archive cannot proceed. Please '
3995 'checkout another branch and run this command again.' %
3996 current_branch)
3997 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003998
3999 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004000 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004001 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004003 return 1
4004
4005 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004006 if not options.notags:
4007 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004008
4009 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4010 # Clean up the tag if we failed to delete the branch.
4011 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004012
vapiera7fbd5a2016-06-16 09:17:49 -07004013 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004014
4015 return 0
4016
4017
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004018@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004020 """Show status of changelists.
4021
4022 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004023 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004024 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004025 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004026 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004027 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004028 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004029 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004030
4031 Also see 'git cl comments'.
4032 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004033 parser.add_option(
4034 '--no-branch-color',
4035 action='store_true',
4036 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004037 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004038 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004039 parser.add_option('-f', '--fast', action='store_true',
4040 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004041 parser.add_option(
4042 '-j', '--maxjobs', action='store', type=int,
4043 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004044 parser.add_option(
4045 '-i', '--issue', type=int,
4046 help='Operate on this issue instead of the current branch\'s implicit '
4047 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004048 parser.add_option('-d',
4049 '--date-order',
4050 action='store_true',
4051 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004052 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004053 if args:
4054 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004055
iannuccie53c9352016-08-17 14:40:40 -07004056 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004057 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004060 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004062 if cl.GetIssue():
4063 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004064 elif options.field == 'id':
4065 issueid = cl.GetIssue()
4066 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004067 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004068 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004069 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004071 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004072 elif options.field == 'status':
4073 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074 elif options.field == 'url':
4075 url = cl.GetIssueURL()
4076 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004078 return 0
4079
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004080 branches = RunGit([
4081 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4082 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004083 if not branches:
4084 print('No local branch found.')
4085 return 0
4086
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004087 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004088 Changelist(branchref=b, commit_date=ct)
4089 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4090 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004092 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004093 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004094 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004095
Edward Lemur85153282020-02-14 22:06:29 +00004096 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004097
4098 def FormatBranchName(branch, colorize=False):
4099 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4100 an asterisk when it is the current branch."""
4101
4102 asterisk = ""
4103 color = Fore.RESET
4104 if branch == current_branch:
4105 asterisk = "* "
4106 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004107 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004108
4109 if colorize:
4110 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004111 return asterisk + branch_name
4112
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004113 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004114
4115 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004116
4117 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004118 sorted_changes = sorted(changes,
4119 key=lambda c: c.GetCommitDate(),
4120 reverse=True)
4121 else:
4122 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4123 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004124 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004126 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004127 branch_statuses[c.GetBranch()] = status
4128 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004129 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004130 if url and (not status or status == 'error'):
4131 # The issue probably doesn't exist anymore.
4132 url += ' (broken)'
4133
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004134 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004135 # Turn off bold as well as colors.
4136 END = '\033[0m'
4137 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004138 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004139 color = ''
4140 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004141 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004142
Alan Cuttera3be9a52019-03-04 18:50:33 +00004143 branch_display = FormatBranchName(branch)
4144 padding = ' ' * (alignment - len(branch_display))
4145 if not options.no_branch_color:
4146 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004147
Alan Cuttera3be9a52019-03-04 18:50:33 +00004148 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4149 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004150
vapiera7fbd5a2016-06-16 09:17:49 -07004151 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004152 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004153 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004154 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004155 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004156 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004157 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004158 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004160 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004162 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004163 return 0
4164
4165
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004166def colorize_CMDstatus_doc():
4167 """To be called once in main() to add colors to git cl status help."""
4168 colors = [i for i in dir(Fore) if i[0].isupper()]
4169
4170 def colorize_line(line):
4171 for color in colors:
4172 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004173 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004174 indent = len(line) - len(line.lstrip(' ')) + 1
4175 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4176 return line
4177
4178 lines = CMDstatus.__doc__.splitlines()
4179 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4180
4181
phajdan.jre328cf92016-08-22 04:12:17 -07004182def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004183 if path == '-':
4184 json.dump(contents, sys.stdout)
4185 else:
4186 with open(path, 'w') as f:
4187 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004188
4189
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004190@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004191@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004193 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194
4195 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004196 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004197 parser.add_option('-r', '--reverse', action='store_true',
4198 help='Lookup the branch(es) for the specified issues. If '
4199 'no issues are specified, all branches with mapped '
4200 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004201 parser.add_option('--json',
4202 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004203 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204
dnj@chromium.org406c4402015-03-03 17:22:28 +00004205 if options.reverse:
4206 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004207 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004208 # Reverse issue lookup.
4209 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004210
4211 git_config = {}
4212 for config in RunGit(['config', '--get-regexp',
4213 r'branch\..*issue']).splitlines():
4214 name, _space, val = config.partition(' ')
4215 git_config[name] = val
4216
dnj@chromium.org406c4402015-03-03 17:22:28 +00004217 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004218 issue = git_config.get(
4219 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004220 if issue:
4221 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004222 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004223 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004224 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004225 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004226 try:
4227 issue_num = int(issue)
4228 except ValueError:
4229 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004231 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004232 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004233 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004234 if options.json:
4235 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004236 return 0
4237
4238 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004239 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004240 if not issue.valid:
4241 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4242 'or no argument to list it.\n'
4243 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004244 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004245 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004246 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004247 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004248 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4249 if options.json:
4250 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004251 'gerrit_host': cl.GetGerritHost(),
4252 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004253 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004254 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004255 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 return 0
4257
4258
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004259@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004260def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004261 """Shows or posts review comments for any changelist."""
4262 parser.add_option('-a', '--add-comment', dest='comment',
4263 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004264 parser.add_option('-p', '--publish', action='store_true',
4265 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004266 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004267 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004268 parser.add_option('-m', '--machine-readable', dest='readable',
4269 action='store_false', default=True,
4270 help='output comments in a format compatible with '
4271 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004272 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004273 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004274 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004275
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 issue = None
4277 if options.issue:
4278 try:
4279 issue = int(options.issue)
4280 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004281 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004282
Edward Lemur934836a2019-09-09 20:16:54 +00004283 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004284
4285 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004286 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004287 return 0
4288
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004289 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4290 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004291 for comment in summary:
4292 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004293 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004294 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004295 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004296 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004297 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004298 elif comment.autogenerated:
4299 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300 else:
4301 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004302 print('\n%s%s %s%s\n%s' % (
4303 color,
4304 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4305 comment.sender,
4306 Fore.RESET,
4307 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4308
smut@google.comc85ac942015-09-15 16:34:43 +00004309 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004310 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004311 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004312 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4313 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004314 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004315 return 0
4316
4317
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004318@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004319@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004320def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004321 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004322 parser.add_option('-d', '--display', action='store_true',
4323 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004324 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004325 help='New description to set for this issue (- for stdin, '
4326 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004327 parser.add_option('-f', '--force', action='store_true',
4328 help='Delete any unpublished Gerrit edits for this issue '
4329 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004330
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004331 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004332
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004333 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004335 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004336 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004337 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004338
Edward Lemur934836a2019-09-09 20:16:54 +00004339 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004340 if target_issue_arg:
4341 kwargs['issue'] = target_issue_arg.issue
4342 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004343
4344 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004345 if not cl.GetIssue():
4346 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004347
Edward Lemur678a6842019-10-03 22:25:05 +00004348 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004349 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004350
Edward Lemur6c6827c2020-02-06 21:15:18 +00004351 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004352
smut@google.com34fb6b12015-07-13 20:03:26 +00004353 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004354 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004355 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004356
4357 if options.new_description:
4358 text = options.new_description
4359 if text == '-':
4360 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004361 elif text == '+':
4362 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004363 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004364
4365 description.set_description(text)
4366 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004367 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004368 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004369 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004370 return 0
4371
4372
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004373@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004374def CMDlint(parser, args):
4375 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004376 parser.add_option('--filter', action='append', metavar='-x,+y',
4377 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004378 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004379
4380 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004381 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004382 try:
4383 import cpplint
4384 import cpplint_chromium
4385 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004387 return 1
4388
4389 # Change the current working directory before calling lint so that it
4390 # shows the correct base.
4391 previous_cwd = os.getcwd()
4392 os.chdir(settings.GetRoot())
4393 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004394 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004395 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004396 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004397 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004398 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004400 # Process cpplint arguments, if any.
4401 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4402 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004403 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004404
Lei Zhang379d1ad2020-07-15 19:40:06 +00004405 include_regex = re.compile(settings.GetLintRegex())
4406 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4408 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004409 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004410 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004411 continue
4412
4413 if ignore_regex.match(filename):
4414 print('Ignoring file %s' % filename)
4415 continue
4416
4417 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4418 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004419 finally:
4420 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004421 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004422 if cpplint._cpplint_state.error_count != 0:
4423 return 1
4424 return 0
4425
4426
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004427@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004429 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004430 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004431 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004432 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004433 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004434 parser.add_option('--all', action='store_true',
4435 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004436 parser.add_option('--files',
4437 nargs=1,
4438 help='Semicolon-separated list of files to be marked as '
4439 'modified when executing presubmit or post-upload hooks. '
4440 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004441 parser.add_option('--parallel', action='store_true',
4442 help='Run all tests specified by input_api.RunTests in all '
4443 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004444 parser.add_option('--resultdb', action='store_true',
4445 help='Run presubmit checks in the ResultSink environment '
4446 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004447 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004448 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004449
sbc@chromium.org71437c02015-04-09 19:29:40 +00004450 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004451 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004452 return 1
4453
Edward Lemur934836a2019-09-09 20:16:54 +00004454 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455 if args:
4456 base_branch = args[0]
4457 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004458 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004459 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004461 start = time.time()
4462 try:
4463 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4464 description = cl.FetchDescription()
4465 else:
4466 description = _create_description_from_log([base_branch])
4467 except Exception as e:
4468 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004469 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004470 elapsed = time.time() - start
4471 if elapsed > 5:
4472 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004473
Bruce Dawson13acea32022-05-03 22:13:08 +00004474 if not base_branch:
4475 if not options.force:
4476 print('use --force to check even when not on a branch.')
4477 return 1
4478 base_branch = 'HEAD'
4479
Josip Sokcevic017544d2022-03-31 23:47:53 +00004480 cl.RunHook(committing=not options.upload,
4481 may_prompt=False,
4482 verbose=options.verbose,
4483 parallel=options.parallel,
4484 upstream=base_branch,
4485 description=description,
4486 all_files=options.all,
4487 files=options.files,
4488 resultdb=options.resultdb,
4489 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004490 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004491
4492
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004493def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004494 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004495
4496 Works the same way as
4497 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4498 but can be called on demand on all platforms.
4499
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004500 The basic idea is to generate git hash of a state of the tree, original
4501 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004502 """
4503 lines = []
4504 tree_hash = RunGitSilent(['write-tree'])
4505 lines.append('tree %s' % tree_hash.strip())
4506 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4507 if code == 0:
4508 lines.append('parent %s' % parent.strip())
4509 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4510 lines.append('author %s' % author.strip())
4511 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4512 lines.append('committer %s' % committer.strip())
4513 lines.append('')
4514 # Note: Gerrit's commit-hook actually cleans message of some lines and
4515 # whitespace. This code is not doing this, but it clearly won't decrease
4516 # entropy.
4517 lines.append(message)
4518 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004519 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004520 return 'I%s' % change_hash.strip()
4521
4522
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004523def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004524 """Computes the remote branch ref to use for the CL.
4525
4526 Args:
4527 remote (str): The git remote for the CL.
4528 remote_branch (str): The git remote branch for the CL.
4529 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004530 """
4531 if not (remote and remote_branch):
4532 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004533
wittman@chromium.org455dc922015-01-26 20:15:50 +00004534 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004535 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004536 # refs, which are then translated into the remote full symbolic refs
4537 # below.
4538 if '/' not in target_branch:
4539 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4540 else:
4541 prefix_replacements = (
4542 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4543 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4544 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4545 )
4546 match = None
4547 for regex, replacement in prefix_replacements:
4548 match = re.search(regex, target_branch)
4549 if match:
4550 remote_branch = target_branch.replace(match.group(0), replacement)
4551 break
4552 if not match:
4553 # This is a branch path but not one we recognize; use as-is.
4554 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004555 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004556 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004557 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004558 # Handle the refs that need to land in different refs.
4559 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004560
wittman@chromium.org455dc922015-01-26 20:15:50 +00004561 # Create the true path to the remote branch.
4562 # Does the following translation:
4563 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004564 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004565 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4566 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4567 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4568 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4569 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4570 'refs/heads/')
4571 elif remote_branch.startswith('refs/remotes/branch-heads'):
4572 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004573
wittman@chromium.org455dc922015-01-26 20:15:50 +00004574 return remote_branch
4575
4576
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004577def cleanup_list(l):
4578 """Fixes a list so that comma separated items are put as individual items.
4579
4580 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4581 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4582 """
4583 items = sum((i.split(',') for i in l), [])
4584 stripped_items = (i.strip() for i in items)
4585 return sorted(filter(None, stripped_items))
4586
4587
Aaron Gable4db38df2017-11-03 14:59:07 -07004588@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004589@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004590def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004591 """Uploads the current changelist to codereview.
4592
4593 Can skip dependency patchset uploads for a branch by running:
4594 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004595 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004596 git config --unset branch.branch_name.skip-deps-uploads
4597 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004598
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004599 If the name of the checked out branch starts with "bug-" or "fix-" followed
4600 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004601 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004602
4603 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004604 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004605 [git-cl] add support for hashtags
4606 Foo bar: implement foo
4607 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004608 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004609 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4610 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004611 parser.add_option('--bypass-watchlists', action='store_true',
4612 dest='bypass_watchlists',
4613 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004614 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004615 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004616 parser.add_option('--message', '-m', dest='message',
4617 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004618 parser.add_option('-b', '--bug',
4619 help='pre-populate the bug number(s) for this issue. '
4620 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004621 parser.add_option('--message-file', dest='message_file',
4622 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004623 parser.add_option('--title', '-t', dest='title',
4624 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004625 parser.add_option('-T', '--skip-title', action='store_true',
4626 dest='skip_title',
4627 help='Use the most recent commit message as the title of '
4628 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004629 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004630 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004631 help='reviewer email addresses')
4632 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004633 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004634 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004635 parser.add_option('--hashtag', dest='hashtags',
4636 action='append', default=[],
4637 help=('Gerrit hashtag for new CL; '
4638 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004639 parser.add_option('-s',
4640 '--send-mail',
4641 '--send-email',
4642 dest='send_mail',
4643 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004644 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004645 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004646 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004647 metavar='TARGET',
4648 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004649 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004650 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004651 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004652 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004653 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004654 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004655 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004656 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4657 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004658 parser.add_option('-c',
4659 '--use-commit-queue',
4660 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004661 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004662 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004663 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004664 parser.add_option('-d', '--cq-dry-run',
4665 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004666 help='Send the patchset to do a CQ dry run right after '
4667 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004668 parser.add_option(
4669 '-q',
4670 '--cq-quick-run',
4671 action='store_true',
4672 default=False,
4673 help='Send the patchset to do a CQ quick run right after '
4674 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4675 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004676 parser.add_option('--set-bot-commit', action='store_true',
4677 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004678 parser.add_option('--preserve-tryjobs', action='store_true',
4679 help='instruct the CQ to let tryjobs running even after '
4680 'new patchsets are uploaded instead of canceling '
4681 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004682 parser.add_option('--dependencies', action='store_true',
4683 help='Uploads CLs of all the local branches that depend on '
4684 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004685 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4686 help='Sends your change to the CQ after an approval. Only '
4687 'works on repos that have the Auto-Submit label '
4688 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004689 parser.add_option('--parallel', action='store_true',
4690 help='Run all tests specified by input_api.RunTests in all '
4691 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004692 parser.add_option('--no-autocc', action='store_true',
4693 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004694 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004695 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004696 parser.add_option('-R', '--retry-failed', action='store_true',
4697 help='Retry failed tryjobs from old patchset immediately '
4698 'after uploading new patchset. Cannot be used with '
4699 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004700 parser.add_option('--fixed', '-x',
4701 help='List of bugs that will be commented on and marked '
4702 'fixed (pre-populates "Fixed:" tag). Same format as '
4703 '-b option / "Bug:" tag. If fixing several issues, '
4704 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004705 parser.add_option('--edit-description', action='store_true', default=False,
4706 help='Modify description before upload. Cannot be used '
4707 'with --force. It is a noop when --no-squash is set '
4708 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004709 parser.add_option('--git-completion-helper', action="store_true",
4710 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004711 parser.add_option('-o',
4712 '--push-options',
4713 action='append',
4714 default=[],
4715 help='Transmit the given string to the server when '
4716 'performing git push (pass-through). See git-push '
4717 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004718 parser.add_option('--no-add-changeid',
4719 action='store_true',
4720 dest='no_add_changeid',
4721 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004722 parser.add_option('--no-python2-post-upload-hooks',
4723 action='store_true',
4724 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004725 parser.add_option('--cherry-pick-stacked',
4726 '--cp',
4727 dest='cherry_pick_stacked',
4728 action='store_true',
4729 help='If parent branch has un-uploaded updates, '
4730 'automatically skip parent branches and just upload '
4731 'the current branch cherry-pick on its parent\'s last '
4732 'uploaded commit. Allows users to skip the potential '
4733 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004734 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004735
rmistry@google.com2dd99862015-06-22 12:22:18 +00004736 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004737 (options, args) = parser.parse_args(args)
4738
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004739 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004740 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4741 if opt.help != optparse.SUPPRESS_HELP))
4742 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004743
sbc@chromium.org71437c02015-04-09 19:29:40 +00004744 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004745 return 1
4746
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004747 options.reviewers = cleanup_list(options.reviewers)
4748 options.cc = cleanup_list(options.cc)
4749
Josipe827b0f2020-01-30 00:07:20 +00004750 if options.edit_description and options.force:
4751 parser.error('Only one of --force and --edit-description allowed')
4752
tandriib80458a2016-06-23 12:20:07 -07004753 if options.message_file:
4754 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004755 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004756 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004757
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004758 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004759 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004760 options.use_commit_queue,
4761 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004762 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4763 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004764
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004765 if options.skip_title and options.title:
4766 parser.error('Only one of --title and --skip-title allowed.')
4767
Aaron Gableedbc4132017-09-11 13:22:28 -07004768 if options.use_commit_queue:
4769 options.send_mail = True
4770
Edward Lesmes0dd54822020-03-26 18:24:25 +00004771 if options.squash is None:
4772 # Load default for user, repo, squash=true, in this order.
4773 options.squash = settings.GetSquashGerritUploads()
4774
Joanna Wangb54d0f02023-02-24 23:10:19 +00004775 if options.squash and os.environ.get('DOGFOOD_STACKED_CHANGES') == '1':
Joanna Wangdd12deb2023-01-26 20:43:28 +00004776 if options.dependencies:
4777 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004778
Joanna Wangd75fc882023-03-01 21:53:34 +00004779 if options.cherry_pick_stacked:
4780 try:
4781 orig_args.remove('--cherry-pick-stacked')
4782 except ValueError:
4783 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004784 UploadAllSquashed(options, orig_args)
4785 return 0
4786
Joanna Wangd75fc882023-03-01 21:53:34 +00004787 if options.cherry_pick_stacked:
4788 parser.error('--cherry-pick-stacked is not available for this workflow.')
4789
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004790 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004791 # 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
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004797 if options.retry_failed and not cl.GetIssue():
4798 print('No previous patchsets, so --retry-failed has no effect.')
4799 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004800
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004801 # cl.GetMostRecentPatchset uses cached information, and can return the last
4802 # patchset before upload. Calling it here makes it clear that it's the
4803 # last patchset before upload. Note that GetMostRecentPatchset will fail
4804 # if no CL has been uploaded yet.
4805 if options.retry_failed:
4806 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004807
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004808 ret = cl.CMDUpload(options, args, orig_args)
4809
4810 if options.retry_failed:
4811 if ret != 0:
4812 print('Upload failed, so --retry-failed has no effect.')
4813 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004814 builds, _ = _fetch_latest_builds(cl,
4815 DEFAULT_BUILDBUCKET_HOST,
4816 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004817 jobs = _filter_failed_for_retry(builds)
4818 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004819 print('No failed tryjobs, so --retry-failed has no effect.')
4820 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004821 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004822
4823 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004824
4825
Joanna Wang18de1f62023-01-21 01:24:24 +00004826def UploadAllSquashed(options, orig_args):
4827 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4828 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004829 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004830
Joanna Wangc710e2d2023-01-25 14:53:22 +00004831 # Create commits.
4832 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4833 if cherry_pick_current:
4834 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4835 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4836 uploads_by_cl.append((cls[0], new_upload))
4837 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004838 ordered_cls = list(reversed(cls))
4839
Joanna Wang6215dd02023-02-07 15:58:03 +00004840 parent = None
4841 origin = '.'
4842 cl = ordered_cls[0]
4843 branch = cl.GetBranch()
4844 while origin == '.':
4845 # Search for cl's closest ancestor with a gerrit hash.
4846 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4847 if origin == '.':
4848 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4849 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch,
4850 GERRIT_SQUASH_HASH_CONFIG_KEY)
4851 if parent:
4852 break
4853 branch = upstream_branch
4854 else:
4855 # Either the root of the tree is the cl's direct parent and the while
4856 # loop above only found empty branches between cl and the root of the
4857 # tree.
4858 parent = cl.GetCommonAncestorWithUpstream()
4859
Joanna Wangc710e2d2023-01-25 14:53:22 +00004860 for i, cl in enumerate(ordered_cls):
4861 # If we're in the middle of the stack, set end_commit to downstream's
4862 # direct ancestor.
4863 if i + 1 < len(ordered_cls):
4864 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4865 else:
4866 child_base_commit = None
4867 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004868 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004869 end_commit=child_base_commit)
4870 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004871 parent = new_upload.commit_to_push
4872
4873 # Create refspec options
4874 cl, new_upload = uploads_by_cl[-1]
4875 refspec_opts = cl._GetRefSpecOptions(
4876 options,
4877 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004878 multi_change_upload=len(uploads_by_cl) > 1,
4879 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004880 refspec_suffix = ''
4881 if refspec_opts:
4882 refspec_suffix = '%' + ','.join(refspec_opts)
4883 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4884 refspec_suffix)
4885
4886 remote, remote_branch = cl.GetRemoteBranch()
4887 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4888 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4889 refspec_suffix)
4890
4891 # Git push
4892 git_push_metadata = {
4893 'gerrit_host':
4894 cl.GetGerritHost(),
4895 'title':
4896 options.title or '<untitled>',
4897 'change_id':
4898 git_footers.get_footer_change_id(new_upload.change_desc.description),
4899 'description':
4900 new_upload.change_desc.description,
4901 }
4902 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
4903 git_push_metadata)
4904
4905 # Post push updates
4906 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4907 change_numbers = [
4908 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4909 ]
4910
4911 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4912 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4913
4914 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004915
4916
4917def _UploadAllPrecheck(options, orig_args):
4918 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4919 """Checks the state of the tree and gives the user uploading options
4920
4921 Returns: A tuple of the ordered list of changes that have new commits
4922 since their last upload and a boolean of whether the user wants to
4923 cherry-pick and upload the current branch instead of uploading all cls.
4924 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004925 cl = Changelist()
4926 if cl.GetBranch() is None:
4927 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4928
Joanna Wang18de1f62023-01-21 01:24:24 +00004929 branch_ref = None
4930 cls = []
4931 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004932 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004933
4934 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4935
4936 while True:
4937 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4938 DieWithError(
4939 'More than %s branches in the stack have not been uploaded.\n'
4940 'Are your branches in a misconfigured state?\n'
4941 'If not, please upload some upstream changes first.' %
4942 (_MAX_STACKED_BRANCHES_UPLOAD))
4943
4944 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004945
Joanna Wang6215dd02023-02-07 15:58:03 +00004946 # Only add CL if it has anything to commit.
4947 base_commit = cl.GetCommonAncestorWithUpstream()
4948 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4949
4950 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4951 if diff:
4952 cls.append(cl)
4953 if (not first_pass and
4954 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4955 # We are mid-stack and the user must upload their upstream branches.
4956 must_upload_upstream = True
4957 elif first_pass: # The current branch has nothing to commit. Exit.
4958 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4959 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4960 first_pass = False
4961
4962 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004963 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004964 branch_ref = upstream_branch_ref # set branch for next run.
4965
Joanna Wang6215dd02023-02-07 15:58:03 +00004966 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4967 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4968 upstream_branch,
4969 LAST_UPLOAD_HASH_CONFIG_KEY)
4970
Joanna Wang18de1f62023-01-21 01:24:24 +00004971 # Case 1: We've reached the beginning of the tree.
4972 if origin != '.':
4973 break
4974
Joanna Wang18de1f62023-01-21 01:24:24 +00004975 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00004976 # the user MUST upload them unless they are empty. Continue to
4977 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00004978 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00004979 continue
4980
Joanna Wang18de1f62023-01-21 01:24:24 +00004981 # Case 3: If upstream's last_upload == cl.base_commit we do
4982 # not need to upload any more upstreams from this point on.
4983 # (Even if there may be diverged branches higher up the tree)
4984 if base_commit == upstream_last_upload:
4985 break
4986
4987 # Case 4: If upstream's last_upload < cl.base_commit we are
4988 # uploading cl and upstream_cl.
4989 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004990 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004991 continue
4992
4993 # Case 5: If cl.base_commit < upstream's last_upload the user
4994 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004995 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004996 DieWithError(
4997 'At least one branch in the stack has diverged from its upstream '
4998 'branch and does not contain its upstream\'s last upload.\n'
4999 'Please rebase the stack with `git rebase-update` before uploading.')
5000
5001 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5002 # any relation to commits in the tree. Continue up the tree until we hit
5003 # the root.
5004
5005 # We assume all cls in the stack have the same auth requirements and only
5006 # check this once.
5007 cls[0].EnsureAuthenticated(force=options.force)
5008
5009 cherry_pick = False
5010 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005011 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005012 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005013 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005014 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005016 msg = ('At least one parent branch in `%s` has never been uploaded '
5017 'and must be uploaded before/with `%s`.\n' %
5018 (branches, cls[1].branch))
5019 if options.cherry_pick_stacked:
5020 DieWithError(msg)
5021 if not options.force:
5022 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005023 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005024 if options.cherry_pick_stacked:
5025 print('cherry-picking `%s` on %s\'s last upload' %
5026 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005027 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005028 elif not options.force:
5029 answer = gclient_utils.AskForData(
5030 '\n' + opt_message +
5031 'Press enter to update branches %s.\nOr type `n` to upload only '
5032 '`%s` cherry-picked on %s\'s last upload:' %
5033 (branches, cls[0].branch, cls[1].branch))
5034 if answer.lower() == 'n':
5035 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005036 return cls, cherry_pick
5037
5038
Francois Dorayd42c6812017-05-30 15:10:20 -04005039@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005040@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005041def CMDsplit(parser, args):
5042 """Splits a branch into smaller branches and uploads CLs.
5043
5044 Creates a branch and uploads a CL for each group of files modified in the
5045 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005046 comment, the string '$directory', is replaced with the directory containing
5047 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005048 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005049 parser.add_option('-d', '--description', dest='description_file',
5050 help='A text file containing a CL description in which '
5051 '$directory will be replaced by each CL\'s directory.')
5052 parser.add_option('-c', '--comment', dest='comment_file',
5053 help='A text file containing a CL comment.')
5054 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005055 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005056 help='List the files and reviewers for each CL that would '
5057 'be created, but don\'t create branches or CLs.')
5058 parser.add_option('--cq-dry-run', action='store_true',
5059 help='If set, will do a cq dry run for each uploaded CL. '
5060 'Please be careful when doing this; more than ~10 CLs '
5061 'has the potential to overload our build '
5062 'infrastructure. Try to upload these not during high '
5063 'load times (usually 11-3 Mountain View time). Email '
5064 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005065 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5066 default=True,
5067 help='Sends your change to the CQ after an approval. Only '
5068 'works on repos that have the Auto-Submit label '
5069 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005070 parser.add_option('--max-depth',
5071 type='int',
5072 default=0,
5073 help='The max depth to look for OWNERS files. Useful for '
5074 'controlling the granularity of the split CLs, e.g. '
5075 '--max-depth=1 will only split by top-level '
5076 'directory. Specifying a value less than 1 means no '
5077 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005078 options, _ = parser.parse_args(args)
5079
5080 if not options.description_file:
5081 parser.error('No --description flag specified.')
5082
5083 def WrappedCMDupload(args):
5084 return CMDupload(OptionParser(), args)
5085
Daniel Cheng403c44e2022-10-05 22:24:58 +00005086 return split_cl.SplitCl(options.description_file, options.comment_file,
5087 Changelist, WrappedCMDupload, options.dry_run,
5088 options.cq_dry_run, options.enable_auto_submit,
5089 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005090
5091
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005092@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005093@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005094def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005095 """DEPRECATED: Used to commit the current changelist via git-svn."""
5096 message = ('git-cl no longer supports committing to SVN repositories via '
5097 'git-svn. You probably want to use `git cl land` instead.')
5098 print(message)
5099 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005100
5101
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005102@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005103@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005104def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005105 """Commits the current changelist via git.
5106
5107 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5108 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005109 """
5110 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5111 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005112 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005113 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005114 parser.add_option('--parallel', action='store_true',
5115 help='Run all tests specified by input_api.RunTests in all '
5116 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005117 parser.add_option('--resultdb', action='store_true',
5118 help='Run presubmit checks in the ResultSink environment '
5119 'and send results to the ResultDB database.')
5120 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005121 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005122
Edward Lemur934836a2019-09-09 20:16:54 +00005123 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005124
Robert Iannucci2e73d432018-03-14 01:10:47 -07005125 if not cl.GetIssue():
5126 DieWithError('You must upload the change first to Gerrit.\n'
5127 ' If you would rather have `git cl land` upload '
5128 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005129 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5130 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005131
5132
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005133@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005134@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005135def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005136 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005137 parser.add_option('-b', dest='newbranch',
5138 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005139 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005140 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005141 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005142 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005143
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005144 group = optparse.OptionGroup(
5145 parser,
5146 'Options for continuing work on the current issue uploaded from a '
5147 'different clone (e.g. different machine). Must be used independently '
5148 'from the other options. No issue number should be specified, and the '
5149 'branch must have an issue number associated with it')
5150 group.add_option('--reapply', action='store_true', dest='reapply',
5151 help='Reset the branch and reapply the issue.\n'
5152 'CAUTION: This will undo any local changes in this '
5153 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005154
5155 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005156 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005157 parser.add_option_group(group)
5158
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005159 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005160
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005161 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005162 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005163 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005164 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005165 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005166
Edward Lemur934836a2019-09-09 20:16:54 +00005167 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005168 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005169 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005170
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005171 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005172 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005173 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005174
5175 RunGit(['reset', '--hard', upstream])
5176 if options.pull:
5177 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005178
Edward Lemur678a6842019-10-03 22:25:05 +00005179 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005180 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5181 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005182
5183 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005184 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005185
Edward Lemurf38bc172019-09-03 21:02:13 +00005186 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005187 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005188 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005189
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005190 # We don't want uncommitted changes mixed up with the patch.
5191 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005192 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005193
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005194 if options.newbranch:
5195 if options.force:
5196 RunGit(['branch', '-D', options.newbranch],
5197 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005198 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005199
Edward Lemur678a6842019-10-03 22:25:05 +00005200 cl = Changelist(
5201 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005202
Edward Lemur678a6842019-10-03 22:25:05 +00005203 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005204 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005205
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005206 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5207 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208
5209
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005210def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005211 """Fetches the tree status and returns either 'open', 'closed',
5212 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005213 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005214 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005215 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005216 if status.find('closed') != -1 or status == '0':
5217 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005218
5219 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005220 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005221
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005222 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223 return 'unset'
5224
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005225
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226def GetTreeStatusReason():
5227 """Fetches the tree status from a json url and returns the message
5228 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005229 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005230 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005231 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005232 status = json.loads(connection.read())
5233 connection.close()
5234 return status['message']
5235
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005236
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005237@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005238def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005239 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005240 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241 status = GetTreeStatus()
5242 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005243 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005244 return 2
5245
vapiera7fbd5a2016-06-16 09:17:49 -07005246 print('The tree is %s' % status)
5247 print()
5248 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005249 if status != 'open':
5250 return 1
5251 return 0
5252
5253
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005254@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005255def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005256 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5257 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005258 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005259 '-b', '--bot', action='append',
5260 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5261 'times to specify multiple builders. ex: '
5262 '"-b win_rel -b win_layout". See '
5263 'the try server waterfall for the builders name and the tests '
5264 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005265 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005266 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005267 help=('Buildbucket bucket to send the try requests. Format: '
5268 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005269 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005270 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005271 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005272 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005273 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005274 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005275 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005276 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005277 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005278 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005279 '-q',
5280 '--quick-run',
5281 action='store_true',
5282 default=False,
5283 help='trigger in quick run mode '
5284 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5285 'uick_run.md) (chromium only).')
5286 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005287 '--category', default='git_cl_try', help='Specify custom build category.')
5288 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005289 '--project',
5290 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005291 'in recipe to determine to which repository or directory to '
5292 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005293 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005294 '-p', '--property', dest='properties', action='append', default=[],
5295 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005296 'key2=value2 etc. The value will be treated as '
5297 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005298 'NOTE: using this may make your tryjob not usable for CQ, '
5299 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005300 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005301 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5302 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005303 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005304 parser.add_option(
5305 '-R', '--retry-failed', action='store_true', default=False,
5306 help='Retry failed jobs from the latest set of tryjobs. '
5307 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005308 parser.add_option(
5309 '-i', '--issue', type=int,
5310 help='Operate on this issue instead of the current branch\'s implicit '
5311 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005312 options, args = parser.parse_args(args)
5313
machenbach@chromium.org45453142015-09-15 08:45:22 +00005314 # Make sure that all properties are prop=value pairs.
5315 bad_params = [x for x in options.properties if '=' not in x]
5316 if bad_params:
5317 parser.error('Got properties with missing "=": %s' % bad_params)
5318
maruel@chromium.org15192402012-09-06 12:38:29 +00005319 if args:
5320 parser.error('Unknown arguments: %s' % args)
5321
Edward Lemur934836a2019-09-09 20:16:54 +00005322 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005323 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005324 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005325
Edward Lemurf38bc172019-09-03 21:02:13 +00005326 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005327 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005328
tandriie113dfd2016-10-11 10:20:12 -07005329 error_message = cl.CannotTriggerTryJobReason()
5330 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005331 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005332
Edward Lemur45768512020-03-02 19:03:14 +00005333 if options.bot:
5334 if options.retry_failed:
5335 parser.error('--bot is not compatible with --retry-failed.')
5336 if not options.bucket:
5337 parser.error('A bucket (e.g. "chromium/try") is required.')
5338
5339 triggered = [b for b in options.bot if 'triggered' in b]
5340 if triggered:
5341 parser.error(
5342 'Cannot schedule builds on triggered bots: %s.\n'
5343 'This type of bot requires an initial job from a parent (usually a '
5344 'builder). Schedule a job on the parent instead.\n' % triggered)
5345
5346 if options.bucket.startswith('.master'):
5347 parser.error('Buildbot masters are not supported.')
5348
5349 project, bucket = _parse_bucket(options.bucket)
5350 if project is None or bucket is None:
5351 parser.error('Invalid bucket: %s.' % options.bucket)
5352 jobs = sorted((project, bucket, bot) for bot in options.bot)
5353 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005354 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005355 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005356 if options.verbose:
5357 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005358 jobs = _filter_failed_for_retry(builds)
5359 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005360 print('There are no failed jobs in the latest set of jobs '
5361 '(patchset #%d), doing nothing.' % patchset)
5362 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005363 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005364 if num_builders > 10:
5365 confirm_or_exit('There are %d builders with failed builds.'
5366 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005367 elif options.quick_run:
5368 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5369 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005370 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005371 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005372 print('git cl try with no bots now defaults to CQ dry run.')
5373 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5374 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005375
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005376 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005377 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005378 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005379 except BuildbucketResponseException as ex:
5380 print('ERROR: %s' % ex)
5381 return 1
5382 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005383
5384
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005385@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005386def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005387 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005388 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005389 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005390 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005391 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005392 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005393 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005394 '--color', action='store_true', default=setup_color.IS_TTY,
5395 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005396 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005397 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5398 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005399 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005400 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005401 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005402 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005403 parser.add_option(
5404 '-i', '--issue', type=int,
5405 help='Operate on this issue instead of the current branch\'s implicit '
5406 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005407 options, args = parser.parse_args(args)
5408 if args:
5409 parser.error('Unrecognized args: %s' % ' '.join(args))
5410
Edward Lemur934836a2019-09-09 20:16:54 +00005411 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005412 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005413 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005414
tandrii221ab252016-10-06 08:12:04 -07005415 patchset = options.patchset
5416 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005417 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005418 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005419 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005420 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005421 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005422 cl.GetIssue())
5423
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005424 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005425 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005426 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005427 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005428 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005429 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005430 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005431 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005432 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005433 return 0
5434
5435
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005436@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005437@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005438def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005439 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005440 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005441 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005442 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005443
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005444 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005445 if args:
5446 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005447 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005448 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005449 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005450 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005451
5452 # Clear configured merge-base, if there is one.
5453 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005454 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005455 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005456 return 0
5457
5458
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005459@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005460def CMDweb(parser, args):
5461 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005462 parser.add_option('-p',
5463 '--print-only',
5464 action='store_true',
5465 dest='print_only',
5466 help='Only print the Gerrit URL, don\'t open it in the '
5467 'browser.')
5468 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005469 if args:
5470 parser.error('Unrecognized args: %s' % ' '.join(args))
5471
5472 issue_url = Changelist().GetIssueURL()
5473 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005474 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005475 return 1
5476
Orr Bernstein0b960582022-12-22 20:16:18 +00005477 if options.print_only:
5478 print(issue_url)
5479 return 0
5480
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005481 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005482 # allows us to hide the "Created new window in existing browser session."
5483 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005484 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005485 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005486 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005487 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005488 os.open(os.devnull, os.O_RDWR)
5489 try:
5490 webbrowser.open(issue_url)
5491 finally:
5492 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005493 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005494 return 0
5495
5496
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005497@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005498def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005499 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005500 parser.add_option('-d', '--dry-run', action='store_true',
5501 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005502 parser.add_option(
5503 '-q',
5504 '--quick-run',
5505 action='store_true',
5506 help='trigger in quick run mode '
5507 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5508 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005509 parser.add_option('-c', '--clear', action='store_true',
5510 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005511 parser.add_option(
5512 '-i', '--issue', type=int,
5513 help='Operate on this issue instead of the current branch\'s implicit '
5514 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005515 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005516 if args:
5517 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005518 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5519 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005520
Edward Lemur934836a2019-09-09 20:16:54 +00005521 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005522 if not cl.GetIssue():
5523 parser.error('Must upload the issue first.')
5524
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005525 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005526 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005527 elif options.quick_run:
5528 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005529 elif options.dry_run:
5530 state = _CQState.DRY_RUN
5531 else:
5532 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005533 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005534 return 0
5535
5536
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005537@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005538def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005539 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005540 parser.add_option(
5541 '-i', '--issue', type=int,
5542 help='Operate on this issue instead of the current branch\'s implicit '
5543 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005544 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005545 if args:
5546 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005547 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005548 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005549 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005550 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005551 cl.CloseIssue()
5552 return 0
5553
5554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005555@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005556def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005557 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005558 parser.add_option(
5559 '--stat',
5560 action='store_true',
5561 dest='stat',
5562 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005563 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005564 if args:
5565 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005566
Edward Lemur934836a2019-09-09 20:16:54 +00005567 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005568 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005569 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005570 if not issue:
5571 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005572
Gavin Makbe2e9262022-11-08 23:41:55 +00005573 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005574 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005575 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005576 if not base:
5577 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5578 revision_info = detail['revisions'][detail['current_revision']]
5579 fetch_info = revision_info['fetch']['http']
5580 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5581 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005582
Aaron Gablea718c3e2017-08-28 17:47:28 -07005583 cmd = ['git', 'diff']
5584 if options.stat:
5585 cmd.append('--stat')
5586 cmd.append(base)
5587 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005588
5589 return 0
5590
5591
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005592@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005593def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005594 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005595 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005596 '--ignore-current',
5597 action='store_true',
5598 help='Ignore the CL\'s current reviewers and start from scratch.')
5599 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005600 '--ignore-self',
5601 action='store_true',
5602 help='Do not consider CL\'s author as an owners.')
5603 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005604 '--no-color',
5605 action='store_true',
5606 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005607 parser.add_option(
5608 '--batch',
5609 action='store_true',
5610 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005611 # TODO: Consider moving this to another command, since other
5612 # git-cl owners commands deal with owners for a given CL.
5613 parser.add_option(
5614 '--show-all',
5615 action='store_true',
5616 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005617 options, args = parser.parse_args(args)
5618
Edward Lemur934836a2019-09-09 20:16:54 +00005619 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005620 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005621
Yang Guo6e269a02019-06-26 11:17:02 +00005622 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005623 if len(args) == 0:
5624 print('No files specified for --show-all. Nothing to do.')
5625 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005626 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005627 for path in args:
5628 print('Owners for %s:' % path)
5629 print('\n'.join(
5630 ' - %s' % owner
5631 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005632 return 0
5633
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005634 if args:
5635 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005636 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005637 base_branch = args[0]
5638 else:
5639 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005640 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005641
Edward Lemur2c62b332020-03-12 22:12:33 +00005642 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005643
5644 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005645 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5646 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005647 return 0
5648
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005649 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005650 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005651 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005652 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005653 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005654 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005655 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005656
5657
Aiden Bennerc08566e2018-10-03 17:52:42 +00005658def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005659 """Generates a diff command."""
5660 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005661 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5662
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005663 if allow_prefix:
5664 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5665 # case that diff.noprefix is set in the user's git config.
5666 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5667 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005668 diff_cmd += ['--no-prefix']
5669
5670 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005671
5672 if args:
5673 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005674 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005675 diff_cmd.append(arg)
5676 else:
5677 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005678
5679 return diff_cmd
5680
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005681
Jamie Madill5e96ad12020-01-13 16:08:35 +00005682def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5683 """Runs clang-format-diff and sets a return value if necessary."""
5684
5685 if not clang_diff_files:
5686 return 0
5687
5688 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5689 # formatted. This is used to block during the presubmit.
5690 return_value = 0
5691
5692 # Locate the clang-format binary in the checkout
5693 try:
5694 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5695 except clang_format.NotFoundError as e:
5696 DieWithError(e)
5697
5698 if opts.full or settings.GetFormatFullByDefault():
5699 cmd = [clang_format_tool]
5700 if not opts.dry_run and not opts.diff:
5701 cmd.append('-i')
5702 if opts.dry_run:
5703 for diff_file in clang_diff_files:
5704 with open(diff_file, 'r') as myfile:
5705 code = myfile.read().replace('\r\n', '\n')
5706 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5707 stdout = stdout.replace('\r\n', '\n')
5708 if opts.diff:
5709 sys.stdout.write(stdout)
5710 if code != stdout:
5711 return_value = 2
5712 else:
5713 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5714 if opts.diff:
5715 sys.stdout.write(stdout)
5716 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005717 try:
5718 script = clang_format.FindClangFormatScriptInChromiumTree(
5719 'clang-format-diff.py')
5720 except clang_format.NotFoundError as e:
5721 DieWithError(e)
5722
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005723 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005724 if not opts.dry_run and not opts.diff:
5725 cmd.append('-i')
5726
5727 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005728 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005729
Edward Lesmes89624cd2020-04-06 17:51:56 +00005730 env = os.environ.copy()
5731 env['PATH'] = (
5732 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5733 stdout = RunCommand(
5734 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005735 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005736 if opts.diff:
5737 sys.stdout.write(stdout)
5738 if opts.dry_run and len(stdout) > 0:
5739 return_value = 2
5740
5741 return return_value
5742
5743
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005744def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5745 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5746 presubmit checks have failed (and returns 0 otherwise)."""
5747
5748 if not rust_diff_files:
5749 return 0
5750
5751 # Locate the rustfmt binary.
5752 try:
5753 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5754 except rustfmt.NotFoundError as e:
5755 DieWithError(e)
5756
5757 # TODO(crbug.com/1231317): Support formatting only the changed lines
5758 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5759 # https://github.com/emilio/rustfmt-format-diff
5760 cmd = [rustfmt_tool]
5761 if opts.dry_run:
5762 cmd.append('--check')
5763 cmd += rust_diff_files
5764 rustfmt_exitcode = subprocess2.call(cmd)
5765
5766 if opts.presubmit and rustfmt_exitcode != 0:
5767 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005768
5769 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005770
5771
Olivier Robin0a6b5442022-04-07 07:25:04 +00005772def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5773 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5774 that presubmit checks have failed (and returns 0 otherwise)."""
5775
5776 if not swift_diff_files:
5777 return 0
5778
5779 # Locate the swift-format binary.
5780 try:
5781 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5782 except swift_format.NotFoundError as e:
5783 DieWithError(e)
5784
5785 cmd = [swift_format_tool]
5786 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005787 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005788 else:
5789 cmd += ['format', '-i']
5790 cmd += swift_diff_files
5791 swift_format_exitcode = subprocess2.call(cmd)
5792
5793 if opts.presubmit and swift_format_exitcode != 0:
5794 return 2
5795
5796 return 0
5797
5798
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005799def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005800 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005801 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005802
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005803
enne@chromium.org555cfe42014-01-29 18:21:39 +00005804@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005805@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005806def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005807 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005808 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005809 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005810 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005811 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005812 parser.add_option('--full', action='store_true',
5813 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005814 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005815 parser.add_option('--dry-run', action='store_true',
5816 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005817 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005818 '--no-clang-format',
5819 dest='clang_format',
5820 action='store_false',
5821 default=True,
5822 help='Disables formatting of various file types using clang-format.')
5823 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005824 '--python',
5825 action='store_true',
5826 default=None,
5827 help='Enables python formatting on all python files.')
5828 parser.add_option(
5829 '--no-python',
5830 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005831 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005832 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005833 'If neither --python or --no-python are set, python files that have a '
5834 '.style.yapf file in an ancestor directory will be formatted. '
5835 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005836 parser.add_option(
5837 '--js',
5838 action='store_true',
5839 help='Format javascript code with clang-format. '
5840 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005841 parser.add_option('--diff', action='store_true',
5842 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005843 parser.add_option('--presubmit', action='store_true',
5844 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005845
5846 parser.add_option('--rust-fmt',
5847 dest='use_rust_fmt',
5848 action='store_true',
5849 default=rustfmt.IsRustfmtSupported(),
5850 help='Enables formatting of Rust file types using rustfmt.')
5851 parser.add_option(
5852 '--no-rust-fmt',
5853 dest='use_rust_fmt',
5854 action='store_false',
5855 help='Disables formatting of Rust file types using rustfmt.')
5856
Olivier Robin0a6b5442022-04-07 07:25:04 +00005857 parser.add_option(
5858 '--swift-format',
5859 dest='use_swift_format',
5860 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005861 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005862 help='Enables formatting of Swift file types using swift-format '
5863 '(macOS host only).')
5864 parser.add_option(
5865 '--no-swift-format',
5866 dest='use_swift_format',
5867 action='store_false',
5868 help='Disables formatting of Swift file types using swift-format.')
5869
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005870 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005871
Garrett Beaty91a6f332020-01-06 16:57:24 +00005872 if opts.python is not None and opts.no_python:
5873 raise parser.error('Cannot set both --python and --no-python')
5874 if opts.no_python:
5875 opts.python = False
5876
Daniel Chengc55eecf2016-12-30 03:11:02 -08005877 # Normalize any remaining args against the current path, so paths relative to
5878 # the current directory are still resolved as expected.
5879 args = [os.path.join(os.getcwd(), arg) for arg in args]
5880
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005881 # git diff generates paths against the root of the repository. Change
5882 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005883 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005884 if rel_base_path:
5885 os.chdir(rel_base_path)
5886
digit@chromium.org29e47272013-05-17 17:01:46 +00005887 # Grab the merge-base commit, i.e. the upstream commit of the current
5888 # branch when it was created or the last time it was rebased. This is
5889 # to cover the case where the user may have called "git fetch origin",
5890 # moving the origin branch to a newer commit, but hasn't rebased yet.
5891 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005892 upstream_branch = opts.upstream
5893 if not upstream_branch:
5894 cl = Changelist()
5895 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005896 if upstream_branch:
5897 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5898 upstream_commit = upstream_commit.strip()
5899
5900 if not upstream_commit:
5901 DieWithError('Could not find base commit for this branch. '
5902 'Are you in detached state?')
5903
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005904 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5905 diff_output = RunGit(changed_files_cmd)
5906 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005907 # Filter out files deleted by this CL
5908 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005909
Andreas Haas417d89c2020-02-06 10:24:27 +00005910 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005911 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005912
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005913 clang_diff_files = []
5914 if opts.clang_format:
5915 clang_diff_files = [
5916 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5917 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005918 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005919 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005920 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005921 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005922
Edward Lesmes50da7702020-03-30 19:23:43 +00005923 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005924
Jamie Madill5e96ad12020-01-13 16:08:35 +00005925 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5926 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005927
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005928 if opts.use_rust_fmt:
5929 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5930 upstream_commit)
5931 if rust_fmt_return_value == 2:
5932 return_value = 2
5933
Olivier Robin0a6b5442022-04-07 07:25:04 +00005934 if opts.use_swift_format:
5935 if sys.platform != 'darwin':
5936 DieWithError('swift-format is only supported on macOS.')
5937 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5938 upstream_commit)
5939 if swift_format_return_value == 2:
5940 return_value = 2
5941
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005942 # Similar code to above, but using yapf on .py files rather than clang-format
5943 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005944 py_explicitly_disabled = opts.python is not None and not opts.python
5945 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005946 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5947 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005948
Aiden Bennerc08566e2018-10-03 17:52:42 +00005949 # Used for caching.
5950 yapf_configs = {}
5951 for f in python_diff_files:
5952 # Find the yapf style config for the current file, defaults to depot
5953 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005954 _FindYapfConfigFile(f, yapf_configs, top_dir)
5955
5956 # Turn on python formatting by default if a yapf config is specified.
5957 # This breaks in the case of this repo though since the specified
5958 # style file is also the global default.
5959 if opts.python is None:
5960 filtered_py_files = []
5961 for f in python_diff_files:
5962 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5963 filtered_py_files.append(f)
5964 else:
5965 filtered_py_files = python_diff_files
5966
5967 # Note: yapf still seems to fix indentation of the entire file
5968 # even if line ranges are specified.
5969 # See https://github.com/google/yapf/issues/499
5970 if not opts.full and filtered_py_files:
5971 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5972
Brian Sheedyb4307d52019-12-02 19:18:17 +00005973 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5974 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5975 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005976
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005977 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005978 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5979 # Default to pep8 if not .style.yapf is found.
5980 if not yapf_style:
5981 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005982
Peter Wend9399922020-06-17 17:33:49 +00005983 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005984 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005985 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005986 else:
5987 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005988
5989 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005990
5991 has_formattable_lines = False
5992 if not opts.full:
5993 # Only run yapf over changed line ranges.
5994 for diff_start, diff_len in py_line_diffs[f]:
5995 diff_end = diff_start + diff_len - 1
5996 # Yapf errors out if diff_end < diff_start but this
5997 # is a valid line range diff for a removal.
5998 if diff_end >= diff_start:
5999 has_formattable_lines = True
6000 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6001 # If all line diffs were removals we have nothing to format.
6002 if not has_formattable_lines:
6003 continue
6004
6005 if opts.diff or opts.dry_run:
6006 cmd += ['--diff']
6007 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006008 stdout = RunCommand(cmd,
6009 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006010 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006011 cwd=top_dir,
6012 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006013 if opts.diff:
6014 sys.stdout.write(stdout)
6015 elif len(stdout) > 0:
6016 return_value = 2
6017 else:
6018 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006019 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006020
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006021 # Format GN build files. Always run on full build files for canonical form.
6022 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006023 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006024 if opts.dry_run or opts.diff:
6025 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006026 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006027 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006028 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006029 cwd=top_dir)
6030 if opts.dry_run and gn_ret == 2:
6031 return_value = 2 # Not formatted.
6032 elif opts.diff and gn_ret == 2:
6033 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006034 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006035 elif gn_ret != 0:
6036 # For non-dry run cases (and non-2 return values for dry-run), a
6037 # nonzero error code indicates a failure, probably because the file
6038 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006039 DieWithError('gn format failed on ' + gn_diff_file +
6040 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006041
Ilya Shermane081cbe2017-08-15 17:51:04 -07006042 # Skip the metrics formatting from the global presubmit hook. These files have
6043 # a separate presubmit hook that issues an error if the files need formatting,
6044 # whereas the top-level presubmit script merely issues a warning. Formatting
6045 # these files is somewhat slow, so it's important not to duplicate the work.
6046 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006047 for diff_xml in GetDiffXMLs(diff_files):
6048 xml_dir = GetMetricsDir(diff_xml)
6049 if not xml_dir:
6050 continue
6051
Ilya Shermane081cbe2017-08-15 17:51:04 -07006052 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006053 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006054 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006055
6056 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6057 # command as histograms/pretty_print.py now needs a relative path argument
6058 # after splitting the histograms into multiple directories.
6059 # For example, in tools/metrics/ukm, pretty-print could be run using:
6060 # $ python pretty_print.py
6061 # But in tools/metrics/histogrmas, pretty-print should be run with an
6062 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006063 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006064 # $ python pretty_print.py enums.xml
6065
Weilun Shib92c4b72020-08-27 17:45:11 +00006066 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006067 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006068 cmd.append(diff_xml)
6069
Ilya Shermane081cbe2017-08-15 17:51:04 -07006070 if opts.dry_run or opts.diff:
6071 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006072
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006073 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6074 # `shell` param and instead replace `'vpython'` with
6075 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006076 stdout = RunCommand(cmd,
6077 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006078 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006079 if opts.diff:
6080 sys.stdout.write(stdout)
6081 if opts.dry_run and stdout:
6082 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006083
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006084 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006085
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006086
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006087def GetDiffXMLs(diff_files):
6088 return [
6089 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6090 ]
6091
6092
6093def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006094 metrics_xml_dirs = [
6095 os.path.join('tools', 'metrics', 'actions'),
6096 os.path.join('tools', 'metrics', 'histograms'),
6097 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006098 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006099 os.path.join('tools', 'metrics', 'ukm'),
6100 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006101 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006102 if diff_xml.startswith(xml_dir):
6103 return xml_dir
6104 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006105
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006106
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006107@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006108@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006109def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006110 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006111 _, args = parser.parse_args(args)
6112
6113 if len(args) != 1:
6114 parser.print_help()
6115 return 1
6116
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006117 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006118 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006119 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006120
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006121 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006122
Edward Lemur52969c92020-02-06 18:15:28 +00006123 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006124 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006125 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006126
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006127 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006128 for key, issue in [x.split() for x in output.splitlines()]:
6129 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006130 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006131
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006132 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006133 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006134 return 1
6135 if len(branches) == 1:
6136 RunGit(['checkout', branches[0]])
6137 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006138 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006139 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006140 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006141 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006142 try:
6143 RunGit(['checkout', branches[int(which)]])
6144 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006145 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006146 return 1
6147
6148 return 0
6149
6150
maruel@chromium.org29404b52014-09-08 22:58:00 +00006151def CMDlol(parser, args):
6152 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006153 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006154 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6155 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6156 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006157 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006158 return 0
6159
6160
Josip Sokcevic0399e172022-03-21 23:11:51 +00006161def CMDversion(parser, args):
Josip Sokcevic0399e172022-03-21 23:11:51 +00006162 print(utils.depot_tools_version())
6163
6164
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006165class OptionParser(optparse.OptionParser):
6166 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006167
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006168 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006169 optparse.OptionParser.__init__(
6170 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006171 self.add_option(
6172 '-v', '--verbose', action='count', default=0,
6173 help='Use 2 times for more debugging info')
6174
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006175 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006176 try:
6177 return self._parse_args(args)
6178 finally:
6179 # Regardless of success or failure of args parsing, we want to report
6180 # metrics, but only after logging has been initialized (if parsing
6181 # succeeded).
6182 global settings
6183 settings = Settings()
6184
Edward Lesmes9c349062021-05-06 20:02:39 +00006185 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006186 # GetViewVCUrl ultimately calls logging method.
6187 project_url = settings.GetViewVCUrl().strip('/+')
6188 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6189 metrics.collector.add('project_urls', [project_url])
6190
6191 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006192 # Create an optparse.Values object that will store only the actual passed
6193 # options, without the defaults.
6194 actual_options = optparse.Values()
6195 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6196 # Create an optparse.Values object with the default options.
6197 options = optparse.Values(self.get_default_values().__dict__)
6198 # Update it with the options passed by the user.
6199 options._update_careful(actual_options.__dict__)
6200 # Store the options passed by the user in an _actual_options attribute.
6201 # We store only the keys, and not the values, since the values can contain
6202 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006203 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006204
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006205 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006206 logging.basicConfig(
6207 level=levels[min(options.verbose, len(levels) - 1)],
6208 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6209 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006210
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006211 return options, args
6212
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006213
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006214def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006215 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006216 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006217 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006218 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006219
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006220 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006221 dispatcher = subcommand.CommandDispatcher(__name__)
6222 try:
6223 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006224 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006225 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006226 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006227 if e.code != 500:
6228 raise
6229 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006230 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006231 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006232 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006233
6234
6235if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006236 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6237 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006238 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006239 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006240 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006241 sys.exit(main(sys.argv[1:]))