blob: 57519296f4b6459e35f8d88824167b61b15ffea4 [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
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000071PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000072
73# When collecting traces, Git hashes will be reduced to 6 characters to reduce
74# the size after compression.
75GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
76# Used to redact the cookies from the gitcookies file.
77GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
78
Edward Lemurd4d1ba42019-09-20 21:46:37 +000079MAX_ATTEMPTS = 3
80
Edward Lemur1b52d872019-05-09 21:12:12 +000081# The maximum number of traces we will keep. Multiplied by 3 since we store
82# 3 files per trace.
83MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000084# Message to be displayed to the user to inform where to find the traces for a
85# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000086TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000087'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000088'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000089' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000090'Copies of your gitcookies file and git config have been recorded at:\n'
91' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000092# Format of the message to be stored as part of the traces to give developers a
93# better context when they go through traces.
94TRACES_README_FORMAT = (
95'Date: %(now)s\n'
96'\n'
97'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
98'Title: %(title)s\n'
99'\n'
100'%(description)s\n'
101'\n'
102'Execution time: %(execution_time)s\n'
103'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000104
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000112DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
113DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
114
thestig@chromium.org44202a22014-03-11 19:22:18 +0000115# Valid extensions for files we want to lint.
116DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
117DEFAULT_LINT_IGNORE_REGEX = r"$^"
118
Aiden Bennerc08566e2018-10-03 17:52:42 +0000119# File name for yapf style config files.
120YAPF_CONFIG_FILENAME = '.style.yapf'
121
Edward Lesmes50da7702020-03-30 19:23:43 +0000122# The issue, patchset and codereview server are stored on git config for each
123# branch under branch.<branch-name>.<config-key>.
124ISSUE_CONFIG_KEY = 'gerritissue'
125PATCHSET_CONFIG_KEY = 'gerritpatchset'
126CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
127
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000128# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000129Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131# Initialized in main()
132settings = None
133
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100134# Used by tests/git_cl_test.py to add extra logging.
135# Inside the weirdly failing test, add this:
136# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700137# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100138_IS_BEING_TESTED = False
139
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000140
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000141_KNOWN_GERRIT_TO_SHORT_URLS = {
142 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
143 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
144}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000145assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
146 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000147
148
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000149class GitPushError(Exception):
150 pass
151
152
Christopher Lamf732cd52017-01-24 12:40:11 +1100153def DieWithError(message, change_desc=None):
154 if change_desc:
155 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000156 print('\n ** Content of CL description **\n' +
157 '='*72 + '\n' +
158 change_desc.description + '\n' +
159 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100160
vapiera7fbd5a2016-06-16 09:17:49 -0700161 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162 sys.exit(1)
163
164
Christopher Lamf732cd52017-01-24 12:40:11 +1100165def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000166 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000167 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000168 with open(backup_path, 'wb') as backup_file:
169 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100170
171
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000172def GetNoGitPagerEnv():
173 env = os.environ.copy()
174 # 'cat' is a magical git string that disables pagers on all platforms.
175 env['GIT_PAGER'] = 'cat'
176 return env
177
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000178
bsep@chromium.org627d9002016-04-29 00:00:52 +0000179def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000180 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000181 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
182 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000183 except subprocess2.CalledProcessError as e:
184 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000185 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000186 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
187 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000188 out = e.stdout.decode('utf-8', 'replace')
189 if e.stderr:
190 out += e.stderr.decode('utf-8', 'replace')
191 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000192
193
194def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000195 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000196 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000197
198
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000199def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000200 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700201 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000202 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700203 else:
204 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000205 try:
tandrii5d48c322016-08-18 16:19:37 -0700206 (out, _), code = subprocess2.communicate(['git'] + args,
207 env=GetNoGitPagerEnv(),
208 stdout=subprocess2.PIPE,
209 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000210 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700211 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900212 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000213 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000214
215
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000216def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000217 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000218 return RunGitWithCode(args, suppress_stderr=True)[1]
219
220
tandrii2a16b952016-10-19 07:09:44 -0700221def time_sleep(seconds):
222 # Use this so that it can be mocked in tests without interfering with python
223 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700224 return time.sleep(seconds)
225
226
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000227def time_time():
228 # Use this so that it can be mocked in tests without interfering with python
229 # system machinery.
230 return time.time()
231
232
Edward Lemur1b52d872019-05-09 21:12:12 +0000233def datetime_now():
234 # Use this so that it can be mocked in tests without interfering with python
235 # system machinery.
236 return datetime.datetime.now()
237
238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100239def confirm_or_exit(prefix='', action='confirm'):
240 """Asks user to press enter to continue or press Ctrl+C to abort."""
241 if not prefix or prefix.endswith('\n'):
242 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100243 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100244 mid = ' Press'
245 elif prefix.endswith(' '):
246 mid = 'press'
247 else:
248 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000249 gclient_utils.AskForData(
250 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100251
252
253def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000254 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000255 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100256 while True:
257 if 'yes'.startswith(result):
258 return True
259 if 'no'.startswith(result):
260 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000261 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100262
263
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000265 prop_list = getattr(options, 'properties', [])
266 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000267 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000268 try:
269 properties[key] = json.loads(val)
270 except ValueError:
271 pass # If a value couldn't be evaluated, treat it as a string.
272 return properties
273
274
Edward Lemur4c707a22019-09-24 21:13:43 +0000275def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000276 """Calls a buildbucket v2 method and returns the parsed json response."""
277 headers = {
278 'Accept': 'application/json',
279 'Content-Type': 'application/json',
280 }
281 request = json.dumps(request)
282 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
283
284 logging.info('POST %s with %s' % (url, request))
285
286 attempts = 1
287 time_to_sleep = 1
288 while True:
289 response, content = http.request(url, 'POST', body=request, headers=headers)
290 if response.status == 200:
291 return json.loads(content[4:])
292 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
293 msg = '%s error when calling POST %s with %s: %s' % (
294 response.status, url, request, content)
295 raise BuildbucketResponseException(msg)
296 logging.debug(
297 '%s error when calling POST %s with %s. '
298 'Sleeping for %d seconds and retrying...' % (
299 response.status, url, request, time_to_sleep))
300 time.sleep(time_to_sleep)
301 time_to_sleep *= 2
302 attempts += 1
303
304 assert False, 'unreachable'
305
306
Edward Lemur6215c792019-10-03 21:59:05 +0000307def _parse_bucket(raw_bucket):
308 legacy = True
309 project = bucket = None
310 if '/' in raw_bucket:
311 legacy = False
312 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000313 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000314 elif raw_bucket.startswith('luci.'):
315 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000316 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000317 elif '.' in raw_bucket:
318 project = raw_bucket.split('.')[0]
319 bucket = raw_bucket
320 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000321 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000322 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
323 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000324
325
Quinten Yearsley777660f2020-03-04 23:37:06 +0000326def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000327 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700328
329 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000330 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000331 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700332 options: Command-line options.
333 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000335 for project, bucket, builder in jobs:
336 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 print('To see results here, run: git cl try-results')
338 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700339
Quinten Yearsley777660f2020-03-04 23:37:06 +0000340 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 if not requests:
342 return
343
Edward Lemur5b929a42019-10-21 17:57:39 +0000344 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000345 http.force_exception_to_status_code = True
346
347 batch_request = {'requests': requests}
348 batch_response = _call_buildbucket(
349 http, options.buildbucket_host, 'Batch', batch_request)
350
351 errors = [
352 ' ' + response['error']['message']
353 for response in batch_response.get('responses', [])
354 if 'error' in response
355 ]
356 if errors:
357 raise BuildbucketResponseException(
358 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
359
360
Quinten Yearsley777660f2020-03-04 23:37:06 +0000361def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000362 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000363 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000364 shared_properties = {
365 'category': options.ensure_value('category', 'git_cl_try')
366 }
367 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 shared_properties['clobber'] = True
369 shared_properties.update(_get_properties_from_options(options) or {})
370
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000371 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000372 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000373 shared_tags.append({'key': 'retry_failed',
374 'value': '1'})
375
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000376 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000377 for (project, bucket, builder) in jobs:
378 properties = shared_properties.copy()
379 if 'presubmit' in builder.lower():
380 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381
Edward Lemur45768512020-03-02 19:03:14 +0000382 requests.append({
383 'scheduleBuild': {
384 'requestId': str(uuid.uuid4()),
385 'builder': {
386 'project': getattr(options, 'project', None) or project,
387 'bucket': bucket,
388 'builder': builder,
389 },
390 'gerritChanges': gerrit_changes,
391 'properties': properties,
392 'tags': [
393 {'key': 'builder', 'value': builder},
394 ] + shared_tags,
395 }
396 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000397
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000398 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000399 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000400 requests[-1]['scheduleBuild']['gitilesCommit'] = {
401 'host': gerrit_changes[0]['host'],
402 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000403 'id': options.revision,
404 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000405 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000406
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000407 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000408
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000409
Quinten Yearsley777660f2020-03-04 23:37:06 +0000410def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000411 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000412
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000413 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000414 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000415 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000416 request = {
417 'predicate': {
418 'gerritChanges': [changelist.GetGerritChange(patchset)],
419 },
420 'fields': ','.join('builds.*.' + field for field in fields),
421 }
tandrii221ab252016-10-06 08:12:04 -0700422
Edward Lemur5b929a42019-10-21 17:57:39 +0000423 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000424 if authenticator.has_cached_credentials():
425 http = authenticator.authorize(httplib2.Http())
426 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700427 print('Warning: Some results might be missing because %s' %
428 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000429 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000430 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431 http.force_exception_to_status_code = True
432
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000433 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
434 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000435
Edward Lemur45768512020-03-02 19:03:14 +0000436
Edward Lemur5b929a42019-10-21 17:57:39 +0000437def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000438 """Fetches builds from the latest patchset that has builds (within
439 the last few patchsets).
440
441 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000442 changelist (Changelist): The CL to fetch builds for
443 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000444 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
445 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000446 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000447 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
448 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000449 """
450 assert buildbucket_host
451 assert changelist.GetIssue(), 'CL must be uploaded first'
452 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000453 if latest_patchset is None:
454 assert changelist.GetMostRecentPatchset()
455 ps = changelist.GetMostRecentPatchset()
456 else:
457 assert latest_patchset > 0, latest_patchset
458 ps = latest_patchset
459
Quinten Yearsley983111f2019-09-26 17:18:48 +0000460 min_ps = max(1, ps - 5)
461 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000462 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000463 if len(builds):
464 return builds, ps
465 ps -= 1
466 return [], 0
467
468
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000469def _filter_failed_for_retry(all_builds):
470 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000471
472 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000473 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000474 i.e. a list of buildbucket.v2.Builds which includes status and builder
475 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000476
477 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000478 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000479 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000480 """
Edward Lemur45768512020-03-02 19:03:14 +0000481 grouped = {}
482 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000483 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000484 key = (builder['project'], builder['bucket'], builder['builder'])
485 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000486
Edward Lemur45768512020-03-02 19:03:14 +0000487 jobs = []
488 for (project, bucket, builder), builds in grouped.items():
489 if 'triggered' in builder:
490 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
491 'from a parent. Please schedule a manual job for the parent '
492 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000493 continue
494 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
495 # Don't retry if any are running.
496 continue
Edward Lemur45768512020-03-02 19:03:14 +0000497 # If builder had several builds, retry only if the last one failed.
498 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
499 # build, but in case of retrying failed jobs retrying a flaky one makes
500 # sense.
501 builds = sorted(builds, key=lambda b: b['createTime'])
502 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
503 continue
504 # Don't retry experimental build previously triggered by CQ.
505 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
506 for t in builds[-1]['tags']):
507 continue
508 jobs.append((project, bucket, builder))
509
510 # Sort the jobs to make testing easier.
511 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512
513
Quinten Yearsley777660f2020-03-04 23:37:06 +0000514def _print_tryjobs(options, builds):
515 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000517 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 return
519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 longest_builder = max(len(b['builder']['builder']) for b in builds)
521 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000522 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000523 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
524 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000525
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000526 builds_by_status = {}
527 for b in builds:
528 builds_by_status.setdefault(b['status'], []).append({
529 'id': b['id'],
530 'name': name_fmt.format(
531 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
532 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 sort_key = lambda b: (b['name'], b['id'])
535
536 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000537 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000538 if not builds:
539 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000541 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000542 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000543 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 else:
545 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
546
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000547 print(colorize(title))
548 for b in sorted(builds, key=sort_key):
549 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550
551 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 print_builds(
553 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
554 print_builds(
555 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
556 color=Fore.MAGENTA)
557 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
558 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
559 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000560 print_builds('Started:', builds_by_status.pop('STARTED', []),
561 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000562 print_builds(
563 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 print_builds(
566 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000567 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568
569
Aiden Bennerc08566e2018-10-03 17:52:42 +0000570def _ComputeDiffLineRanges(files, upstream_commit):
571 """Gets the changed line ranges for each file since upstream_commit.
572
573 Parses a git diff on provided files and returns a dict that maps a file name
574 to an ordered list of range tuples in the form (start_line, count).
575 Ranges are in the same format as a git diff.
576 """
577 # If files is empty then diff_output will be a full diff.
578 if len(files) == 0:
579 return {}
580
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000581 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000582 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000583 diff_output = RunGit(diff_cmd)
584
585 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
586 # 2 capture groups
587 # 0 == fname of diff file
588 # 1 == 'diff_start,diff_count' or 'diff_start'
589 # will match each of
590 # diff --git a/foo.foo b/foo.py
591 # @@ -12,2 +14,3 @@
592 # @@ -12,2 +17 @@
593 # running re.findall on the above string with pattern will give
594 # [('foo.py', ''), ('', '14,3'), ('', '17')]
595
596 curr_file = None
597 line_diffs = {}
598 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
599 if match[0] != '':
600 # Will match the second filename in diff --git a/a.py b/b.py.
601 curr_file = match[0]
602 line_diffs[curr_file] = []
603 else:
604 # Matches +14,3
605 if ',' in match[1]:
606 diff_start, diff_count = match[1].split(',')
607 else:
608 # Single line changes are of the form +12 instead of +12,1.
609 diff_start = match[1]
610 diff_count = 1
611
612 diff_start = int(diff_start)
613 diff_count = int(diff_count)
614
615 # If diff_count == 0 this is a removal we can ignore.
616 line_diffs[curr_file].append((diff_start, diff_count))
617
618 return line_diffs
619
620
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000621def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622 """Checks if a yapf file is in any parent directory of fpath until top_dir.
623
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000624 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000625 is found returns None. Uses yapf_config_cache as a cache for previously found
626 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000628 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000629 # Return result if we've already computed it.
630 if fpath in yapf_config_cache:
631 return yapf_config_cache[fpath]
632
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000633 parent_dir = os.path.dirname(fpath)
634 if os.path.isfile(fpath):
635 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000636 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000637 # Otherwise fpath is a directory
638 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
639 if os.path.isfile(yapf_file):
640 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000641 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000642 # If we're at the top level directory, or if we're at root
643 # there is no provided style.
644 ret = None
645 else:
646 # Otherwise recurse on the current directory.
647 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000648 yapf_config_cache[fpath] = ret
649 return ret
650
651
Brian Sheedyb4307d52019-12-02 19:18:17 +0000652def _GetYapfIgnorePatterns(top_dir):
653 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000654
655 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
656 but this functionality appears to break when explicitly passing files to
657 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000658 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000659 the .yapfignore file should be in the directory that yapf is invoked from,
660 which we assume to be the top level directory in this case.
661
662 Args:
663 top_dir: The top level directory for the repository being formatted.
664
665 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000666 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000667 """
668 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000669 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000670 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000671 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000672
Anthony Politoc64e3902021-04-30 21:55:25 +0000673 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
674 stripped_line = line.strip()
675 # Comments and blank lines should be ignored.
676 if stripped_line.startswith('#') or stripped_line == '':
677 continue
678 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000679 return ignore_patterns
680
681
682def _FilterYapfIgnoredFiles(filepaths, patterns):
683 """Filters out any filepaths that match any of the given patterns.
684
685 Args:
686 filepaths: An iterable of strings containing filepaths to filter.
687 patterns: An iterable of strings containing fnmatch patterns to filter on.
688
689 Returns:
690 A list of strings containing all the elements of |filepaths| that did not
691 match any of the patterns in |patterns|.
692 """
693 # Not inlined so that tests can use the same implementation.
694 return [f for f in filepaths
695 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000696
697
Aaron Gable13101a62018-02-09 13:20:41 -0800698def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000699 """Prints statistics about the change to the user."""
700 # --no-ext-diff is broken in some versions of Git, so try to work around
701 # this by overriding the environment (but there is still a problem if the
702 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000703 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000704 if 'GIT_EXTERNAL_DIFF' in env:
705 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000706
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000707 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800708 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000709 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000710
711
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000712class BuildbucketResponseException(Exception):
713 pass
714
715
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716class Settings(object):
717 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000718 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000719 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000720 self.tree_status_url = None
721 self.viewvc_url = None
722 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000723 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000724 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000725 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000726 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000727 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000728 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000729
Edward Lemur26964072020-02-19 19:18:51 +0000730 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000731 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000732 if self.updated:
733 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000734
Edward Lemur26964072020-02-19 19:18:51 +0000735 # The only value that actually changes the behavior is
736 # autoupdate = "false". Everything else means "true".
737 autoupdate = (
738 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
739
740 cr_settings_file = FindCodereviewSettingsFile()
741 if autoupdate != 'false' and cr_settings_file:
742 LoadCodereviewSettingsFromFile(cr_settings_file)
743 cr_settings_file.close()
744
745 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 @staticmethod
748 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000749 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000750
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000752 if self.root is None:
753 self.root = os.path.abspath(self.GetRelativeRoot())
754 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000755
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756 def GetTreeStatusUrl(self, error_ok=False):
757 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000758 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
759 if self.tree_status_url is None and not error_ok:
760 DieWithError(
761 'You must configure your tree status URL by running '
762 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 return self.tree_status_url
764
765 def GetViewVCUrl(self):
766 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000767 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 return self.viewvc_url
769
rmistry@google.com90752582014-01-14 21:04:50 +0000770 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000771 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000772
rmistry@google.com5626a922015-02-26 14:03:30 +0000773 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000774 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000775 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000776 return run_post_upload_hook == "True"
777
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000778 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000779 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000780
Dirk Pranke6f0df682021-06-25 00:42:33 +0000781 def GetUsePython3(self):
782 return self._GetConfig('rietveld.use-python3')
783
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000784 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000785 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000786 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000787 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
788 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000789 # Default is squash now (http://crbug.com/611892#c23).
790 self.squash_gerrit_uploads = self._GetConfig(
791 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000792 return self.squash_gerrit_uploads
793
Edward Lesmes4de54132020-05-05 19:41:33 +0000794 def GetSquashGerritUploadsOverride(self):
795 """Return True or False if codereview.settings should be overridden.
796
797 Returns None if no override has been defined.
798 """
799 # See also http://crbug.com/611892#c23
800 result = self._GetConfig('gerrit.override-squash-uploads').lower()
801 if result == 'true':
802 return True
803 if result == 'false':
804 return False
805 return None
806
tandrii@chromium.org28253532016-04-14 13:46:56 +0000807 def GetGerritSkipEnsureAuthenticated(self):
808 """Return True if EnsureAuthenticated should not be done for Gerrit
809 uploads."""
810 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000811 self.gerrit_skip_ensure_authenticated = self._GetConfig(
812 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000813 return self.gerrit_skip_ensure_authenticated
814
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000815 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000816 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000817 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000818 # Git requires single quotes for paths with spaces. We need to replace
819 # them with double quotes for Windows to treat such paths as a single
820 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000821 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000822 return self.git_editor or None
823
thestig@chromium.org44202a22014-03-11 19:22:18 +0000824 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000825 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000826
827 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000828 return self._GetConfig(
829 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000830
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000831 def GetFormatFullByDefault(self):
832 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000833 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000834 result = (
835 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
836 error_ok=True).strip())
837 self.format_full_by_default = (result == 'true')
838 return self.format_full_by_default
839
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000840 def IsStatusCommitOrderByDate(self):
841 if self.is_status_commit_order_by_date is None:
842 result = (RunGit(['config', '--bool', 'cl.date-order'],
843 error_ok=True).strip())
844 self.is_status_commit_order_by_date = (result == 'true')
845 return self.is_status_commit_order_by_date
846
Edward Lemur26964072020-02-19 19:18:51 +0000847 def _GetConfig(self, key, default=''):
848 self._LazyUpdateIfNeeded()
849 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850
851
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000852class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000853 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000854 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000855 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000856 DRY_RUN = 'dry_run'
857 COMMIT = 'commit'
858
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000859 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000860
861
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000862class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000863 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 self.issue = issue
865 self.patchset = patchset
866 self.hostname = hostname
867
868 @property
869 def valid(self):
870 return self.issue is not None
871
872
Edward Lemurf38bc172019-09-03 21:02:13 +0000873def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000874 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
875 fail_result = _ParsedIssueNumberArgument()
876
Edward Lemur678a6842019-10-03 22:25:05 +0000877 if isinstance(arg, int):
878 return _ParsedIssueNumberArgument(issue=arg)
879 if not isinstance(arg, basestring):
880 return fail_result
881
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000882 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000883 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700884
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000885 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000886 if not url.startswith('http'):
887 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000888 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
889 if url.startswith(short_url):
890 url = gerrit_url + url[len(short_url):]
891 break
892
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000893 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000894 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000895 except ValueError:
896 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200897
Alex Turner30ae6372022-01-04 02:32:52 +0000898 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
899 # URL.
900 if not arg.startswith('http') and '.' not in parsed_url.netloc:
901 return fail_result
902
Edward Lemur678a6842019-10-03 22:25:05 +0000903 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
904 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
905 # Short urls like https://domain/<issue_number> can be used, but don't allow
906 # specifying the patchset (you'd 404), but we allow that here.
907 if parsed_url.path == '/':
908 part = parsed_url.fragment
909 else:
910 part = parsed_url.path
911
912 match = re.match(
913 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
914 if not match:
915 return fail_result
916
917 issue = int(match.group('issue'))
918 patchset = match.group('patchset')
919 return _ParsedIssueNumberArgument(
920 issue=issue,
921 patchset=int(patchset) if patchset else None,
922 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000923
924
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000925def _create_description_from_log(args):
926 """Pulls out the commit log to use as a base for the CL description."""
927 log_args = []
928 if len(args) == 1 and not args[0].endswith('.'):
929 log_args = [args[0] + '..']
930 elif len(args) == 1 and args[0].endswith('...'):
931 log_args = [args[0][:-1]]
932 elif len(args) == 2:
933 log_args = [args[0] + '..' + args[1]]
934 else:
935 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000936 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000937
938
Aaron Gablea45ee112016-11-22 15:14:38 -0800939class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700940 def __init__(self, issue, url):
941 self.issue = issue
942 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800943 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700944
945 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800946 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700947 self.issue, self.url)
948
949
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100950_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000951 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100952 # TODO(tandrii): these two aren't known in Gerrit.
953 'approval', 'disapproval'])
954
955
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000956class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000957 """Changelist works with one changelist in local branch.
958
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000959 Notes:
960 * Not safe for concurrent multi-{thread,process} use.
961 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700962 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000963 """
964
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000965 def __init__(self,
966 branchref=None,
967 issue=None,
968 codereview_host=None,
969 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000970 """Create a new ChangeList instance.
971
Edward Lemurf38bc172019-09-03 21:02:13 +0000972 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000973 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000974 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000975 global settings
976 if not settings:
977 # Happens when git_cl.py is used as a utility library.
978 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000979
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000980 self.branchref = branchref
981 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000982 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000983 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000984 else:
985 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000986 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000987 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000988 self.lookedup_issue = False
989 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000990 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000991 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000992 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000993 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800994 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000995 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000996 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000997
Edward Lemur125d60a2019-09-13 18:25:41 +0000998 # Lazily cached values.
999 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1000 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001001 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001002 # Map from change number (issue) to its detail cache.
1003 self._detail_cache = {}
1004
1005 if codereview_host is not None:
1006 assert not codereview_host.startswith('https://'), codereview_host
1007 self._gerrit_host = codereview_host
1008 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001009
Edward Lesmese1576912021-02-16 21:53:34 +00001010 @property
1011 def owners_client(self):
1012 if self._owners_client is None:
1013 remote, remote_branch = self.GetRemoteBranch()
1014 branch = GetTargetRef(remote, remote_branch, None)
1015 self._owners_client = owners_client.GetCodeOwnersClient(
1016 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001017 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001018 host=self.GetGerritHost(),
1019 project=self.GetGerritProject(),
1020 branch=branch)
1021 return self._owners_client
1022
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001023 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001024 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001025
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001026 The return value is a string suitable for passing to git cl with the --cc
1027 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001028 """
1029 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001030 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001031 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001032 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1033 return self.cc
1034
Daniel Cheng7227d212017-11-17 08:12:37 -08001035 def ExtendCC(self, more_cc):
1036 """Extends the list of users to cc on this CL based on the changed files."""
1037 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001039 def GetCommitDate(self):
1040 """Returns the commit date as provided in the constructor"""
1041 return self.commit_date
1042
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001044 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001045 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001046 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001047 if not branchref:
1048 return None
1049 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001050 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 return self.branch
1052
1053 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001054 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 self.GetBranch() # Poke the lazy loader.
1056 return self.branchref
1057
Edward Lemur85153282020-02-14 22:06:29 +00001058 def _GitGetBranchConfigValue(self, key, default=None):
1059 return scm.GIT.GetBranchConfig(
1060 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001061
Edward Lemur85153282020-02-14 22:06:29 +00001062 def _GitSetBranchConfigValue(self, key, value):
1063 action = 'set %s to %r' % (key, value)
1064 if not value:
1065 action = 'unset %s' % key
1066 assert self.GetBranch(), 'a branch is needed to ' + action
1067 return scm.GIT.SetBranchConfig(
1068 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001069
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001070 @staticmethod
1071 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001072 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001073 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001074 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001075 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1076 settings.GetRoot(), branch)
1077 if not remote or not upstream_branch:
1078 DieWithError(
1079 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001080 'Verify this branch is set up to track another \n'
1081 '(via the --track argument to "git checkout -b ..."). \n'
1082 'or pass complete "git diff"-style arguments if supported, like\n'
1083 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001084
1085 return remote, upstream_branch
1086
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001087 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001088 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001089 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001090 DieWithError('The upstream for the current branch (%s) does not exist '
1091 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001092 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001093 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001094
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001095 def GetUpstreamBranch(self):
1096 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001097 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001098 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001099 upstream_branch = upstream_branch.replace('refs/heads/',
1100 'refs/remotes/%s/' % remote)
1101 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1102 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 self.upstream_branch = upstream_branch
1104 return self.upstream_branch
1105
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001106 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001107 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001108 remote, branch = None, self.GetBranch()
1109 seen_branches = set()
1110 while branch not in seen_branches:
1111 seen_branches.add(branch)
1112 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001113 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 if remote != '.' or branch.startswith('refs/remotes'):
1115 break
1116 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001117 remotes = RunGit(['remote'], error_ok=True).split()
1118 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001119 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001120 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001121 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001122 logging.warning('Could not determine which remote this change is '
1123 'associated with, so defaulting to "%s".' %
1124 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001125 else:
Gavin Make6a62332020-12-04 21:57:10 +00001126 logging.warning('Could not determine which remote this change is '
1127 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001128 branch = 'HEAD'
1129 if branch.startswith('refs/remotes'):
1130 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001131 elif branch.startswith('refs/branch-heads/'):
1132 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001133 else:
1134 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001135 return self._remote
1136
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 def GetRemoteUrl(self):
1138 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1139
1140 Returns None if there is no remote.
1141 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001142 is_cached, value = self._cached_remote_url
1143 if is_cached:
1144 return value
1145
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001146 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001147 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001148
Edward Lemur298f2cf2019-02-22 21:40:39 +00001149 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001150 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001151 if host:
1152 self._cached_remote_url = (True, url)
1153 return url
1154
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001155 # If it cannot be parsed as an url, assume it is a local directory,
1156 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001157 logging.warning('"%s" doesn\'t appear to point to a git host. '
1158 'Interpreting it as a local directory.', url)
1159 if not os.path.isdir(url):
1160 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001161 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1162 'but it doesn\'t exist.',
1163 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001164 return None
1165
1166 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001167 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001168
Edward Lemur79d4f992019-11-11 23:49:02 +00001169 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001170 if not host:
1171 logging.error(
1172 'Remote "%(remote)s" for branch "%(branch)s" points to '
1173 '"%(cache_path)s", but it is misconfigured.\n'
1174 '"%(cache_path)s" must be a git repo and must have a remote named '
1175 '"%(remote)s" pointing to the git host.', {
1176 'remote': remote,
1177 'cache_path': cache_path,
1178 'branch': self.GetBranch()})
1179 return None
1180
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001181 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001182 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001183
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001184 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001185 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001186 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001187 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001188 if self.issue is not None:
1189 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001190 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 return self.issue
1192
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001193 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001194 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001195 issue = self.GetIssue()
1196 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001197 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001198 server = self.GetCodereviewServer()
1199 if short:
1200 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1201 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202
Dirk Pranke6f0df682021-06-25 00:42:33 +00001203 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001204 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001205
Edward Lemur6c6827c2020-02-06 21:15:18 +00001206 def FetchDescription(self, pretty=False):
1207 assert self.GetIssue(), 'issue is required to query Gerrit'
1208
Edward Lemur9aa1a962020-02-25 00:58:38 +00001209 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001210 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1211 current_rev = data['current_revision']
1212 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001213
1214 if not pretty:
1215 return self.description
1216
1217 # Set width to 72 columns + 2 space indent.
1218 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1219 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1220 lines = self.description.splitlines()
1221 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
1223 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001224 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001225 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001226 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001227 if self.patchset is not None:
1228 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001229 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230 return self.patchset
1231
Edward Lemur9aa1a962020-02-25 00:58:38 +00001232 def GetAuthor(self):
1233 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1234
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001235 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001236 """Set this branch's patchset. If patchset=0, clears the patchset."""
1237 assert self.GetBranch()
1238 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001239 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001240 else:
1241 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001242 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001243
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001244 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001245 """Set this branch's issue. If issue isn't given, clears the issue."""
1246 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001248 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001249 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001250 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001251 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001252 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001253 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001254 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 else:
tandrii5d48c322016-08-18 16:19:37 -07001256 # Reset all of these just to be clean.
1257 reset_suffixes = [
1258 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001259 ISSUE_CONFIG_KEY,
1260 PATCHSET_CONFIG_KEY,
1261 CODEREVIEW_SERVER_CONFIG_KEY,
1262 'gerritsquashhash',
1263 ]
tandrii5d48c322016-08-18 16:19:37 -07001264 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001265 try:
1266 self._GitSetBranchConfigValue(prop, None)
1267 except subprocess2.CalledProcessError:
1268 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001269 msg = RunGit(['log', '-1', '--format=%B']).strip()
1270 if msg and git_footers.get_footer_change_id(msg):
1271 print('WARNING: The change patched into this branch has a Change-Id. '
1272 'Removing it.')
1273 RunGit(['commit', '--amend', '-m',
1274 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001275 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001276 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001277 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278
Edward Lemur2c62b332020-03-12 22:12:33 +00001279 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001280 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001281 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001282 except subprocess2.CalledProcessError:
1283 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001284 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001285 'This branch probably doesn\'t exist anymore. To reset the\n'
1286 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001287 ' git branch --set-upstream-to origin/main %s\n'
1288 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001289 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001290
dsansomee2d6fd92016-09-08 00:10:47 -07001291 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001292 assert self.GetIssue(), 'issue is required to update description'
1293
1294 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001295 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001296 if not force:
1297 confirm_or_exit(
1298 'The description cannot be modified while the issue has a pending '
1299 'unpublished edit. Either publish the edit in the Gerrit web UI '
1300 'or delete it.\n\n', action='delete the unpublished edit')
1301
1302 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001303 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001304 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001305 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001306 description, notify='NONE')
1307
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001308 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001309
Edward Lemur75526302020-02-27 22:31:05 +00001310 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001311 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001312 '--root', settings.GetRoot(),
1313 '--upstream', upstream,
1314 ]
1315
1316 args.extend(['--verbose'] * verbose)
1317
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001318 remote, remote_branch = self.GetRemoteBranch()
1319 target_ref = GetTargetRef(remote, remote_branch, None)
1320 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1321 args.extend(['--gerrit_project', self.GetGerritProject()])
1322 args.extend(['--gerrit_branch', target_ref])
1323
Edward Lemur99df04e2020-03-05 19:39:43 +00001324 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001325 issue = self.GetIssue()
1326 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001327 if author:
1328 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001329 if issue:
1330 args.extend(['--issue', str(issue)])
1331 if patchset:
1332 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001333
Edward Lemur75526302020-02-27 22:31:05 +00001334 return args
1335
Josip Sokcevic017544d2022-03-31 23:47:53 +00001336 def RunHook(self,
1337 committing,
1338 may_prompt,
1339 verbose,
1340 parallel,
1341 upstream,
1342 description,
1343 all_files,
1344 files=None,
1345 resultdb=False,
1346 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001347 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1348 args = self._GetCommonPresubmitArgs(verbose, upstream)
1349 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001350 if may_prompt:
1351 args.append('--may_prompt')
1352 if parallel:
1353 args.append('--parallel')
1354 if all_files:
1355 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001356 if files:
1357 args.extend(files.split(';'))
1358 args.append('--source_controlled_only')
Edward Lemur227d5102020-02-25 23:45:35 +00001359
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001360 if resultdb and not realm:
1361 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1362 # it is not required to pass the realm flag
1363 print('Note: ResultDB reporting will NOT be performed because --realm'
1364 ' was not specified. To enable ResultDB, please run the command'
1365 ' again with the --realm argument to specify the LUCI realm.')
1366
1367 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1368 use_python3=False)
1369 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1370 use_python3=True)
1371 return self._MergePresubmitResults(py2_results, py3_results)
1372
1373 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1374 args = args[:]
1375 vpython = 'vpython3' if use_python3 else 'vpython'
1376
Edward Lemur227d5102020-02-25 23:45:35 +00001377 with gclient_utils.temporary_file() as description_file:
1378 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001379 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001380 args.extend(['--json_output', json_output])
1381 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001382 if self.GetUsePython3():
1383 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001384 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001385 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001386 if resultdb and realm:
1387 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001388
1389 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001390 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001391
Edward Lemur227d5102020-02-25 23:45:35 +00001392 metrics.collector.add_repeated('sub_commands', {
1393 'command': 'presubmit',
1394 'execution_time': time_time() - start,
1395 'exit_code': exit_code,
1396 })
1397
1398 if exit_code:
1399 sys.exit(exit_code)
1400
1401 json_results = gclient_utils.FileRead(json_output)
1402 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001403
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001404 def _MergePresubmitResults(self, py2_results, py3_results):
1405 return {
1406 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1407 py3_results.get('more_cc', []))),
1408 'errors': (
1409 py2_results.get('errors', []) + py3_results.get('errors', [])),
1410 'notifications': (
1411 py2_results.get('notifications', []) +
1412 py3_results.get('notifications', [])),
1413 'warnings': (
1414 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1415 }
1416
Edward Lemur75526302020-02-27 22:31:05 +00001417 def RunPostUploadHook(self, verbose, upstream, description):
1418 args = self._GetCommonPresubmitArgs(verbose, upstream)
1419 args.append('--post_upload')
1420
1421 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001422 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001423 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001424 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1425 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1426 ['--use-python3'])
1427 p_py2.wait()
1428 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001429
Edward Lemur5a644f82020-03-18 16:44:57 +00001430 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1431 # Get description message for upload.
1432 if self.GetIssue():
1433 description = self.FetchDescription()
1434 elif options.message:
1435 description = options.message
1436 else:
1437 description = _create_description_from_log(git_diff_args)
1438 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001439 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001440
Edward Lemur5a644f82020-03-18 16:44:57 +00001441 bug = options.bug
1442 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001443 if not self.GetIssue():
1444 # Extract bug number from branch name, but only if issue is being created.
1445 # It must start with bug or fix, followed by _ or - and number.
1446 # Optionally, it may contain _ or - after number with arbitrary text.
1447 # Examples:
1448 # bug-123
1449 # bug_123
1450 # fix-123
1451 # fix-123-some-description
1452 match = re.match(
1453 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1454 self.GetBranch())
1455 if not bug and not fixed and match:
1456 if match.group('type') == 'bug':
1457 bug = match.group('bugnum')
1458 else:
1459 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001460
1461 change_description = ChangeDescription(description, bug, fixed)
1462
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001463 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1464 if options.add_owners_to:
1465 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001466 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001467 files, [], options.tbrs + options.reviewers)
1468 missing_files = [
1469 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001470 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001471 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001472 owners = self.owners_client.SuggestOwners(
1473 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001474 if options.add_owners_to == 'TBR':
1475 assert isinstance(options.tbrs, list), options.tbrs
1476 options.tbrs.extend(owners)
1477 else:
1478 assert isinstance(options.reviewers, list), options.reviewers
1479 options.reviewers.extend(owners)
1480
Edward Lemur5a644f82020-03-18 16:44:57 +00001481 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001482 if options.reviewers or options.tbrs:
1483 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001484
1485 return change_description
1486
1487 def _GetTitleForUpload(self, options):
1488 # When not squashing, just return options.title.
1489 if not options.squash:
1490 return options.title
1491
1492 # On first upload, patchset title is always this string, while options.title
1493 # gets converted to first line of message.
1494 if not self.GetIssue():
1495 return 'Initial upload'
1496
1497 # When uploading subsequent patchsets, options.message is taken as the title
1498 # if options.title is not provided.
1499 if options.title:
1500 return options.title
1501 if options.message:
1502 return options.message.strip()
1503
1504 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001505 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001506 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001507 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001508 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001509
1510 # Use the default title if the user confirms the default with a 'y'.
1511 if user_title.lower() == 'y':
1512 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001513 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001514
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515 def CMDUpload(self, options, git_diff_args, orig_args):
1516 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001517 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001519 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001520 else:
1521 if self.GetBranch() is None:
1522 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1523
1524 # Default to diffing against common ancestor of upstream branch
1525 base_branch = self.GetCommonAncestorWithUpstream()
1526 git_diff_args = [base_branch, 'HEAD']
1527
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001528 # Fast best-effort checks to abort before running potentially expensive
1529 # hooks if uploading is likely to fail anyway. Passing these checks does
1530 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001531 self.EnsureAuthenticated(force=options.force)
1532 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533
1534 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001535 watchlist = watchlists.Watchlists(settings.GetRoot())
1536 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001537 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001538 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539
Edward Lemur5a644f82020-03-18 16:44:57 +00001540 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001542 hook_results = self.RunHook(
1543 committing=False,
1544 may_prompt=not options.force,
1545 verbose=options.verbose,
1546 parallel=options.parallel,
1547 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001548 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001549 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001550 resultdb=options.resultdb,
1551 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001552 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553
Aaron Gable13101a62018-02-09 13:20:41 -08001554 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001555 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001556 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001558 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001559 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 # Run post upload hooks, if specified.
1561 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001562 self.RunPostUploadHook(
1563 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001564
1565 # Upload all dependencies if specified.
1566 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001567 print()
1568 print('--dependencies has been specified.')
1569 print('All dependent local branches will be re-uploaded.')
1570 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001571 # Remove the dependencies flag from args so that we do not end up in a
1572 # loop.
1573 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001574 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001575 return ret
1576
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001577 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001578 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001579
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001580 Issue must have been already uploaded and known. Optionally allows for
1581 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001582 """
1583 assert new_state in _CQState.ALL_STATES
1584 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001585 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001586 vote_map = {
1587 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001588 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001589 _CQState.DRY_RUN: 1,
1590 _CQState.COMMIT: 2,
1591 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001592 if new_state == _CQState.QUICK_RUN:
1593 labels = {
1594 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1595 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1596 }
1597 else:
1598 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001599 notify = False if new_state == _CQState.DRY_RUN else None
1600 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001601 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001602 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001603 return 0
1604 except KeyboardInterrupt:
1605 raise
1606 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001607 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001608 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001609 ' * Your project has no CQ,\n'
1610 ' * You don\'t have permission to change the CQ state,\n'
1611 ' * There\'s a bug in this code (see stack trace below).\n'
1612 'Consider specifying which bots to trigger manually or asking your '
1613 'project owners for permissions or contacting Chrome Infra at:\n'
1614 'https://www.chromium.org/infra\n\n' %
1615 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001616 # Still raise exception so that stack trace is printed.
1617 raise
1618
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001619 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001620 # Lazy load of configs.
1621 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001622 if self._gerrit_host and '.' not in self._gerrit_host:
1623 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1624 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001625 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001626 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001627 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001628 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001629 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1630 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001631 return self._gerrit_host
1632
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001633 def _GetGitHost(self):
1634 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001635 remote_url = self.GetRemoteUrl()
1636 if not remote_url:
1637 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001638 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001639
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001640 def GetCodereviewServer(self):
1641 if not self._gerrit_server:
1642 # If we're on a branch then get the server potentially associated
1643 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001644 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001645 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001646 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001647 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001648 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001649 if not self._gerrit_server:
1650 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1651 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001652 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001653 parts[0] = parts[0] + '-review'
1654 self._gerrit_host = '.'.join(parts)
1655 self._gerrit_server = 'https://%s' % self._gerrit_host
1656 return self._gerrit_server
1657
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001658 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001659 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001660 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001661 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001662 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001663 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001664 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001665 if project.endswith('.git'):
1666 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001667 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1668 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1669 # gitiles/git-over-https protocol. E.g.,
1670 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1671 # as
1672 # https://chromium.googlesource.com/v8/v8
1673 if project.startswith('a/'):
1674 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001675 return project
1676
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001677 def _GerritChangeIdentifier(self):
1678 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1679
1680 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001681 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001682 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001683 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001684 if project:
1685 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1686 # Fall back on still unique, but less efficient change number.
1687 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001688
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001689 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001690 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001691 if settings.GetGerritSkipEnsureAuthenticated():
1692 # For projects with unusual authentication schemes.
1693 # See http://crbug.com/603378.
1694 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001695
1696 # Check presence of cookies only if using cookies-based auth method.
1697 cookie_auth = gerrit_util.Authenticator.get()
1698 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001700
Florian Mayerae510e82020-01-30 21:04:48 +00001701 remote_url = self.GetRemoteUrl()
1702 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001703 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001704 return
1705 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001706 logging.warning('Ignoring branch %(branch)s with non-https remote '
1707 '%(remote)s', {
1708 'branch': self.branch,
1709 'remote': self.GetRemoteUrl()
1710 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001711 return
1712
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001713 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001714 self.GetCodereviewServer()
1715 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001716 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001717
1718 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1719 git_auth = cookie_auth.get_auth_header(git_host)
1720 if gerrit_auth and git_auth:
1721 if gerrit_auth == git_auth:
1722 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001723 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001724 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001725 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001726 ' %s\n'
1727 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001728 ' Consider running the following command:\n'
1729 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001730 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001731 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001732 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001733 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001734 cookie_auth.get_new_password_message(git_host)))
1735 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001736 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001737 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001738
1739 missing = (
1740 ([] if gerrit_auth else [self._gerrit_host]) +
1741 ([] if git_auth else [git_host]))
1742 DieWithError('Credentials for the following hosts are required:\n'
1743 ' %s\n'
1744 'These are read from %s (or legacy %s)\n'
1745 '%s' % (
1746 '\n '.join(missing),
1747 cookie_auth.get_gitcookies_path(),
1748 cookie_auth.get_netrc_path(),
1749 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001750
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001751 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001752 if not self.GetIssue():
1753 return
1754
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001755 status = self._GetChangeDetail()['status']
1756 if status in ('MERGED', 'ABANDONED'):
1757 DieWithError('Change %s has been %s, new uploads are not allowed' %
1758 (self.GetIssueURL(),
1759 'submitted' if status == 'MERGED' else 'abandoned'))
1760
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001761 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1762 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1763 # Apparently this check is not very important? Otherwise get_auth_email
1764 # could have been added to other implementations of Authenticator.
1765 cookies_auth = gerrit_util.Authenticator.get()
1766 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001767 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001768
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001769 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001770 if self.GetIssueOwner() == cookies_user:
1771 return
1772 logging.debug('change %s owner is %s, cookies user is %s',
1773 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001774 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001775 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001776 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001777 if details['email'] == self.GetIssueOwner():
1778 return
1779 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001780 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001781 'as %s.\n'
1782 'Uploading may fail due to lack of permissions.' %
1783 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1784 confirm_or_exit(action='upload')
1785
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001787 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001788 or CQ status, assuming adherence to a common workflow.
1789
1790 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001791 * 'error' - error from review tool (including deleted issues)
1792 * 'unsent' - no reviewers added
1793 * 'waiting' - waiting for review
1794 * 'reply' - waiting for uploader to reply to review
1795 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001796 * 'dry-run' - dry-running in the CQ
1797 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001798 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001799 """
1800 if not self.GetIssue():
1801 return None
1802
1803 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001804 data = self._GetChangeDetail([
1805 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001806 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 return 'error'
1808
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001809 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001810 return 'closed'
1811
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001812 cq_label = data['labels'].get('Commit-Queue', {})
1813 max_cq_vote = 0
1814 for vote in cq_label.get('all', []):
1815 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1816 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001818 if max_cq_vote == 1:
1819 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820
Aaron Gable9ab38c62017-04-06 14:36:33 -07001821 if data['labels'].get('Code-Review', {}).get('approved'):
1822 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001823
1824 if not data.get('reviewers', {}).get('REVIEWER', []):
1825 return 'unsent'
1826
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001827 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001828 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001829 while messages:
1830 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001831 if (m.get('tag', '').startswith('autogenerated:cq') or
1832 m.get('tag', '').startswith('autogenerated:cv')):
1833 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001834 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001835 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001836 # Most recent message was by owner.
1837 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001838
1839 # Some reply from non-owner.
1840 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001841
1842 # Somehow there are no messages even though there are reviewers.
1843 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001844
1845 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001846 if not self.GetIssue():
1847 return None
1848
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001849 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001850 patchset = data['revisions'][data['current_revision']]['_number']
1851 self.SetPatchset(patchset)
1852 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001853
Gavin Make61ccc52020-11-13 00:12:57 +00001854 def GetMostRecentDryRunPatchset(self):
1855 """Get patchsets equivalent to the most recent patchset and return
1856 the patchset with the latest dry run. If none have been dry run, return
1857 the latest patchset."""
1858 if not self.GetIssue():
1859 return None
1860
1861 data = self._GetChangeDetail(['ALL_REVISIONS'])
1862 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001863 dry_run = {int(m['_revision_number'])
1864 for m in data.get('messages', [])
1865 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001866
1867 for revision_info in sorted(data.get('revisions', {}).values(),
1868 key=lambda c: c['_number'], reverse=True):
1869 if revision_info['_number'] in dry_run:
1870 patchset = revision_info['_number']
1871 break
1872 if revision_info.get('kind', '') not in \
1873 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1874 break
1875 self.SetPatchset(patchset)
1876 return patchset
1877
Aaron Gable636b13f2017-07-14 10:42:48 -07001878 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001879 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001880 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001881 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001882
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001883 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001884 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001885 # CURRENT_REVISION is included to get the latest patchset so that
1886 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001887 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001888 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1889 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001890 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001891 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001892 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001893 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001894
1895 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001896 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001897 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001898 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001899 line_comments = file_comments.setdefault(path, [])
1900 line_comments.extend(
1901 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001902
1903 # Build dictionary of file comments for easy access and sorting later.
1904 # {author+date: {path: {patchset: {line: url+message}}}}
1905 comments = collections.defaultdict(
1906 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001907
1908 server = self.GetCodereviewServer()
1909 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1910 # /c/ is automatically added by short URL server.
1911 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1912 self.GetIssue())
1913 else:
1914 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1915
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001916 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001917 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 tag = comment.get('tag', '')
1919 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001920 continue
1921 key = (comment['author']['email'], comment['updated'])
1922 if comment.get('side', 'REVISION') == 'PARENT':
1923 patchset = 'Base'
1924 else:
1925 patchset = 'PS%d' % comment['patch_set']
1926 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001927 url = ('%s/%s/%s#%s%s' %
1928 (url_prefix, comment['patch_set'], path,
1929 'b' if comment.get('side') == 'PARENT' else '',
1930 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001931 comments[key][path][patchset][line] = (url, comment['message'])
1932
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001933 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001934 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001935 summary = self._BuildCommentSummary(msg, comments, readable)
1936 if summary:
1937 summaries.append(summary)
1938 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001939
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001940 @staticmethod
1941 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001942 if 'email' not in msg['author']:
1943 # Some bot accounts may not have an email associated.
1944 return None
1945
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001946 key = (msg['author']['email'], msg['date'])
1947 # Don't bother showing autogenerated messages that don't have associated
1948 # file or line comments. this will filter out most autogenerated
1949 # messages, but will keep robot comments like those from Tricium.
1950 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1951 if is_autogenerated and not comments.get(key):
1952 return None
1953 message = msg['message']
1954 # Gerrit spits out nanoseconds.
1955 assert len(msg['date'].split('.')[-1]) == 9
1956 date = datetime.datetime.strptime(msg['date'][:-3],
1957 '%Y-%m-%d %H:%M:%S.%f')
1958 if key in comments:
1959 message += '\n'
1960 for path, patchsets in sorted(comments.get(key, {}).items()):
1961 if readable:
1962 message += '\n%s' % path
1963 for patchset, lines in sorted(patchsets.items()):
1964 for line, (url, content) in sorted(lines.items()):
1965 if line:
1966 line_str = 'Line %d' % line
1967 path_str = '%s:%d:' % (path, line)
1968 else:
1969 line_str = 'File comment'
1970 path_str = '%s:0:' % path
1971 if readable:
1972 message += '\n %s, %s: %s' % (patchset, line_str, url)
1973 message += '\n %s\n' % content
1974 else:
1975 message += '\n%s ' % path_str
1976 message += '\n%s\n' % content
1977
1978 return _CommentSummary(
1979 date=date,
1980 message=message,
1981 sender=msg['author']['email'],
1982 autogenerated=is_autogenerated,
1983 # These could be inferred from the text messages and correlated with
1984 # Code-Review label maximum, however this is not reliable.
1985 # Leaving as is until the need arises.
1986 approval=False,
1987 disapproval=False,
1988 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001989
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001990 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001991 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001992 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001993
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001994 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001995 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001996 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001997
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001998 def _GetChangeDetail(self, options=None):
1999 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002000 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002001 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002002
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002003 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002004 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002005 options.append('CURRENT_COMMIT')
2006
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002007 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002008 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002009 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002010
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002011 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2012 # Assumption: data fetched before with extra options is suitable
2013 # for return for a smaller set of options.
2014 # For example, if we cached data for
2015 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2016 # and request is for options=[CURRENT_REVISION],
2017 # THEN we can return prior cached data.
2018 if options_set.issubset(cached_options_set):
2019 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002020
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002021 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002022 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002023 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002024 except gerrit_util.GerritError as e:
2025 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002026 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002027 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002028
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002029 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002030 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002031
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002032 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002033 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002034 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002035 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002036 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002037 except gerrit_util.GerritError as e:
2038 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002039 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002040 raise
agable32978d92016-11-01 12:55:02 -07002041 return data
2042
Karen Qian40c19422019-03-13 21:28:29 +00002043 def _IsCqConfigured(self):
2044 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002045 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002046
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002047 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002048 if git_common.is_dirty_git_tree('land'):
2049 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002050
tandriid60367b2016-06-22 05:25:12 -07002051 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002052 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002053 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002054 'which can test and land changes for you. '
2055 'Are you sure you wish to bypass it?\n',
2056 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002057 differs = True
tandriic4344b52016-08-29 06:04:54 -07002058 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 # Note: git diff outputs nothing if there is no diff.
2060 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002061 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002062 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063 if detail['current_revision'] == last_upload:
2064 differs = False
2065 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002066 print('WARNING: Local branch contents differ from latest uploaded '
2067 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002068 if differs:
2069 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002070 confirm_or_exit(
2071 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2072 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002073 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002074 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002075 upstream = self.GetCommonAncestorWithUpstream()
2076 if self.GetIssue():
2077 description = self.FetchDescription()
2078 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002079 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002080 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002081 committing=True,
2082 may_prompt=not force,
2083 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002084 parallel=parallel,
2085 upstream=upstream,
2086 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002087 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002088 resultdb=resultdb,
2089 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002090
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002091 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002092 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002093 links = self._GetChangeCommit().get('web_links', [])
2094 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002095 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002096 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002097 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002098 return 0
2099
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002100 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2101 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002102 assert parsed_issue_arg.valid
2103
Edward Lemur125d60a2019-09-13 18:25:41 +00002104 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002105
2106 if parsed_issue_arg.hostname:
2107 self._gerrit_host = parsed_issue_arg.hostname
2108 self._gerrit_server = 'https://%s' % self._gerrit_host
2109
tandriic2405f52016-10-10 08:13:15 -07002110 try:
2111 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002112 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002113 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002114
2115 if not parsed_issue_arg.patchset:
2116 # Use current revision by default.
2117 revision_info = detail['revisions'][detail['current_revision']]
2118 patchset = int(revision_info['_number'])
2119 else:
2120 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002121 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002122 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2123 break
2124 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002125 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002126 (parsed_issue_arg.patchset, self.GetIssue()))
2127
Edward Lemur125d60a2019-09-13 18:25:41 +00002128 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002129 if remote_url.endswith('.git'):
2130 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002131 remote_url = remote_url.rstrip('/')
2132
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002134 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002135
2136 if remote_url != fetch_info['url']:
2137 DieWithError('Trying to patch a change from %s but this repo appears '
2138 'to be %s.' % (fetch_info['url'], remote_url))
2139
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002141
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002142 # If we have created a new branch then do the "set issue" immediately in
2143 # case the cherry-pick fails, which happens when resolving conflicts.
2144 if newbranch:
2145 self.SetIssue(parsed_issue_arg.issue)
2146
Aaron Gable62619a32017-06-16 08:22:09 -07002147 if force:
2148 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2149 print('Checked out commit for change %i patchset %i locally' %
2150 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002151 elif nocommit:
2152 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2153 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002154 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002155 RunGit(['cherry-pick', 'FETCH_HEAD'])
2156 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002157 (parsed_issue_arg.issue, patchset))
2158 print('Note: this created a local commit which does not have '
2159 'the same hash as the one uploaded for review. This will make '
2160 'uploading changes based on top of this branch difficult.\n'
2161 'If you want to do that, use "git cl patch --force" instead.')
2162
Stefan Zagerd08043c2017-10-12 12:07:02 -07002163 if self.GetBranch():
2164 self.SetIssue(parsed_issue_arg.issue)
2165 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002166 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002167 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2168 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2169 else:
2170 print('WARNING: You are in detached HEAD state.\n'
2171 'The patch has been applied to your checkout, but you will not be '
2172 'able to upload a new patch set to the gerrit issue.\n'
2173 'Try using the \'-b\' option if you would like to work on a '
2174 'branch and/or upload a new patch set.')
2175
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 return 0
2177
tandrii16e0b4e2016-06-07 10:34:28 -07002178 def _GerritCommitMsgHookCheck(self, offer_removal):
2179 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2180 if not os.path.exists(hook):
2181 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002182 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2183 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002184 data = gclient_utils.FileRead(hook)
2185 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2186 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002187 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002188 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002189 'and may interfere with it in subtle ways.\n'
2190 'We recommend you remove the commit-msg hook.')
2191 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002192 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002193 gclient_utils.rm_file_or_tree(hook)
2194 print('Gerrit commit-msg hook removed.')
2195 else:
2196 print('OK, will keep Gerrit commit-msg hook in place.')
2197
Edward Lemur1b52d872019-05-09 21:12:12 +00002198 def _CleanUpOldTraces(self):
2199 """Keep only the last |MAX_TRACES| traces."""
2200 try:
2201 traces = sorted([
2202 os.path.join(TRACES_DIR, f)
2203 for f in os.listdir(TRACES_DIR)
2204 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2205 and not f.startswith('tmp'))
2206 ])
2207 traces_to_delete = traces[:-MAX_TRACES]
2208 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002209 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002210 except OSError:
2211 print('WARNING: Failed to remove old git traces from\n'
2212 ' %s'
2213 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002214
Edward Lemur5737f022019-05-17 01:24:00 +00002215 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002216 """Zip and write the git push traces stored in traces_dir."""
2217 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002218 traces_zip = trace_name + '-traces'
2219 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002220 # Create a temporary dir to store git config and gitcookies in. It will be
2221 # compressed and stored next to the traces.
2222 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 git_info_zip = trace_name + '-git-info'
2224
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002225 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002226
Edward Lemur1b52d872019-05-09 21:12:12 +00002227 git_push_metadata['trace_name'] = trace_name
2228 gclient_utils.FileWrite(
2229 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2230
2231 # Keep only the first 6 characters of the git hashes on the packet
2232 # trace. This greatly decreases size after compression.
2233 packet_traces = os.path.join(traces_dir, 'trace-packet')
2234 if os.path.isfile(packet_traces):
2235 contents = gclient_utils.FileRead(packet_traces)
2236 gclient_utils.FileWrite(
2237 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2238 shutil.make_archive(traces_zip, 'zip', traces_dir)
2239
2240 # Collect and compress the git config and gitcookies.
2241 git_config = RunGit(['config', '-l'])
2242 gclient_utils.FileWrite(
2243 os.path.join(git_info_dir, 'git-config'),
2244 git_config)
2245
2246 cookie_auth = gerrit_util.Authenticator.get()
2247 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2248 gitcookies_path = cookie_auth.get_gitcookies_path()
2249 if os.path.isfile(gitcookies_path):
2250 gitcookies = gclient_utils.FileRead(gitcookies_path)
2251 gclient_utils.FileWrite(
2252 os.path.join(git_info_dir, 'gitcookies'),
2253 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2254 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2255
Edward Lemur1b52d872019-05-09 21:12:12 +00002256 gclient_utils.rmtree(git_info_dir)
2257
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002258 def _RunGitPushWithTraces(self,
2259 refspec,
2260 refspec_opts,
2261 git_push_metadata,
2262 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002263 """Run git push and collect the traces resulting from the execution."""
2264 # Create a temporary directory to store traces in. Traces will be compressed
2265 # and stored in a 'traces' dir inside depot_tools.
2266 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002267 trace_name = os.path.join(
2268 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002269
2270 env = os.environ.copy()
2271 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2272 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002273 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002274 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2275 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2276 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2277
2278 try:
2279 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002280 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002281 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002282 push_cmd = ['git', 'push', remote_url, refspec]
2283 if git_push_options:
2284 for opt in git_push_options:
2285 push_cmd.extend(['-o', opt])
2286
Edward Lemur0f58ae42019-04-30 17:24:12 +00002287 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002288 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289 env=env,
2290 print_stdout=True,
2291 # Flush after every line: useful for seeing progress when running as
2292 # recipe.
2293 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002294 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002295 except subprocess2.CalledProcessError as e:
2296 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002297 if 'blocked keyword' in str(e.stdout):
2298 raise GitPushError(
2299 'Failed to create a change, very likely due to blocked keyword. '
2300 'Please examine output above for the reason of the failure.\n'
2301 'If this is a false positive, you can try to bypass blocked '
2302 'keyword by using push option '
2303 '-o uploadvalidator~skip, e.g.:\n'
2304 'git cl upload -o uploadvalidator~skip\n\n'
2305 'If git-cl is not working correctly, file a bug under the '
2306 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002307 if 'git push -o nokeycheck' in str(e.stdout):
2308 raise GitPushError(
2309 'Failed to create a change, very likely due to a private key being '
2310 'detected. Please examine output above for the reason of the '
2311 'failure.\n'
2312 'If this is a false positive, you can try to bypass private key '
2313 'detection by using push option '
2314 '-o nokeycheck, e.g.:\n'
2315 'git cl upload -o nokeycheck\n\n'
2316 'If git-cl is not working correctly, file a bug under the '
2317 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002318
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002319 raise GitPushError(
2320 'Failed to create a change. Please examine output above for the '
2321 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002322 'For emergencies, Googlers can escalate to '
2323 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002324 'Hint: run command below to diagnose common Git/Gerrit '
2325 'credential problems:\n'
2326 ' git cl creds-check\n'
2327 '\n'
2328 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2329 'component including the files below.\n'
2330 'Review the files before upload, since they might contain sensitive '
2331 'information.\n'
2332 'Set the Restrict-View-Google label so that they are not publicly '
2333 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002334 finally:
2335 execution_time = time_time() - before_push
2336 metrics.collector.add_repeated('sub_commands', {
2337 'command': 'git push',
2338 'execution_time': execution_time,
2339 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002340 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002341 })
2342
Edward Lemur1b52d872019-05-09 21:12:12 +00002343 git_push_metadata['execution_time'] = execution_time
2344 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002345 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002346
Edward Lemur1b52d872019-05-09 21:12:12 +00002347 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002348 gclient_utils.rmtree(traces_dir)
2349
2350 return push_stdout
2351
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002352 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2353 change_desc):
2354 """Upload the current branch to Gerrit, retry if new remote HEAD is
2355 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002356 remote, remote_branch = self.GetRemoteBranch()
2357 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2358
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002359 try:
2360 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002361 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002362 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002363 # Repository might be in the middle of transition to main branch as
2364 # default, and uploads to old default might be blocked.
2365 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002366 DieWithError(str(e), change_desc)
2367
Josip Sokcevicb631a882021-01-06 18:18:10 +00002368 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2369 self.GetGerritProject())
2370 if project_head == branch:
2371 DieWithError(str(e), change_desc)
2372 branch = project_head
2373
2374 print("WARNING: Fetching remote state and retrying upload to default "
2375 "branch...")
2376 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002377 options.edit_description = False
2378 options.force = True
2379 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002380 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2381 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002382 except GitPushError as e:
2383 DieWithError(str(e), change_desc)
2384
2385 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002386 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002387 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002389 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002390 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002391 # User requested to change description
2392 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002393 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002395 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002396 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002397 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002398 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002399 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002400 if len(change_ids) == 1:
2401 change_id = change_ids[0]
2402 else:
2403 change_id = GenerateGerritChangeId(change_desc.description)
2404 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002405
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002406 if options.preserve_tryjobs:
2407 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002408
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002410 parent = self._ComputeParent(
2411 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002412 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002413 with gclient_utils.temporary_file() as desc_tempfile:
2414 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2415 ref_to_push = RunGit(
2416 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002417 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002418 if options.no_add_changeid:
2419 pass
2420 else: # adding Change-Ids is okay.
2421 if not git_footers.get_footer_change_id(change_desc.description):
2422 DownloadGerritHook(False)
2423 change_desc.set_description(
2424 self._AddChangeIdToCommitMessage(change_desc.description,
2425 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002427 # For no-squash mode, we assume the remote called "origin" is the one we
2428 # want. It is not worthwhile to support different workflows for
2429 # no-squash mode.
2430 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002431 # attempt to extract the changeid from the current description
2432 # fail informatively if not possible.
2433 change_id_candidates = git_footers.get_footer_change_id(
2434 change_desc.description)
2435 if not change_id_candidates:
2436 DieWithError("Unable to extract change-id from message.")
2437 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002439 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002440 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2441 ref_to_push)]).splitlines()
2442 if len(commits) > 1:
2443 print('WARNING: This will upload %d commits. Run the following command '
2444 'to see which commits will be uploaded: ' % len(commits))
2445 print('git log %s..%s' % (parent, ref_to_push))
2446 print('You can also use `git squash-branch` to squash these into a '
2447 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002448 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002450 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002451 cc = []
2452 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2453 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2454 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002455 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002456 if len(cc) > 100:
2457 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2458 'process/lsc/lsc_workflow.md')
2459 print('WARNING: This will auto-CC %s users.' % len(cc))
2460 print('LSC may be more appropriate: %s' % lsc)
2461 print('You can also use the --no-autocc flag to disable auto-CC.')
2462 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002463 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002464 if options.cc:
2465 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002466 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002467 if change_desc.get_cced():
2468 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002469 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002470 valid_accounts = set(reviewers + cc)
2471 # TODO(crbug/877717): relax this for all hosts.
2472 else:
2473 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002474 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002475 logging.info('accounts %s are recognized, %s invalid',
2476 sorted(valid_accounts),
2477 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002478
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002479 # Extra options that can be specified at push time. Doc:
2480 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002481 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002482
Aaron Gable844cf292017-06-28 11:32:59 -07002483 # By default, new changes are started in WIP mode, and subsequent patchsets
2484 # don't send email. At any time, passing --send-mail will mark the change
2485 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002486 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002487 refspec_opts.append('ready')
2488 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002489 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002490 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002491 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002492 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002493
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002494 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002495 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002496
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002497 # Set options.title in case user was prompted in _GetTitleForUpload and
2498 # _CMDUploadChange needs to be called again.
2499 options.title = self._GetTitleForUpload(options)
2500 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002501 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002502 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002503 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002504
agablec6787972016-09-09 16:13:34 -07002505 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002506 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002507
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002508 for r in sorted(reviewers):
2509 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002510 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002511 reviewers.remove(r)
2512 else:
2513 # TODO(tandrii): this should probably be a hard failure.
2514 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2515 % r)
2516 for c in sorted(cc):
2517 # refspec option will be rejected if cc doesn't correspond to an
2518 # account, even though REST call to add such arbitrary cc may succeed.
2519 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002520 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002521 cc.remove(c)
2522
rmistry9eadede2016-09-19 11:22:43 -07002523 if options.topic:
2524 # Documentation on Gerrit topics is here:
2525 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002526 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002527
Edward Lemur687ca902018-12-05 02:30:30 +00002528 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002529 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002530 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002531 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002532 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002533 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002534 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002535 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002536 elif options.cq_quick_run:
2537 refspec_opts.append('l=Commit-Queue+1')
2538 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002539
2540 if change_desc.get_reviewers(tbr_only=True):
2541 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002542 self.GetGerritHost(),
2543 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002544 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002545
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002546 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002547 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002548 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002549 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002550 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2551
2552 refspec_suffix = ''
2553 if refspec_opts:
2554 refspec_suffix = '%' + ','.join(refspec_opts)
2555 assert ' ' not in refspec_suffix, (
2556 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2557 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002558
Edward Lemur1b52d872019-05-09 21:12:12 +00002559 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002560 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002561 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002562 'change_id': change_id,
2563 'description': change_desc.description,
2564 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002565
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002566 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002567 git_push_metadata,
2568 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002569
2570 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002571 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002572 change_numbers = [m.group(1)
2573 for m in map(regex.match, push_stdout.splitlines())
2574 if m]
2575 if len(change_numbers) != 1:
2576 DieWithError(
2577 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002578 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002579 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002580 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002581
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002582 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002583 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002584 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002585 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002586 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002587 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002588 reviewers, cc,
2589 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002590
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002591 return 0
2592
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002593 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2594 change_desc):
2595 """Computes parent of the generated commit to be uploaded to Gerrit.
2596
2597 Returns revision or a ref name.
2598 """
2599 if custom_cl_base:
2600 # Try to avoid creating additional unintended CLs when uploading, unless
2601 # user wants to take this risk.
2602 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2603 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2604 local_ref_of_target_remote])
2605 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002606 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002607 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2608 'If you proceed with upload, more than 1 CL may be created by '
2609 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2610 'If you are certain that specified base `%s` has already been '
2611 'uploaded to Gerrit as another CL, you may proceed.\n' %
2612 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2613 if not force:
2614 confirm_or_exit(
2615 'Do you take responsibility for cleaning up potential mess '
2616 'resulting from proceeding with upload?',
2617 action='upload')
2618 return custom_cl_base
2619
Aaron Gablef97e33d2017-03-30 15:44:27 -07002620 if remote != '.':
2621 return self.GetCommonAncestorWithUpstream()
2622
2623 # If our upstream branch is local, we base our squashed commit on its
2624 # squashed version.
2625 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2626
Aaron Gablef97e33d2017-03-30 15:44:27 -07002627 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002628 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002629 if upstream_branch_name == 'main':
2630 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002631
2632 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002633 # TODO(tandrii): consider checking parent change in Gerrit and using its
2634 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2635 # the tree hash of the parent branch. The upside is less likely bogus
2636 # requests to reupload parent change just because it's uploadhash is
2637 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002638 parent = scm.GIT.GetBranchConfig(
2639 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002640 # Verify that the upstream branch has been uploaded too, otherwise
2641 # Gerrit will create additional CLs when uploading.
2642 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2643 RunGitSilent(['rev-parse', parent + ':'])):
2644 DieWithError(
2645 '\nUpload upstream branch %s first.\n'
2646 'It is likely that this branch has been rebased since its last '
2647 'upload, so you just need to upload it again.\n'
2648 '(If you uploaded it with --no-squash, then branch dependencies '
2649 'are not supported, and you should reupload with --squash.)'
2650 % upstream_branch_name,
2651 change_desc)
2652 return parent
2653
Edward Lemura12175c2020-03-09 16:58:26 +00002654 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002655 """Re-commits using the current message, assumes the commit hook is in
2656 place.
2657 """
Edward Lemura12175c2020-03-09 16:58:26 +00002658 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002659 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002660 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002661 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002662 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002663
2664 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002665
tandriie113dfd2016-10-11 10:20:12 -07002666 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002667 try:
2668 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002669 except GerritChangeNotExists:
2670 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002671
2672 if data['status'] in ('ABANDONED', 'MERGED'):
2673 return 'CL %s is closed' % self.GetIssue()
2674
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002675 def GetGerritChange(self, patchset=None):
2676 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002677 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002678 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002679 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002680 data = self._GetChangeDetail(['ALL_REVISIONS'])
2681
2682 assert host and issue and patchset, 'CL must be uploaded first'
2683
2684 has_patchset = any(
2685 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002686 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002687 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002688 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002689 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002690
tandrii8c5a3532016-11-04 07:52:02 -07002691 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002692 'host': host,
2693 'change': issue,
2694 'project': data['project'],
2695 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002696 }
tandriie113dfd2016-10-11 10:20:12 -07002697
tandriide281ae2016-10-12 06:02:30 -07002698 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002699 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002700
Edward Lemur707d70b2018-02-07 00:50:14 +01002701 def GetReviewers(self):
2702 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002703 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002704
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002705
Lei Zhang8a0efc12020-08-05 19:58:45 +00002706def _get_bug_line_values(default_project_prefix, bugs):
2707 """Given default_project_prefix and comma separated list of bugs, yields bug
2708 line values.
tandriif9aefb72016-07-01 09:06:51 -07002709
2710 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002711 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002712 * string, which is left as is.
2713
2714 This function may produce more than one line, because bugdroid expects one
2715 project per line.
2716
Lei Zhang8a0efc12020-08-05 19:58:45 +00002717 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002718 ['v8:123', 'chromium:789']
2719 """
2720 default_bugs = []
2721 others = []
2722 for bug in bugs.split(','):
2723 bug = bug.strip()
2724 if bug:
2725 try:
2726 default_bugs.append(int(bug))
2727 except ValueError:
2728 others.append(bug)
2729
2730 if default_bugs:
2731 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002732 if default_project_prefix:
2733 if not default_project_prefix.endswith(':'):
2734 default_project_prefix += ':'
2735 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002736 else:
2737 yield default_bugs
2738 for other in sorted(others):
2739 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2740 yield other
2741
2742
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002743class ChangeDescription(object):
2744 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002745 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002746 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002747 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002748 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002749 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002750 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2751 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002752 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002753 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002754
Dan Beamd8b04ca2019-10-10 21:23:26 +00002755 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002756 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002757 if bug:
2758 regexp = re.compile(self.BUG_LINE)
2759 prefix = settings.GetBugPrefix()
2760 if not any((regexp.match(line) for line in self._description_lines)):
2761 values = list(_get_bug_line_values(prefix, bug))
2762 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002763 if fixed:
2764 regexp = re.compile(self.FIXED_LINE)
2765 prefix = settings.GetBugPrefix()
2766 if not any((regexp.match(line) for line in self._description_lines)):
2767 values = list(_get_bug_line_values(prefix, fixed))
2768 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769
agable@chromium.org42c20792013-09-12 17:34:49 +00002770 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002771 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002772 return '\n'.join(self._description_lines)
2773
2774 def set_description(self, desc):
2775 if isinstance(desc, basestring):
2776 lines = desc.splitlines()
2777 else:
2778 lines = [line.rstrip() for line in desc]
2779 while lines and not lines[0]:
2780 lines.pop(0)
2781 while lines and not lines[-1]:
2782 lines.pop(-1)
2783 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002784
Edward Lemur5a644f82020-03-18 16:44:57 +00002785 def ensure_change_id(self, change_id):
2786 description = self.description
2787 footer_change_ids = git_footers.get_footer_change_id(description)
2788 # Make sure that the Change-Id in the description matches the given one.
2789 if footer_change_ids != [change_id]:
2790 if footer_change_ids:
2791 # Remove any existing Change-Id footers since they don't match the
2792 # expected change_id footer.
2793 description = git_footers.remove_footer(description, 'Change-Id')
2794 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2795 'if you want to set a new one.')
2796 # Add the expected Change-Id footer.
2797 description = git_footers.add_footer_change_id(description, change_id)
2798 self.set_description(description)
2799
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002800 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002801 """Rewrites the R=/TBR= line(s) as a single line each.
2802
2803 Args:
2804 reviewers (list(str)) - list of additional emails to use for reviewers.
2805 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002806 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002807 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002808 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002809
2810 reviewers = set(reviewers)
2811 tbrs = set(tbrs)
2812 LOOKUP = {
2813 'TBR': tbrs,
2814 'R': reviewers,
2815 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002816
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002817 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002818 regexp = re.compile(self.R_LINE)
2819 matches = [regexp.match(line) for line in self._description_lines]
2820 new_desc = [l for i, l in enumerate(self._description_lines)
2821 if not matches[i]]
2822 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002823
agable@chromium.org42c20792013-09-12 17:34:49 +00002824 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002825
2826 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002827 for match in matches:
2828 if not match:
2829 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002830 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2831
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002832 # If any folks ended up in both groups, remove them from tbrs.
2833 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002834
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002835 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2836 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002837
2838 # Put the new lines in the description where the old first R= line was.
2839 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2840 if 0 <= line_loc < len(self._description_lines):
2841 if new_tbr_line:
2842 self._description_lines.insert(line_loc, new_tbr_line)
2843 if new_r_line:
2844 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002845 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 if new_r_line:
2847 self.append_footer(new_r_line)
2848 if new_tbr_line:
2849 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002850
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002851 def set_preserve_tryjobs(self):
2852 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2853 footers = git_footers.parse_footers(self.description)
2854 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2855 if v.lower() == 'true':
2856 return
2857 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2858
Anthony Polito8b955342019-09-24 19:01:36 +00002859 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002860 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002861 self.set_description([
2862 '# Enter a description of the change.',
2863 '# This will be displayed on the codereview site.',
2864 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002865 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002866 '--------------------',
2867 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002868 bug_regexp = re.compile(self.BUG_LINE)
2869 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002870 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002871 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002872
Dan Beamd8b04ca2019-10-10 21:23:26 +00002873 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002874 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002875
Bruce Dawsonfc487042020-10-27 19:11:37 +00002876 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002877 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002878 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002879 if not content:
2880 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002881 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002882
Bruce Dawson2377b012018-01-11 16:46:49 -08002883 # Strip off comments and default inserted "Bug:" line.
2884 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002885 (line.startswith('#') or
2886 line.rstrip() == "Bug:" or
2887 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002888 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002889 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002890 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002891
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002893 """Adds a footer line to the description.
2894
2895 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2896 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2897 that Gerrit footers are always at the end.
2898 """
2899 parsed_footer_line = git_footers.parse_footer(line)
2900 if parsed_footer_line:
2901 # Line is a gerrit footer in the form: Footer-Key: any value.
2902 # Thus, must be appended observing Gerrit footer rules.
2903 self.set_description(
2904 git_footers.add_footer(self.description,
2905 key=parsed_footer_line[0],
2906 value=parsed_footer_line[1]))
2907 return
2908
2909 if not self._description_lines:
2910 self._description_lines.append(line)
2911 return
2912
2913 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2914 if gerrit_footers:
2915 # git_footers.split_footers ensures that there is an empty line before
2916 # actual (gerrit) footers, if any. We have to keep it that way.
2917 assert top_lines and top_lines[-1] == ''
2918 top_lines, separator = top_lines[:-1], top_lines[-1:]
2919 else:
2920 separator = [] # No need for separator if there are no gerrit_footers.
2921
2922 prev_line = top_lines[-1] if top_lines else ''
2923 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2924 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2925 top_lines.append('')
2926 top_lines.append(line)
2927 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002928
tandrii99a72f22016-08-17 14:33:24 -07002929 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002930 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002931 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002932 reviewers = [match.group(2).strip()
2933 for match in matches
2934 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002935 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002936
bradnelsond975b302016-10-23 12:20:23 -07002937 def get_cced(self):
2938 """Retrieves the list of reviewers."""
2939 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2940 cced = [match.group(2).strip() for match in matches if match]
2941 return cleanup_list(cced)
2942
Nodir Turakulov23b82142017-11-16 11:04:25 -08002943 def get_hash_tags(self):
2944 """Extracts and sanitizes a list of Gerrit hashtags."""
2945 subject = (self._description_lines or ('',))[0]
2946 subject = re.sub(
2947 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2948
2949 tags = []
2950 start = 0
2951 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2952 while True:
2953 m = bracket_exp.match(subject, start)
2954 if not m:
2955 break
2956 tags.append(self.sanitize_hash_tag(m.group(1)))
2957 start = m.end()
2958
2959 if not tags:
2960 # Try "Tag: " prefix.
2961 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2962 if m:
2963 tags.append(self.sanitize_hash_tag(m.group(1)))
2964 return tags
2965
2966 @classmethod
2967 def sanitize_hash_tag(cls, tag):
2968 """Returns a sanitized Gerrit hash tag.
2969
2970 A sanitized hashtag can be used as a git push refspec parameter value.
2971 """
2972 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2973
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002974
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002975def FindCodereviewSettingsFile(filename='codereview.settings'):
2976 """Finds the given file starting in the cwd and going up.
2977
2978 Only looks up to the top of the repository unless an
2979 'inherit-review-settings-ok' file exists in the root of the repository.
2980 """
2981 inherit_ok_file = 'inherit-review-settings-ok'
2982 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002983 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002984 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2985 root = '/'
2986 while True:
2987 if filename in os.listdir(cwd):
2988 if os.path.isfile(os.path.join(cwd, filename)):
2989 return open(os.path.join(cwd, filename))
2990 if cwd == root:
2991 break
2992 cwd = os.path.dirname(cwd)
2993
2994
2995def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002996 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002997 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002998
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999 def SetProperty(name, setting, unset_error_ok=False):
3000 fullname = 'rietveld.' + name
3001 if setting in keyvals:
3002 RunGit(['config', fullname, keyvals[setting]])
3003 else:
3004 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3005
tandrii48df5812016-10-17 03:55:37 -07003006 if not keyvals.get('GERRIT_HOST', False):
3007 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003008 # Only server setting is required. Other settings can be absent.
3009 # In that case, we ignore errors raised during option deletion attempt.
3010 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3011 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3012 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003013 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003014 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3015 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003016 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3017 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003018 SetProperty(
3019 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003020 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003021
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003022 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003023 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003024
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003025 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003026 RunGit(['config', 'gerrit.squash-uploads',
3027 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003028
tandrii@chromium.org28253532016-04-14 13:46:56 +00003029 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003030 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003031 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3032
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003033 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003034 # should be of the form
3035 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3036 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003037 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3038 keyvals['ORIGIN_URL_CONFIG']])
3039
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003040
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003041def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003042 """Downloads a network object to a local file, like urllib.urlretrieve.
3043
3044 This is necessary because urllib is broken for SSL connections via a proxy.
3045 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003046 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003047 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003048
3049
ukai@chromium.org712d6102013-11-27 00:52:58 +00003050def hasSheBang(fname):
3051 """Checks fname is a #! script."""
3052 with open(fname) as f:
3053 return f.read(2).startswith('#!')
3054
3055
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003056def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003057 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003058
3059 Args:
3060 force: True to update hooks. False to install hooks if not present.
3061 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003062 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003063 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3064 if not os.access(dst, os.X_OK):
3065 if os.path.exists(dst):
3066 if not force:
3067 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003068 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003069 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003070 if not hasSheBang(dst):
3071 DieWithError('Not a script: %s\n'
3072 'You need to download from\n%s\n'
3073 'into .git/hooks/commit-msg and '
3074 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003075 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3076 except Exception:
3077 if os.path.exists(dst):
3078 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003079 DieWithError('\nFailed to download hooks.\n'
3080 'You need to download from\n%s\n'
3081 'into .git/hooks/commit-msg and '
3082 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003083
3084
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003085class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003086 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003087
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003088 _GOOGLESOURCE = 'googlesource.com'
3089
3090 def __init__(self):
3091 # Cached list of [host, identity, source], where source is either
3092 # .gitcookies or .netrc.
3093 self._all_hosts = None
3094
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003095 def ensure_configured_gitcookies(self):
3096 """Runs checks and suggests fixes to make git use .gitcookies from default
3097 path."""
3098 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3099 configured_path = RunGitSilent(
3100 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003101 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003102 if configured_path:
3103 self._ensure_default_gitcookies_path(configured_path, default)
3104 else:
3105 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003106
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003107 @staticmethod
3108 def _ensure_default_gitcookies_path(configured_path, default_path):
3109 assert configured_path
3110 if configured_path == default_path:
3111 print('git is already configured to use your .gitcookies from %s' %
3112 configured_path)
3113 return
3114
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003115 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003116 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3117 (configured_path, default_path))
3118
3119 if not os.path.exists(configured_path):
3120 print('However, your configured .gitcookies file is missing.')
3121 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3122 action='reconfigure')
3123 RunGit(['config', '--global', 'http.cookiefile', default_path])
3124 return
3125
3126 if os.path.exists(default_path):
3127 print('WARNING: default .gitcookies file already exists %s' %
3128 default_path)
3129 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3130 default_path)
3131
3132 confirm_or_exit('Move existing .gitcookies to default location?',
3133 action='move')
3134 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003135 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003136 print('Moved and reconfigured git to use .gitcookies from %s' %
3137 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003138
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003139 @staticmethod
3140 def _configure_gitcookies_path(default_path):
3141 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3142 if os.path.exists(netrc_path):
3143 print('You seem to be using outdated .netrc for git credentials: %s' %
3144 netrc_path)
3145 print('This tool will guide you through setting up recommended '
3146 '.gitcookies store for git credentials.\n'
3147 '\n'
3148 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3149 ' git config --global --unset http.cookiefile\n'
3150 ' mv %s %s.backup\n\n' % (default_path, default_path))
3151 confirm_or_exit(action='setup .gitcookies')
3152 RunGit(['config', '--global', 'http.cookiefile', default_path])
3153 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003154
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003155 def get_hosts_with_creds(self, include_netrc=False):
3156 if self._all_hosts is None:
3157 a = gerrit_util.CookiesAuthenticator()
3158 self._all_hosts = [
3159 (h, u, s)
3160 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003161 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3162 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003163 )
3164 if h.endswith(self._GOOGLESOURCE)
3165 ]
3166
3167 if include_netrc:
3168 return self._all_hosts
3169 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3170
3171 def print_current_creds(self, include_netrc=False):
3172 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3173 if not hosts:
3174 print('No Git/Gerrit credentials found')
3175 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003176 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003177 header = [('Host', 'User', 'Which file'),
3178 ['=' * l for l in lengths]]
3179 for row in (header + hosts):
3180 print('\t'.join((('%%+%ds' % l) % s)
3181 for l, s in zip(lengths, row)))
3182
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003183 @staticmethod
3184 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003185 """Parses identity "git-<username>.domain" into <username> and domain."""
3186 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003187 # distinguishable from sub-domains. But we do know typical domains:
3188 if identity.endswith('.chromium.org'):
3189 domain = 'chromium.org'
3190 username = identity[:-len('.chromium.org')]
3191 else:
3192 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003193 if username.startswith('git-'):
3194 username = username[len('git-'):]
3195 return username, domain
3196
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003197 def _canonical_git_googlesource_host(self, host):
3198 """Normalizes Gerrit hosts (with '-review') to Git host."""
3199 assert host.endswith(self._GOOGLESOURCE)
3200 # Prefix doesn't include '.' at the end.
3201 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3202 if prefix.endswith('-review'):
3203 prefix = prefix[:-len('-review')]
3204 return prefix + '.' + self._GOOGLESOURCE
3205
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003206 def _canonical_gerrit_googlesource_host(self, host):
3207 git_host = self._canonical_git_googlesource_host(host)
3208 prefix = git_host.split('.', 1)[0]
3209 return prefix + '-review.' + self._GOOGLESOURCE
3210
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003211 def _get_counterpart_host(self, host):
3212 assert host.endswith(self._GOOGLESOURCE)
3213 git = self._canonical_git_googlesource_host(host)
3214 gerrit = self._canonical_gerrit_googlesource_host(git)
3215 return git if gerrit == host else gerrit
3216
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003217 def has_generic_host(self):
3218 """Returns whether generic .googlesource.com has been configured.
3219
3220 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3221 """
3222 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3223 if host == '.' + self._GOOGLESOURCE:
3224 return True
3225 return False
3226
3227 def _get_git_gerrit_identity_pairs(self):
3228 """Returns map from canonic host to pair of identities (Git, Gerrit).
3229
3230 One of identities might be None, meaning not configured.
3231 """
3232 host_to_identity_pairs = {}
3233 for host, identity, _ in self.get_hosts_with_creds():
3234 canonical = self._canonical_git_googlesource_host(host)
3235 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3236 idx = 0 if canonical == host else 1
3237 pair[idx] = identity
3238 return host_to_identity_pairs
3239
3240 def get_partially_configured_hosts(self):
3241 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003242 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003243 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003244 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003245
3246 def get_conflicting_hosts(self):
3247 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003248 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003249 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003250 if None not in (i1, i2) and i1 != i2)
3251
3252 def get_duplicated_hosts(self):
3253 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003254 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003255
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003256
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003257 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003258 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003259 hosts = sorted(hosts)
3260 assert hosts
3261 if extra_column_func is None:
3262 extras = [''] * len(hosts)
3263 else:
3264 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003265 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3266 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003267 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003268 lines.append(tmpl % he)
3269 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003270
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003271 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003272 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003273 yield ('.googlesource.com wildcard record detected',
3274 ['Chrome Infrastructure team recommends to list full host names '
3275 'explicitly.'],
3276 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003277
3278 dups = self.get_duplicated_hosts()
3279 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 yield ('The following hosts were defined twice',
3281 self._format_hosts(dups),
3282 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003283
3284 partial = self.get_partially_configured_hosts()
3285 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3287 'These hosts are missing',
3288 self._format_hosts(partial, lambda host: 'but %s defined' %
3289 self._get_counterpart_host(host)),
3290 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291
3292 conflicting = self.get_conflicting_hosts()
3293 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003294 yield ('The following Git hosts have differing credentials from their '
3295 'Gerrit counterparts',
3296 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3297 tuple(self._get_git_gerrit_identity_pairs()[host])),
3298 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003299
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003300 def find_and_report_problems(self):
3301 """Returns True if there was at least one problem, else False."""
3302 found = False
3303 bad_hosts = set()
3304 for title, sublines, hosts in self._find_problems():
3305 if not found:
3306 found = True
3307 print('\n\n.gitcookies problem report:\n')
3308 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003309 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003310 if sublines:
3311 print()
3312 print(' %s' % '\n '.join(sublines))
3313 print()
3314
3315 if bad_hosts:
3316 assert found
3317 print(' You can manually remove corresponding lines in your %s file and '
3318 'visit the following URLs with correct account to generate '
3319 'correct credential lines:\n' %
3320 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3321 print(' %s' % '\n '.join(sorted(set(
3322 gerrit_util.CookiesAuthenticator().get_new_password_url(
3323 self._canonical_git_googlesource_host(host))
3324 for host in bad_hosts
3325 ))))
3326 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003327
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003328
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003329@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003330def CMDcreds_check(parser, args):
3331 """Checks credentials and suggests changes."""
3332 _, _ = parser.parse_args(args)
3333
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003334 # Code below checks .gitcookies. Abort if using something else.
3335 authn = gerrit_util.Authenticator.get()
3336 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003337 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003338 'This command is not designed for bot environment. It checks '
3339 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003340 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3341 if isinstance(authn, gerrit_util.GceAuthenticator):
3342 message += (
3343 '\n'
3344 'If you need to run this on GCE or a cloudtop instance, '
3345 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3346 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003347
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003348 checker = _GitCookiesChecker()
3349 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003350
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003351 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003352 checker.print_current_creds(include_netrc=True)
3353
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003354 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003355 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003356 return 0
3357 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003358
3359
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003360@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003361def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003362 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003363 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003364 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003365 _, args = parser.parse_args(args)
3366 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003367 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003368 return RunGit(['config', 'branch.%s.base-url' % branch],
3369 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003370
3371 print('Setting base-url to %s' % args[0])
3372 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3373 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003374
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003375
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003376def color_for_status(status):
3377 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003378 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003379 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003380 'unsent': BOLD + Fore.YELLOW,
3381 'waiting': BOLD + Fore.RED,
3382 'reply': BOLD + Fore.YELLOW,
3383 'not lgtm': BOLD + Fore.RED,
3384 'lgtm': BOLD + Fore.GREEN,
3385 'commit': BOLD + Fore.MAGENTA,
3386 'closed': BOLD + Fore.CYAN,
3387 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003388 }.get(status, Fore.WHITE)
3389
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003390
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003391def get_cl_statuses(changes, fine_grained, max_processes=None):
3392 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003393
3394 If fine_grained is true, this will fetch CL statuses from the server.
3395 Otherwise, simply indicate if there's a matching url for the given branches.
3396
3397 If max_processes is specified, it is used as the maximum number of processes
3398 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3399 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003400
3401 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003402 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003403 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003404 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003405
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003406 if not fine_grained:
3407 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003408 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003409 for cl in changes:
3410 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003411 return
3412
3413 # First, sort out authentication issues.
3414 logging.debug('ensuring credentials exist')
3415 for cl in changes:
3416 cl.EnsureAuthenticated(force=False, refresh=True)
3417
3418 def fetch(cl):
3419 try:
3420 return (cl, cl.GetStatus())
3421 except:
3422 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003423 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003424 raise
3425
3426 threads_count = len(changes)
3427 if max_processes:
3428 threads_count = max(1, min(threads_count, max_processes))
3429 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3430
Edward Lemur61bf4172020-02-24 23:22:37 +00003431 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003432 fetched_cls = set()
3433 try:
3434 it = pool.imap_unordered(fetch, changes).__iter__()
3435 while True:
3436 try:
3437 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003438 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003439 break
3440 fetched_cls.add(cl)
3441 yield cl, status
3442 finally:
3443 pool.close()
3444
3445 # Add any branches that failed to fetch.
3446 for cl in set(changes) - fetched_cls:
3447 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003448
rmistry@google.com2dd99862015-06-22 12:22:18 +00003449
Jose Lopes3863fc52020-04-07 17:00:25 +00003450def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003451 """Uploads CLs of local branches that are dependents of the current branch.
3452
3453 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003454
3455 test1 -> test2.1 -> test3.1
3456 -> test3.2
3457 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003458
3459 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3460 run on the dependent branches in this order:
3461 test2.1, test3.1, test3.2, test2.2, test3.3
3462
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003463 Note: This function does not rebase your local dependent branches. Use it
3464 when you make a change to the parent branch that will not conflict
3465 with its dependent branches, and you would like their dependencies
3466 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003467 """
3468 if git_common.is_dirty_git_tree('upload-branch-deps'):
3469 return 1
3470
3471 root_branch = cl.GetBranch()
3472 if root_branch is None:
3473 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3474 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003475 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003476 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3477 'patchset dependencies without an uploaded CL.')
3478
3479 branches = RunGit(['for-each-ref',
3480 '--format=%(refname:short) %(upstream:short)',
3481 'refs/heads'])
3482 if not branches:
3483 print('No local branches found.')
3484 return 0
3485
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003486 # Create a dictionary of all local branches to the branches that are
3487 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003488 tracked_to_dependents = collections.defaultdict(list)
3489 for b in branches.splitlines():
3490 tokens = b.split()
3491 if len(tokens) == 2:
3492 branch_name, tracked = tokens
3493 tracked_to_dependents[tracked].append(branch_name)
3494
vapiera7fbd5a2016-06-16 09:17:49 -07003495 print()
3496 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003497 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003498
rmistry@google.com2dd99862015-06-22 12:22:18 +00003499 def traverse_dependents_preorder(branch, padding=''):
3500 dependents_to_process = tracked_to_dependents.get(branch, [])
3501 padding += ' '
3502 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003503 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003504 dependents.append(dependent)
3505 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003506
rmistry@google.com2dd99862015-06-22 12:22:18 +00003507 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003508 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003509
3510 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003511 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003512 return 0
3513
Jose Lopes3863fc52020-04-07 17:00:25 +00003514 if not force:
3515 confirm_or_exit('This command will checkout all dependent branches and run '
3516 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003517
rmistry@google.com2dd99862015-06-22 12:22:18 +00003518 # Record all dependents that failed to upload.
3519 failures = {}
3520 # Go through all dependents, checkout the branch and upload.
3521 try:
3522 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003523 print()
3524 print('--------------------------------------')
3525 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003526 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 try:
3529 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003530 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003531 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003532 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003534 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003535 finally:
3536 # Swap back to the original root branch.
3537 RunGit(['checkout', '-q', root_branch])
3538
vapiera7fbd5a2016-06-16 09:17:49 -07003539 print()
3540 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 for dependent_branch in dependents:
3542 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print(' %s : %s' % (dependent_branch, upload_status))
3544 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003545
3546 return 0
3547
3548
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003549def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003550 """Given a proposed tag name, returns a tag name that is guaranteed to be
3551 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3552 or 'foo-3', and so on."""
3553
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003554 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003555 for suffix_num in itertools.count(1):
3556 if suffix_num == 1:
3557 to_check = proposed_tag
3558 else:
3559 to_check = '%s-%d' % (proposed_tag, suffix_num)
3560
3561 if to_check not in existing_tags:
3562 return to_check
3563
3564
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003565@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003566def CMDarchive(parser, args):
3567 """Archives and deletes branches associated with closed changelists."""
3568 parser.add_option(
3569 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003570 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003571 parser.add_option(
3572 '-f', '--force', action='store_true',
3573 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003574 parser.add_option(
3575 '-d', '--dry-run', action='store_true',
3576 help='Skip the branch tagging and removal steps.')
3577 parser.add_option(
3578 '-t', '--notags', action='store_true',
3579 help='Do not tag archived branches. '
3580 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003581 parser.add_option(
3582 '-p',
3583 '--pattern',
3584 default='git-cl-archived-{issue}-{branch}',
3585 help='Format string for archive tags. '
3586 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003587
kmarshall3bff56b2016-06-06 18:31:47 -07003588 options, args = parser.parse_args(args)
3589 if args:
3590 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003591
3592 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3593 if not branches:
3594 return 0
3595
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003596 tags = RunGit(['for-each-ref', '--format=%(refname)',
3597 'refs/tags']).splitlines() or []
3598 tags = [t.split('/')[-1] for t in tags]
3599
vapiera7fbd5a2016-06-16 09:17:49 -07003600 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003601 changes = [Changelist(branchref=b)
3602 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003603 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3604 statuses = get_cl_statuses(changes,
3605 fine_grained=True,
3606 max_processes=options.maxjobs)
3607 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003608 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3609 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003610 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003611 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003612 proposal.sort()
3613
3614 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003615 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003616 return 0
3617
Edward Lemur85153282020-02-14 22:06:29 +00003618 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003619
vapiera7fbd5a2016-06-16 09:17:49 -07003620 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003621 if options.notags:
3622 for next_item in proposal:
3623 print(' ' + next_item[0])
3624 else:
3625 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3626 for next_item in proposal:
3627 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003628
kmarshall9249e012016-08-23 12:02:16 -07003629 # Quit now on precondition failure or if instructed by the user, either
3630 # via an interactive prompt or by command line flags.
3631 if options.dry_run:
3632 print('\nNo changes were made (dry run).\n')
3633 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003634
3635 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003636 print('You are currently on a branch \'%s\' which is associated with a '
3637 'closed codereview issue, so archive cannot proceed. Please '
3638 'checkout another branch and run this command again.' %
3639 current_branch)
3640 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003641
3642 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003643 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003644 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003645 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003646 return 1
3647
3648 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003649 if not options.notags:
3650 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003651
3652 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3653 # Clean up the tag if we failed to delete the branch.
3654 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003655
vapiera7fbd5a2016-06-16 09:17:49 -07003656 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003657
3658 return 0
3659
3660
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003661@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003662def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003663 """Show status of changelists.
3664
3665 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003666 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003667 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003668 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003669 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003670 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003671 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003672 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003673
3674 Also see 'git cl comments'.
3675 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003676 parser.add_option(
3677 '--no-branch-color',
3678 action='store_true',
3679 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003680 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003681 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003682 parser.add_option('-f', '--fast', action='store_true',
3683 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003684 parser.add_option(
3685 '-j', '--maxjobs', action='store', type=int,
3686 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003687 parser.add_option(
3688 '-i', '--issue', type=int,
3689 help='Operate on this issue instead of the current branch\'s implicit '
3690 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003691 parser.add_option('-d',
3692 '--date-order',
3693 action='store_true',
3694 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003695 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003696 if args:
3697 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003698
iannuccie53c9352016-08-17 14:40:40 -07003699 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003700 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003701
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003702 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003703 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003704 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003705 if cl.GetIssue():
3706 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003707 elif options.field == 'id':
3708 issueid = cl.GetIssue()
3709 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003710 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003711 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003712 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003713 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003715 elif options.field == 'status':
3716 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717 elif options.field == 'url':
3718 url = cl.GetIssueURL()
3719 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003721 return 0
3722
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003723 branches = RunGit([
3724 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3725 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003726 if not branches:
3727 print('No local branch found.')
3728 return 0
3729
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003730 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003731 Changelist(branchref=b, commit_date=ct)
3732 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3733 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003735 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003736 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003737 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003738
Edward Lemur85153282020-02-14 22:06:29 +00003739 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003740
3741 def FormatBranchName(branch, colorize=False):
3742 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3743 an asterisk when it is the current branch."""
3744
3745 asterisk = ""
3746 color = Fore.RESET
3747 if branch == current_branch:
3748 asterisk = "* "
3749 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003750 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003751
3752 if colorize:
3753 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003754 return asterisk + branch_name
3755
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003756 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003757
3758 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003759
3760 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003761 sorted_changes = sorted(changes,
3762 key=lambda c: c.GetCommitDate(),
3763 reverse=True)
3764 else:
3765 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3766 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003767 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003768 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003769 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003770 branch_statuses[c.GetBranch()] = status
3771 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003772 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003773 if url and (not status or status == 'error'):
3774 # The issue probably doesn't exist anymore.
3775 url += ' (broken)'
3776
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003777 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003778 # Turn off bold as well as colors.
3779 END = '\033[0m'
3780 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003781 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003782 color = ''
3783 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003784 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003785
Alan Cuttera3be9a52019-03-04 18:50:33 +00003786 branch_display = FormatBranchName(branch)
3787 padding = ' ' * (alignment - len(branch_display))
3788 if not options.no_branch_color:
3789 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003790
Alan Cuttera3be9a52019-03-04 18:50:33 +00003791 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3792 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003793
vapiera7fbd5a2016-06-16 09:17:49 -07003794 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003795 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003796 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003797 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003798 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003799 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003800 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003801 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003803 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003804 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003805 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003806 return 0
3807
3808
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003809def colorize_CMDstatus_doc():
3810 """To be called once in main() to add colors to git cl status help."""
3811 colors = [i for i in dir(Fore) if i[0].isupper()]
3812
3813 def colorize_line(line):
3814 for color in colors:
3815 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003816 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003817 indent = len(line) - len(line.lstrip(' ')) + 1
3818 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3819 return line
3820
3821 lines = CMDstatus.__doc__.splitlines()
3822 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3823
3824
phajdan.jre328cf92016-08-22 04:12:17 -07003825def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003826 if path == '-':
3827 json.dump(contents, sys.stdout)
3828 else:
3829 with open(path, 'w') as f:
3830 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003831
3832
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003833@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003834@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003836 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003837
3838 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003839 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003840 parser.add_option('-r', '--reverse', action='store_true',
3841 help='Lookup the branch(es) for the specified issues. If '
3842 'no issues are specified, all branches with mapped '
3843 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003844 parser.add_option('--json',
3845 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003846 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847
dnj@chromium.org406c4402015-03-03 17:22:28 +00003848 if options.reverse:
3849 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003850 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003851 # Reverse issue lookup.
3852 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003853
3854 git_config = {}
3855 for config in RunGit(['config', '--get-regexp',
3856 r'branch\..*issue']).splitlines():
3857 name, _space, val = config.partition(' ')
3858 git_config[name] = val
3859
dnj@chromium.org406c4402015-03-03 17:22:28 +00003860 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003861 issue = git_config.get(
3862 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003863 if issue:
3864 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003865 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003866 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003867 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003868 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003869 try:
3870 issue_num = int(issue)
3871 except ValueError:
3872 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003873 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003874 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003875 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003876 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003877 if options.json:
3878 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003879 return 0
3880
3881 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003882 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003883 if not issue.valid:
3884 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3885 'or no argument to list it.\n'
3886 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003887 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003888 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003889 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003890 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003891 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3892 if options.json:
3893 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003894 'gerrit_host': cl.GetGerritHost(),
3895 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003896 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003897 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003898 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003899 return 0
3900
3901
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003902@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003903def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003904 """Shows or posts review comments for any changelist."""
3905 parser.add_option('-a', '--add-comment', dest='comment',
3906 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003907 parser.add_option('-p', '--publish', action='store_true',
3908 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003909 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003910 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003911 parser.add_option('-m', '--machine-readable', dest='readable',
3912 action='store_false', default=True,
3913 help='output comments in a format compatible with '
3914 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003915 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003916 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003917 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003918
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003919 issue = None
3920 if options.issue:
3921 try:
3922 issue = int(options.issue)
3923 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003924 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003925
Edward Lemur934836a2019-09-09 20:16:54 +00003926 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003927
3928 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003929 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003930 return 0
3931
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003932 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3933 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003934 for comment in summary:
3935 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003936 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003937 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003938 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003939 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003940 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003941 elif comment.autogenerated:
3942 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003943 else:
3944 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003945 print('\n%s%s %s%s\n%s' % (
3946 color,
3947 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3948 comment.sender,
3949 Fore.RESET,
3950 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3951
smut@google.comc85ac942015-09-15 16:34:43 +00003952 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003953 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003954 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003955 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3956 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003957 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003958 return 0
3959
3960
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003961@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003962@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003963def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003964 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003965 parser.add_option('-d', '--display', action='store_true',
3966 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003967 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003968 help='New description to set for this issue (- for stdin, '
3969 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003970 parser.add_option('-f', '--force', action='store_true',
3971 help='Delete any unpublished Gerrit edits for this issue '
3972 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003973
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003974 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003975
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003976 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003977 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003978 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003979 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003980 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003981
Edward Lemur934836a2019-09-09 20:16:54 +00003982 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003983 if target_issue_arg:
3984 kwargs['issue'] = target_issue_arg.issue
3985 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003986
3987 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003988 if not cl.GetIssue():
3989 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003990
Edward Lemur678a6842019-10-03 22:25:05 +00003991 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003992 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003993
Edward Lemur6c6827c2020-02-06 21:15:18 +00003994 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003995
smut@google.com34fb6b12015-07-13 20:03:26 +00003996 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003997 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003998 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003999
4000 if options.new_description:
4001 text = options.new_description
4002 if text == '-':
4003 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004004 elif text == '+':
4005 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004006 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004007
4008 description.set_description(text)
4009 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004010 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004011 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004012 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004013 return 0
4014
4015
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004016@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004017def CMDlint(parser, args):
4018 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004019 parser.add_option('--filter', action='append', metavar='-x,+y',
4020 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004021 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004022
4023 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004024 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004025 try:
4026 import cpplint
4027 import cpplint_chromium
4028 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004029 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004030 return 1
4031
4032 # Change the current working directory before calling lint so that it
4033 # shows the correct base.
4034 previous_cwd = os.getcwd()
4035 os.chdir(settings.GetRoot())
4036 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004037 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004038 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004039 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004040 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004041 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004042
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004043 # Process cpplint arguments, if any.
4044 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4045 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004046 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004047
Lei Zhang379d1ad2020-07-15 19:40:06 +00004048 include_regex = re.compile(settings.GetLintRegex())
4049 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004050 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4051 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004052 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004054 continue
4055
4056 if ignore_regex.match(filename):
4057 print('Ignoring file %s' % filename)
4058 continue
4059
4060 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4061 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004062 finally:
4063 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004065 if cpplint._cpplint_state.error_count != 0:
4066 return 1
4067 return 0
4068
4069
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004070@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004072 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004073 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004074 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004075 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004076 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004077 parser.add_option('--all', action='store_true',
4078 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004079 parser.add_option('--files',
4080 nargs=1,
4081 help='Semicolon-separated list of files to be marked as '
4082 'modified when executing presubmit or post-upload hooks. '
4083 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004084 parser.add_option('--parallel', action='store_true',
4085 help='Run all tests specified by input_api.RunTests in all '
4086 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004087 parser.add_option('--resultdb', action='store_true',
4088 help='Run presubmit checks in the ResultSink environment '
4089 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004090 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004091 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004092
sbc@chromium.org71437c02015-04-09 19:29:40 +00004093 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004094 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004095 return 1
4096
Edward Lemur934836a2019-09-09 20:16:54 +00004097 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004098 if args:
4099 base_branch = args[0]
4100 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004101 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004102 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004104 if cl.GetIssue():
4105 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004106 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004107 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004108
Josip Sokcevic017544d2022-03-31 23:47:53 +00004109 cl.RunHook(committing=not options.upload,
4110 may_prompt=False,
4111 verbose=options.verbose,
4112 parallel=options.parallel,
4113 upstream=base_branch,
4114 description=description,
4115 all_files=options.all,
4116 files=options.files,
4117 resultdb=options.resultdb,
4118 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004119 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004120
4121
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004122def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004123 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004124
4125 Works the same way as
4126 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4127 but can be called on demand on all platforms.
4128
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004129 The basic idea is to generate git hash of a state of the tree, original
4130 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004131 """
4132 lines = []
4133 tree_hash = RunGitSilent(['write-tree'])
4134 lines.append('tree %s' % tree_hash.strip())
4135 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4136 if code == 0:
4137 lines.append('parent %s' % parent.strip())
4138 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4139 lines.append('author %s' % author.strip())
4140 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4141 lines.append('committer %s' % committer.strip())
4142 lines.append('')
4143 # Note: Gerrit's commit-hook actually cleans message of some lines and
4144 # whitespace. This code is not doing this, but it clearly won't decrease
4145 # entropy.
4146 lines.append(message)
4147 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004148 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004149 return 'I%s' % change_hash.strip()
4150
4151
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004152def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004153 """Computes the remote branch ref to use for the CL.
4154
4155 Args:
4156 remote (str): The git remote for the CL.
4157 remote_branch (str): The git remote branch for the CL.
4158 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004159 """
4160 if not (remote and remote_branch):
4161 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004162
wittman@chromium.org455dc922015-01-26 20:15:50 +00004163 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004164 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004165 # refs, which are then translated into the remote full symbolic refs
4166 # below.
4167 if '/' not in target_branch:
4168 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4169 else:
4170 prefix_replacements = (
4171 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4172 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4173 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4174 )
4175 match = None
4176 for regex, replacement in prefix_replacements:
4177 match = re.search(regex, target_branch)
4178 if match:
4179 remote_branch = target_branch.replace(match.group(0), replacement)
4180 break
4181 if not match:
4182 # This is a branch path but not one we recognize; use as-is.
4183 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004184 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004185 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004186 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004187 # Handle the refs that need to land in different refs.
4188 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004189
wittman@chromium.org455dc922015-01-26 20:15:50 +00004190 # Create the true path to the remote branch.
4191 # Does the following translation:
4192 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004193 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004194 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4195 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4196 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4197 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4198 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4199 'refs/heads/')
4200 elif remote_branch.startswith('refs/remotes/branch-heads'):
4201 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004202
wittman@chromium.org455dc922015-01-26 20:15:50 +00004203 return remote_branch
4204
4205
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004206def cleanup_list(l):
4207 """Fixes a list so that comma separated items are put as individual items.
4208
4209 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4210 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4211 """
4212 items = sum((i.split(',') for i in l), [])
4213 stripped_items = (i.strip() for i in items)
4214 return sorted(filter(None, stripped_items))
4215
4216
Aaron Gable4db38df2017-11-03 14:59:07 -07004217@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004218@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004219def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004220 """Uploads the current changelist to codereview.
4221
4222 Can skip dependency patchset uploads for a branch by running:
4223 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004224 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004225 git config --unset branch.branch_name.skip-deps-uploads
4226 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004227
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004228 If the name of the checked out branch starts with "bug-" or "fix-" followed
4229 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004230 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004231
4232 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004233 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004234 [git-cl] add support for hashtags
4235 Foo bar: implement foo
4236 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004237 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004238 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4239 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004240 parser.add_option('--bypass-watchlists', action='store_true',
4241 dest='bypass_watchlists',
4242 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004243 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004244 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004245 parser.add_option('--message', '-m', dest='message',
4246 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004247 parser.add_option('-b', '--bug',
4248 help='pre-populate the bug number(s) for this issue. '
4249 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004250 parser.add_option('--message-file', dest='message_file',
4251 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004252 parser.add_option('--title', '-t', dest='title',
4253 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004254 parser.add_option('-T', '--skip-title', action='store_true',
4255 dest='skip_title',
4256 help='Use the most recent commit message as the title of '
4257 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004258 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004259 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004260 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004261 parser.add_option('--tbrs',
4262 action='append', default=[],
4263 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004264 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004265 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004266 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004267 parser.add_option('--hashtag', dest='hashtags',
4268 action='append', default=[],
4269 help=('Gerrit hashtag for new CL; '
4270 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004271 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004272 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004273 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004274 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004275 metavar='TARGET',
4276 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004277 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004278 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004279 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004280 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004281 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004282 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004283 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004284 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4285 const='TBR', help='add a set of OWNERS to TBR')
4286 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4287 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004288 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004289 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004290 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004291 'implies --send-mail')
4292 parser.add_option('-d', '--cq-dry-run',
4293 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004294 help='Send the patchset to do a CQ dry run right after '
4295 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004296 parser.add_option(
4297 '-q',
4298 '--cq-quick-run',
4299 action='store_true',
4300 default=False,
4301 help='Send the patchset to do a CQ quick run right after '
4302 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4303 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004304 parser.add_option('--set-bot-commit', action='store_true',
4305 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004306 parser.add_option('--preserve-tryjobs', action='store_true',
4307 help='instruct the CQ to let tryjobs running even after '
4308 'new patchsets are uploaded instead of canceling '
4309 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004310 parser.add_option('--dependencies', action='store_true',
4311 help='Uploads CLs of all the local branches that depend on '
4312 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004313 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4314 help='Sends your change to the CQ after an approval. Only '
4315 'works on repos that have the Auto-Submit label '
4316 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004317 parser.add_option('--parallel', action='store_true',
4318 help='Run all tests specified by input_api.RunTests in all '
4319 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004320 parser.add_option('--no-autocc', action='store_true',
4321 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004322 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004323 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004324 parser.add_option('-R', '--retry-failed', action='store_true',
4325 help='Retry failed tryjobs from old patchset immediately '
4326 'after uploading new patchset. Cannot be used with '
4327 '--use-commit-queue or --cq-dry-run.')
4328 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4329 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004330 parser.add_option('--fixed', '-x',
4331 help='List of bugs that will be commented on and marked '
4332 'fixed (pre-populates "Fixed:" tag). Same format as '
4333 '-b option / "Bug:" tag. If fixing several issues, '
4334 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004335 parser.add_option('--edit-description', action='store_true', default=False,
4336 help='Modify description before upload. Cannot be used '
4337 'with --force. It is a noop when --no-squash is set '
4338 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004339 parser.add_option('--git-completion-helper', action="store_true",
4340 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004341 parser.add_option('--resultdb', action='store_true',
4342 help='Run presubmit checks in the ResultSink environment '
4343 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004344 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004345 parser.add_option('-o',
4346 '--push-options',
4347 action='append',
4348 default=[],
4349 help='Transmit the given string to the server when '
4350 'performing git push (pass-through). See git-push '
4351 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004352 parser.add_option('--no-add-changeid',
4353 action='store_true',
4354 dest='no_add_changeid',
4355 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004356
rmistry@google.com2dd99862015-06-22 12:22:18 +00004357 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004358 (options, args) = parser.parse_args(args)
4359
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004360 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004361 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4362 if opt.help != optparse.SUPPRESS_HELP))
4363 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004364
sbc@chromium.org71437c02015-04-09 19:29:40 +00004365 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004366 return 1
4367
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004368 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004369 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004370 options.cc = cleanup_list(options.cc)
4371
Josipe827b0f2020-01-30 00:07:20 +00004372 if options.edit_description and options.force:
4373 parser.error('Only one of --force and --edit-description allowed')
4374
tandriib80458a2016-06-23 12:20:07 -07004375 if options.message_file:
4376 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004377 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004378 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004379
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004380 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004381 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004382 options.use_commit_queue,
4383 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004384 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4385 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004386
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004387 if options.skip_title and options.title:
4388 parser.error('Only one of --title and --skip-title allowed.')
4389
Aaron Gableedbc4132017-09-11 13:22:28 -07004390 if options.use_commit_queue:
4391 options.send_mail = True
4392
Edward Lesmes0dd54822020-03-26 18:24:25 +00004393 if options.squash is None:
4394 # Load default for user, repo, squash=true, in this order.
4395 options.squash = settings.GetSquashGerritUploads()
4396
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004397 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004398 # Warm change details cache now to avoid RPCs later, reducing latency for
4399 # developers.
4400 if cl.GetIssue():
4401 cl._GetChangeDetail(
4402 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4403
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004404 if options.retry_failed and not cl.GetIssue():
4405 print('No previous patchsets, so --retry-failed has no effect.')
4406 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004407
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004408 # cl.GetMostRecentPatchset uses cached information, and can return the last
4409 # patchset before upload. Calling it here makes it clear that it's the
4410 # last patchset before upload. Note that GetMostRecentPatchset will fail
4411 # if no CL has been uploaded yet.
4412 if options.retry_failed:
4413 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004414
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004415 ret = cl.CMDUpload(options, args, orig_args)
4416
4417 if options.retry_failed:
4418 if ret != 0:
4419 print('Upload failed, so --retry-failed has no effect.')
4420 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004421 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004422 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004423 jobs = _filter_failed_for_retry(builds)
4424 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004425 print('No failed tryjobs, so --retry-failed has no effect.')
4426 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004427 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004428
4429 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004430
4431
Francois Dorayd42c6812017-05-30 15:10:20 -04004432@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004433@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004434def CMDsplit(parser, args):
4435 """Splits a branch into smaller branches and uploads CLs.
4436
4437 Creates a branch and uploads a CL for each group of files modified in the
4438 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004439 comment, the string '$directory', is replaced with the directory containing
4440 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004441 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004442 parser.add_option('-d', '--description', dest='description_file',
4443 help='A text file containing a CL description in which '
4444 '$directory will be replaced by each CL\'s directory.')
4445 parser.add_option('-c', '--comment', dest='comment_file',
4446 help='A text file containing a CL comment.')
4447 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004448 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004449 help='List the files and reviewers for each CL that would '
4450 'be created, but don\'t create branches or CLs.')
4451 parser.add_option('--cq-dry-run', action='store_true',
4452 help='If set, will do a cq dry run for each uploaded CL. '
4453 'Please be careful when doing this; more than ~10 CLs '
4454 'has the potential to overload our build '
4455 'infrastructure. Try to upload these not during high '
4456 'load times (usually 11-3 Mountain View time). Email '
4457 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004458 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4459 default=True,
4460 help='Sends your change to the CQ after an approval. Only '
4461 'works on repos that have the Auto-Submit label '
4462 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004463 options, _ = parser.parse_args(args)
4464
4465 if not options.description_file:
4466 parser.error('No --description flag specified.')
4467
4468 def WrappedCMDupload(args):
4469 return CMDupload(OptionParser(), args)
4470
Edward Lemur2c62b332020-03-12 22:12:33 +00004471 return split_cl.SplitCl(
4472 options.description_file, options.comment_file, Changelist,
4473 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4474 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004475
4476
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004477@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004478@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004479def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004480 """DEPRECATED: Used to commit the current changelist via git-svn."""
4481 message = ('git-cl no longer supports committing to SVN repositories via '
4482 'git-svn. You probably want to use `git cl land` instead.')
4483 print(message)
4484 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485
4486
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004487@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004488@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004489def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004490 """Commits the current changelist via git.
4491
4492 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4493 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004494 """
4495 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4496 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004497 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004498 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004499 parser.add_option('--parallel', action='store_true',
4500 help='Run all tests specified by input_api.RunTests in all '
4501 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004502 parser.add_option('--resultdb', action='store_true',
4503 help='Run presubmit checks in the ResultSink environment '
4504 'and send results to the ResultDB database.')
4505 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004506 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004507
Edward Lemur934836a2019-09-09 20:16:54 +00004508 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004509
Robert Iannucci2e73d432018-03-14 01:10:47 -07004510 if not cl.GetIssue():
4511 DieWithError('You must upload the change first to Gerrit.\n'
4512 ' If you would rather have `git cl land` upload '
4513 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004514 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4515 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004516
4517
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004518@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004519@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004520def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004521 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522 parser.add_option('-b', dest='newbranch',
4523 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004524 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004525 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004526 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004527 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004528
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004529 group = optparse.OptionGroup(
4530 parser,
4531 'Options for continuing work on the current issue uploaded from a '
4532 'different clone (e.g. different machine). Must be used independently '
4533 'from the other options. No issue number should be specified, and the '
4534 'branch must have an issue number associated with it')
4535 group.add_option('--reapply', action='store_true', dest='reapply',
4536 help='Reset the branch and reapply the issue.\n'
4537 'CAUTION: This will undo any local changes in this '
4538 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004539
4540 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004541 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004542 parser.add_option_group(group)
4543
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004544 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004545
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004546 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004547 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004548 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004549 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004550 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004551
Edward Lemur934836a2019-09-09 20:16:54 +00004552 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004553 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004554 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004555
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004556 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004557 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004558 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004559
4560 RunGit(['reset', '--hard', upstream])
4561 if options.pull:
4562 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004563
Edward Lemur678a6842019-10-03 22:25:05 +00004564 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004565 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4566 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004567
4568 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004569 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004570
Edward Lemurf38bc172019-09-03 21:02:13 +00004571 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004572 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004573 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004574
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004575 # We don't want uncommitted changes mixed up with the patch.
4576 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004577 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004579 if options.newbranch:
4580 if options.force:
4581 RunGit(['branch', '-D', options.newbranch],
4582 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004583 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004584
Edward Lemur678a6842019-10-03 22:25:05 +00004585 cl = Changelist(
4586 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004587
Edward Lemur678a6842019-10-03 22:25:05 +00004588 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004589 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004590
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004591 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4592 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004593
4594
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004595def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004596 """Fetches the tree status and returns either 'open', 'closed',
4597 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004598 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004600 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004601 if status.find('closed') != -1 or status == '0':
4602 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004603
4604 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004606
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004607 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 return 'unset'
4609
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004610
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611def GetTreeStatusReason():
4612 """Fetches the tree status from a json url and returns the message
4613 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004614 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004615 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004616 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004617 status = json.loads(connection.read())
4618 connection.close()
4619 return status['message']
4620
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004621
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004622@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004624 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004625 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 status = GetTreeStatus()
4627 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004628 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629 return 2
4630
vapiera7fbd5a2016-06-16 09:17:49 -07004631 print('The tree is %s' % status)
4632 print()
4633 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 if status != 'open':
4635 return 1
4636 return 0
4637
4638
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004639@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004640def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004641 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4642 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004643 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004644 '-b', '--bot', action='append',
4645 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4646 'times to specify multiple builders. ex: '
4647 '"-b win_rel -b win_layout". See '
4648 'the try server waterfall for the builders name and the tests '
4649 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004650 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004651 '-B', '--bucket', default='',
4652 help=('Buildbucket bucket to send the try requests.'))
4653 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004654 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004655 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004656 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004657 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004658 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004659 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004660 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004661 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004662 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004663 '-q',
4664 '--quick-run',
4665 action='store_true',
4666 default=False,
4667 help='trigger in quick run mode '
4668 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4669 'uick_run.md) (chromium only).')
4670 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004671 '--category', default='git_cl_try', help='Specify custom build category.')
4672 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004673 '--project',
4674 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004675 'in recipe to determine to which repository or directory to '
4676 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004677 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004678 '-p', '--property', dest='properties', action='append', default=[],
4679 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004680 'key2=value2 etc. The value will be treated as '
4681 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004682 'NOTE: using this may make your tryjob not usable for CQ, '
4683 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004684 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004685 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4686 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004687 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004688 parser.add_option(
4689 '-R', '--retry-failed', action='store_true', default=False,
4690 help='Retry failed jobs from the latest set of tryjobs. '
4691 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004692 parser.add_option(
4693 '-i', '--issue', type=int,
4694 help='Operate on this issue instead of the current branch\'s implicit '
4695 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004696 options, args = parser.parse_args(args)
4697
machenbach@chromium.org45453142015-09-15 08:45:22 +00004698 # Make sure that all properties are prop=value pairs.
4699 bad_params = [x for x in options.properties if '=' not in x]
4700 if bad_params:
4701 parser.error('Got properties with missing "=": %s' % bad_params)
4702
maruel@chromium.org15192402012-09-06 12:38:29 +00004703 if args:
4704 parser.error('Unknown arguments: %s' % args)
4705
Edward Lemur934836a2019-09-09 20:16:54 +00004706 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004707 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004708 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004709
Edward Lemurf38bc172019-09-03 21:02:13 +00004710 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004711 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004712
tandriie113dfd2016-10-11 10:20:12 -07004713 error_message = cl.CannotTriggerTryJobReason()
4714 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004715 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004716
Edward Lemur45768512020-03-02 19:03:14 +00004717 if options.bot:
4718 if options.retry_failed:
4719 parser.error('--bot is not compatible with --retry-failed.')
4720 if not options.bucket:
4721 parser.error('A bucket (e.g. "chromium/try") is required.')
4722
4723 triggered = [b for b in options.bot if 'triggered' in b]
4724 if triggered:
4725 parser.error(
4726 'Cannot schedule builds on triggered bots: %s.\n'
4727 'This type of bot requires an initial job from a parent (usually a '
4728 'builder). Schedule a job on the parent instead.\n' % triggered)
4729
4730 if options.bucket.startswith('.master'):
4731 parser.error('Buildbot masters are not supported.')
4732
4733 project, bucket = _parse_bucket(options.bucket)
4734 if project is None or bucket is None:
4735 parser.error('Invalid bucket: %s.' % options.bucket)
4736 jobs = sorted((project, bucket, bot) for bot in options.bot)
4737 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004738 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004739 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004740 if options.verbose:
4741 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004742 jobs = _filter_failed_for_retry(builds)
4743 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004744 print('There are no failed jobs in the latest set of jobs '
4745 '(patchset #%d), doing nothing.' % patchset)
4746 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004747 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004748 if num_builders > 10:
4749 confirm_or_exit('There are %d builders with failed builds.'
4750 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004751 elif options.quick_run:
4752 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4753 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004754 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004755 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004756 print('git cl try with no bots now defaults to CQ dry run.')
4757 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4758 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004759
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004760 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004761 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004762 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004763 except BuildbucketResponseException as ex:
4764 print('ERROR: %s' % ex)
4765 return 1
4766 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004767
4768
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004769@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004770def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004771 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004772 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004773 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004774 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004775 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004776 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004777 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004778 '--color', action='store_true', default=setup_color.IS_TTY,
4779 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004780 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004781 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4782 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004783 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004784 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004785 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004786 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004787 parser.add_option(
4788 '-i', '--issue', type=int,
4789 help='Operate on this issue instead of the current branch\'s implicit '
4790 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004791 options, args = parser.parse_args(args)
4792 if args:
4793 parser.error('Unrecognized args: %s' % ' '.join(args))
4794
Edward Lemur934836a2019-09-09 20:16:54 +00004795 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004796 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004797 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004798
tandrii221ab252016-10-06 08:12:04 -07004799 patchset = options.patchset
4800 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004801 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004802 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004803 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004804 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004805 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004806 cl.GetIssue())
4807
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004808 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004809 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004810 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004811 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004812 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004813 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004814 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004815 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004816 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004817 return 0
4818
4819
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004820@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004821@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004822def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004823 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004824 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004825 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004826 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004828 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004829 if args:
4830 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004831 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004832 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004833 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004834 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004835
4836 # Clear configured merge-base, if there is one.
4837 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004838 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004839 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004840 return 0
4841
4842
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004843@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004844def CMDweb(parser, args):
4845 """Opens the current CL in the web browser."""
4846 _, args = parser.parse_args(args)
4847 if args:
4848 parser.error('Unrecognized args: %s' % ' '.join(args))
4849
4850 issue_url = Changelist().GetIssueURL()
4851 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004852 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004853 return 1
4854
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004855 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004856 # allows us to hide the "Created new window in existing browser session."
4857 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004858 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004859 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004860 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004861 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004862 os.open(os.devnull, os.O_RDWR)
4863 try:
4864 webbrowser.open(issue_url)
4865 finally:
4866 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004867 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004868 return 0
4869
4870
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004871@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004872def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004873 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004874 parser.add_option('-d', '--dry-run', action='store_true',
4875 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004876 parser.add_option(
4877 '-q',
4878 '--quick-run',
4879 action='store_true',
4880 help='trigger in quick run mode '
4881 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4882 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004883 parser.add_option('-c', '--clear', action='store_true',
4884 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004885 parser.add_option(
4886 '-i', '--issue', type=int,
4887 help='Operate on this issue instead of the current branch\'s implicit '
4888 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004889 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004890 if args:
4891 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004892 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4893 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004894
Edward Lemur934836a2019-09-09 20:16:54 +00004895 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004896 if not cl.GetIssue():
4897 parser.error('Must upload the issue first.')
4898
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004899 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004900 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004901 elif options.quick_run:
4902 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004903 elif options.dry_run:
4904 state = _CQState.DRY_RUN
4905 else:
4906 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004907 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004908 return 0
4909
4910
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004911@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004912def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004913 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004914 parser.add_option(
4915 '-i', '--issue', type=int,
4916 help='Operate on this issue instead of the current branch\'s implicit '
4917 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004918 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004919 if args:
4920 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004921 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004922 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004923 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004924 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004925 cl.CloseIssue()
4926 return 0
4927
4928
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004929@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004930def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004931 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004932 parser.add_option(
4933 '--stat',
4934 action='store_true',
4935 dest='stat',
4936 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004937 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004938 if args:
4939 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004940
Edward Lemur934836a2019-09-09 20:16:54 +00004941 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004942 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004943 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004944 if not issue:
4945 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004946
Aaron Gablea718c3e2017-08-28 17:47:28 -07004947 base = cl._GitGetBranchConfigValue('last-upload-hash')
4948 if not base:
4949 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4950 if not base:
4951 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4952 revision_info = detail['revisions'][detail['current_revision']]
4953 fetch_info = revision_info['fetch']['http']
4954 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4955 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004956
Aaron Gablea718c3e2017-08-28 17:47:28 -07004957 cmd = ['git', 'diff']
4958 if options.stat:
4959 cmd.append('--stat')
4960 cmd.append(base)
4961 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004962
4963 return 0
4964
4965
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004966@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004967def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004968 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004969 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004970 '--ignore-current',
4971 action='store_true',
4972 help='Ignore the CL\'s current reviewers and start from scratch.')
4973 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004974 '--ignore-self',
4975 action='store_true',
4976 help='Do not consider CL\'s author as an owners.')
4977 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004978 '--no-color',
4979 action='store_true',
4980 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004981 parser.add_option(
4982 '--batch',
4983 action='store_true',
4984 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004985 # TODO: Consider moving this to another command, since other
4986 # git-cl owners commands deal with owners for a given CL.
4987 parser.add_option(
4988 '--show-all',
4989 action='store_true',
4990 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004991 options, args = parser.parse_args(args)
4992
Edward Lemur934836a2019-09-09 20:16:54 +00004993 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004994 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995
Yang Guo6e269a02019-06-26 11:17:02 +00004996 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004997 if len(args) == 0:
4998 print('No files specified for --show-all. Nothing to do.')
4999 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005000 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005001 for path in args:
5002 print('Owners for %s:' % path)
5003 print('\n'.join(
5004 ' - %s' % owner
5005 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005006 return 0
5007
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005008 if args:
5009 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005010 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005011 base_branch = args[0]
5012 else:
5013 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005014 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005015
Edward Lemur2c62b332020-03-12 22:12:33 +00005016 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005017
5018 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005019 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5020 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005021 return 0
5022
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005024 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005025 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005026 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005027 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005028 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005029 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005030
5031
Aiden Bennerc08566e2018-10-03 17:52:42 +00005032def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005033 """Generates a diff command."""
5034 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005035 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5036
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005037 if allow_prefix:
5038 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5039 # case that diff.noprefix is set in the user's git config.
5040 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5041 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005042 diff_cmd += ['--no-prefix']
5043
5044 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005045
5046 if args:
5047 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005048 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005049 diff_cmd.append(arg)
5050 else:
5051 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005052
5053 return diff_cmd
5054
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005055
Jamie Madill5e96ad12020-01-13 16:08:35 +00005056def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5057 """Runs clang-format-diff and sets a return value if necessary."""
5058
5059 if not clang_diff_files:
5060 return 0
5061
5062 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5063 # formatted. This is used to block during the presubmit.
5064 return_value = 0
5065
5066 # Locate the clang-format binary in the checkout
5067 try:
5068 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5069 except clang_format.NotFoundError as e:
5070 DieWithError(e)
5071
5072 if opts.full or settings.GetFormatFullByDefault():
5073 cmd = [clang_format_tool]
5074 if not opts.dry_run and not opts.diff:
5075 cmd.append('-i')
5076 if opts.dry_run:
5077 for diff_file in clang_diff_files:
5078 with open(diff_file, 'r') as myfile:
5079 code = myfile.read().replace('\r\n', '\n')
5080 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5081 stdout = stdout.replace('\r\n', '\n')
5082 if opts.diff:
5083 sys.stdout.write(stdout)
5084 if code != stdout:
5085 return_value = 2
5086 else:
5087 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5088 if opts.diff:
5089 sys.stdout.write(stdout)
5090 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005091 try:
5092 script = clang_format.FindClangFormatScriptInChromiumTree(
5093 'clang-format-diff.py')
5094 except clang_format.NotFoundError as e:
5095 DieWithError(e)
5096
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005097 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005098 if not opts.dry_run and not opts.diff:
5099 cmd.append('-i')
5100
5101 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005102 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005103
Edward Lesmes89624cd2020-04-06 17:51:56 +00005104 env = os.environ.copy()
5105 env['PATH'] = (
5106 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5107 stdout = RunCommand(
5108 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005109 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005110 if opts.diff:
5111 sys.stdout.write(stdout)
5112 if opts.dry_run and len(stdout) > 0:
5113 return_value = 2
5114
5115 return return_value
5116
5117
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005118def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5119 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5120 presubmit checks have failed (and returns 0 otherwise)."""
5121
5122 if not rust_diff_files:
5123 return 0
5124
5125 # Locate the rustfmt binary.
5126 try:
5127 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5128 except rustfmt.NotFoundError as e:
5129 DieWithError(e)
5130
5131 # TODO(crbug.com/1231317): Support formatting only the changed lines
5132 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5133 # https://github.com/emilio/rustfmt-format-diff
5134 cmd = [rustfmt_tool]
5135 if opts.dry_run:
5136 cmd.append('--check')
5137 cmd += rust_diff_files
5138 rustfmt_exitcode = subprocess2.call(cmd)
5139
5140 if opts.presubmit and rustfmt_exitcode != 0:
5141 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005142
5143 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005144
5145
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005146def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005147 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005148 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005149
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005150
enne@chromium.org555cfe42014-01-29 18:21:39 +00005151@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005152@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005153def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005154 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005155 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005156 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005157 RUST_EXTS = ['.rs']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005158 parser.add_option('--full', action='store_true',
5159 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005160 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005161 parser.add_option('--dry-run', action='store_true',
5162 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005163 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005164 '--no-clang-format',
5165 dest='clang_format',
5166 action='store_false',
5167 default=True,
5168 help='Disables formatting of various file types using clang-format.')
5169 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005170 '--python',
5171 action='store_true',
5172 default=None,
5173 help='Enables python formatting on all python files.')
5174 parser.add_option(
5175 '--no-python',
5176 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005177 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005178 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005179 'If neither --python or --no-python are set, python files that have a '
5180 '.style.yapf file in an ancestor directory will be formatted. '
5181 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005182 parser.add_option(
5183 '--js',
5184 action='store_true',
5185 help='Format javascript code with clang-format. '
5186 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005187 parser.add_option('--diff', action='store_true',
5188 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005189 parser.add_option('--presubmit', action='store_true',
5190 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005191
5192 parser.add_option('--rust-fmt',
5193 dest='use_rust_fmt',
5194 action='store_true',
5195 default=rustfmt.IsRustfmtSupported(),
5196 help='Enables formatting of Rust file types using rustfmt.')
5197 parser.add_option(
5198 '--no-rust-fmt',
5199 dest='use_rust_fmt',
5200 action='store_false',
5201 help='Disables formatting of Rust file types using rustfmt.')
5202
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005203 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005204
Garrett Beaty91a6f332020-01-06 16:57:24 +00005205 if opts.python is not None and opts.no_python:
5206 raise parser.error('Cannot set both --python and --no-python')
5207 if opts.no_python:
5208 opts.python = False
5209
Daniel Chengc55eecf2016-12-30 03:11:02 -08005210 # Normalize any remaining args against the current path, so paths relative to
5211 # the current directory are still resolved as expected.
5212 args = [os.path.join(os.getcwd(), arg) for arg in args]
5213
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005214 # git diff generates paths against the root of the repository. Change
5215 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005216 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005217 if rel_base_path:
5218 os.chdir(rel_base_path)
5219
digit@chromium.org29e47272013-05-17 17:01:46 +00005220 # Grab the merge-base commit, i.e. the upstream commit of the current
5221 # branch when it was created or the last time it was rebased. This is
5222 # to cover the case where the user may have called "git fetch origin",
5223 # moving the origin branch to a newer commit, but hasn't rebased yet.
5224 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005225 upstream_branch = opts.upstream
5226 if not upstream_branch:
5227 cl = Changelist()
5228 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005229 if upstream_branch:
5230 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5231 upstream_commit = upstream_commit.strip()
5232
5233 if not upstream_commit:
5234 DieWithError('Could not find base commit for this branch. '
5235 'Are you in detached state?')
5236
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005237 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5238 diff_output = RunGit(changed_files_cmd)
5239 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005240 # Filter out files deleted by this CL
5241 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005242
Andreas Haas417d89c2020-02-06 10:24:27 +00005243 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005244 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005245
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005246 clang_diff_files = []
5247 if opts.clang_format:
5248 clang_diff_files = [
5249 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5250 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005251 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005252 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005253 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005254
Edward Lesmes50da7702020-03-30 19:23:43 +00005255 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005256
Jamie Madill5e96ad12020-01-13 16:08:35 +00005257 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5258 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005259
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005260 if opts.use_rust_fmt:
5261 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5262 upstream_commit)
5263 if rust_fmt_return_value == 2:
5264 return_value = 2
5265
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005266 # Similar code to above, but using yapf on .py files rather than clang-format
5267 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005268 py_explicitly_disabled = opts.python is not None and not opts.python
5269 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005270 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5271 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005272
Aiden Bennerc08566e2018-10-03 17:52:42 +00005273 # Used for caching.
5274 yapf_configs = {}
5275 for f in python_diff_files:
5276 # Find the yapf style config for the current file, defaults to depot
5277 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005278 _FindYapfConfigFile(f, yapf_configs, top_dir)
5279
5280 # Turn on python formatting by default if a yapf config is specified.
5281 # This breaks in the case of this repo though since the specified
5282 # style file is also the global default.
5283 if opts.python is None:
5284 filtered_py_files = []
5285 for f in python_diff_files:
5286 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5287 filtered_py_files.append(f)
5288 else:
5289 filtered_py_files = python_diff_files
5290
5291 # Note: yapf still seems to fix indentation of the entire file
5292 # even if line ranges are specified.
5293 # See https://github.com/google/yapf/issues/499
5294 if not opts.full and filtered_py_files:
5295 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5296
Brian Sheedyb4307d52019-12-02 19:18:17 +00005297 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5298 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5299 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005300
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005301 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005302 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5303 # Default to pep8 if not .style.yapf is found.
5304 if not yapf_style:
5305 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005306
Peter Wend9399922020-06-17 17:33:49 +00005307 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005308 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005309 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005310 else:
5311 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005312
5313 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005314
5315 has_formattable_lines = False
5316 if not opts.full:
5317 # Only run yapf over changed line ranges.
5318 for diff_start, diff_len in py_line_diffs[f]:
5319 diff_end = diff_start + diff_len - 1
5320 # Yapf errors out if diff_end < diff_start but this
5321 # is a valid line range diff for a removal.
5322 if diff_end >= diff_start:
5323 has_formattable_lines = True
5324 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5325 # If all line diffs were removals we have nothing to format.
5326 if not has_formattable_lines:
5327 continue
5328
5329 if opts.diff or opts.dry_run:
5330 cmd += ['--diff']
5331 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005332 stdout = RunCommand(cmd,
5333 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005334 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005335 cwd=top_dir,
5336 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005337 if opts.diff:
5338 sys.stdout.write(stdout)
5339 elif len(stdout) > 0:
5340 return_value = 2
5341 else:
5342 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005343 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005344
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005345 # Format GN build files. Always run on full build files for canonical form.
5346 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005347 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005348 if opts.dry_run or opts.diff:
5349 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005350 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005351 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005352 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005353 cwd=top_dir)
5354 if opts.dry_run and gn_ret == 2:
5355 return_value = 2 # Not formatted.
5356 elif opts.diff and gn_ret == 2:
5357 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005358 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005359 elif gn_ret != 0:
5360 # For non-dry run cases (and non-2 return values for dry-run), a
5361 # nonzero error code indicates a failure, probably because the file
5362 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005363 DieWithError('gn format failed on ' + gn_diff_file +
5364 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005365
Ilya Shermane081cbe2017-08-15 17:51:04 -07005366 # Skip the metrics formatting from the global presubmit hook. These files have
5367 # a separate presubmit hook that issues an error if the files need formatting,
5368 # whereas the top-level presubmit script merely issues a warning. Formatting
5369 # these files is somewhat slow, so it's important not to duplicate the work.
5370 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005371 for diff_xml in GetDiffXMLs(diff_files):
5372 xml_dir = GetMetricsDir(diff_xml)
5373 if not xml_dir:
5374 continue
5375
Ilya Shermane081cbe2017-08-15 17:51:04 -07005376 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005377 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5378 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005379
5380 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5381 # command as histograms/pretty_print.py now needs a relative path argument
5382 # after splitting the histograms into multiple directories.
5383 # For example, in tools/metrics/ukm, pretty-print could be run using:
5384 # $ python pretty_print.py
5385 # But in tools/metrics/histogrmas, pretty-print should be run with an
5386 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005387 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005388 # $ python pretty_print.py enums.xml
5389
5390 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5391 # version of histograms/pretty_print.py is released.
5392 filepath_required = os.path.exists(
5393 os.path.join(tool_dir, 'validate_prefix.py'))
5394
Weilun Shib92c4b72020-08-27 17:45:11 +00005395 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5396 or diff_xml.endswith('histogram_suffixes_list.xml')
5397 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005398 cmd.append(diff_xml)
5399
Ilya Shermane081cbe2017-08-15 17:51:04 -07005400 if opts.dry_run or opts.diff:
5401 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005402
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005403 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5404 # `shell` param and instead replace `'vpython'` with
5405 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005406 stdout = RunCommand(cmd,
5407 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005408 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005409 if opts.diff:
5410 sys.stdout.write(stdout)
5411 if opts.dry_run and stdout:
5412 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005413
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005414 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005415
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005416
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005417def GetDiffXMLs(diff_files):
5418 return [
5419 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5420 ]
5421
5422
5423def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005424 metrics_xml_dirs = [
5425 os.path.join('tools', 'metrics', 'actions'),
5426 os.path.join('tools', 'metrics', 'histograms'),
5427 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005428 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005429 os.path.join('tools', 'metrics', 'ukm'),
5430 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005431 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005432 if diff_xml.startswith(xml_dir):
5433 return xml_dir
5434 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005435
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005436
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005437@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005438@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005439def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005440 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005441 _, args = parser.parse_args(args)
5442
5443 if len(args) != 1:
5444 parser.print_help()
5445 return 1
5446
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005447 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005448 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005449 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005450
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005451 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005452
Edward Lemur52969c92020-02-06 18:15:28 +00005453 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005454 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005455 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005456
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005457 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005458 for key, issue in [x.split() for x in output.splitlines()]:
5459 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005460 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005461
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005462 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005463 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005464 return 1
5465 if len(branches) == 1:
5466 RunGit(['checkout', branches[0]])
5467 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005468 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005469 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005470 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005471 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005472 try:
5473 RunGit(['checkout', branches[int(which)]])
5474 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005475 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005476 return 1
5477
5478 return 0
5479
5480
maruel@chromium.org29404b52014-09-08 22:58:00 +00005481def CMDlol(parser, args):
5482 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005483 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005484 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5485 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5486 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005487 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005488 return 0
5489
5490
Josip Sokcevic0399e172022-03-21 23:11:51 +00005491def CMDversion(parser, args):
5492 import utils
5493 print(utils.depot_tools_version())
5494
5495
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005496class OptionParser(optparse.OptionParser):
5497 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005498
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005499 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005500 optparse.OptionParser.__init__(
5501 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005502 self.add_option(
5503 '-v', '--verbose', action='count', default=0,
5504 help='Use 2 times for more debugging info')
5505
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005506 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005507 try:
5508 return self._parse_args(args)
5509 finally:
5510 # Regardless of success or failure of args parsing, we want to report
5511 # metrics, but only after logging has been initialized (if parsing
5512 # succeeded).
5513 global settings
5514 settings = Settings()
5515
Edward Lesmes9c349062021-05-06 20:02:39 +00005516 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005517 # GetViewVCUrl ultimately calls logging method.
5518 project_url = settings.GetViewVCUrl().strip('/+')
5519 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5520 metrics.collector.add('project_urls', [project_url])
5521
5522 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005523 # Create an optparse.Values object that will store only the actual passed
5524 # options, without the defaults.
5525 actual_options = optparse.Values()
5526 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5527 # Create an optparse.Values object with the default options.
5528 options = optparse.Values(self.get_default_values().__dict__)
5529 # Update it with the options passed by the user.
5530 options._update_careful(actual_options.__dict__)
5531 # Store the options passed by the user in an _actual_options attribute.
5532 # We store only the keys, and not the values, since the values can contain
5533 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005534 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005535
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005536 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005537 logging.basicConfig(
5538 level=levels[min(options.verbose, len(levels) - 1)],
5539 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5540 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005541
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005542 return options, args
5543
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005544
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005545def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005546 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005547 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005548 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005549 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005550
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005551 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005552 dispatcher = subcommand.CommandDispatcher(__name__)
5553 try:
5554 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005555 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005556 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005557 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005558 if e.code != 500:
5559 raise
5560 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005561 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005562 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005563 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005564
5565
5566if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005567 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5568 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005569 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005570 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005571 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005572 sys.exit(main(sys.argv[1:]))