blob: 7222404dd4753a329bbe4e76b60f478dd1c4fcd4 [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
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
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001336 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001337 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001338 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1339 args = self._GetCommonPresubmitArgs(verbose, upstream)
1340 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001341 if may_prompt:
1342 args.append('--may_prompt')
1343 if parallel:
1344 args.append('--parallel')
1345 if all_files:
1346 args.append('--all_files')
1347
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001348 if resultdb and not realm:
1349 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1350 # it is not required to pass the realm flag
1351 print('Note: ResultDB reporting will NOT be performed because --realm'
1352 ' was not specified. To enable ResultDB, please run the command'
1353 ' again with the --realm argument to specify the LUCI realm.')
1354
1355 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1356 use_python3=False)
1357 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1358 use_python3=True)
1359 return self._MergePresubmitResults(py2_results, py3_results)
1360
1361 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1362 args = args[:]
1363 vpython = 'vpython3' if use_python3 else 'vpython'
1364
Edward Lemur227d5102020-02-25 23:45:35 +00001365 with gclient_utils.temporary_file() as description_file:
1366 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001367 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001368 args.extend(['--json_output', json_output])
1369 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001370 if self.GetUsePython3():
1371 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001372 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001373 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001374 if resultdb and realm:
1375 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001376
1377 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001378 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001379
Edward Lemur227d5102020-02-25 23:45:35 +00001380 metrics.collector.add_repeated('sub_commands', {
1381 'command': 'presubmit',
1382 'execution_time': time_time() - start,
1383 'exit_code': exit_code,
1384 })
1385
1386 if exit_code:
1387 sys.exit(exit_code)
1388
1389 json_results = gclient_utils.FileRead(json_output)
1390 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001391
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001392 def _MergePresubmitResults(self, py2_results, py3_results):
1393 return {
1394 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1395 py3_results.get('more_cc', []))),
1396 'errors': (
1397 py2_results.get('errors', []) + py3_results.get('errors', [])),
1398 'notifications': (
1399 py2_results.get('notifications', []) +
1400 py3_results.get('notifications', [])),
1401 'warnings': (
1402 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1403 }
1404
Edward Lemur75526302020-02-27 22:31:05 +00001405 def RunPostUploadHook(self, verbose, upstream, description):
1406 args = self._GetCommonPresubmitArgs(verbose, upstream)
1407 args.append('--post_upload')
1408
1409 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001410 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001411 args.extend(['--description_file', description_file])
1412 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1413 p.wait()
1414
Edward Lemur5a644f82020-03-18 16:44:57 +00001415 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1416 # Get description message for upload.
1417 if self.GetIssue():
1418 description = self.FetchDescription()
1419 elif options.message:
1420 description = options.message
1421 else:
1422 description = _create_description_from_log(git_diff_args)
1423 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001424 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001425
Edward Lemur5a644f82020-03-18 16:44:57 +00001426 bug = options.bug
1427 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001428 if not self.GetIssue():
1429 # Extract bug number from branch name, but only if issue is being created.
1430 # It must start with bug or fix, followed by _ or - and number.
1431 # Optionally, it may contain _ or - after number with arbitrary text.
1432 # Examples:
1433 # bug-123
1434 # bug_123
1435 # fix-123
1436 # fix-123-some-description
1437 match = re.match(
1438 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1439 self.GetBranch())
1440 if not bug and not fixed and match:
1441 if match.group('type') == 'bug':
1442 bug = match.group('bugnum')
1443 else:
1444 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001445
1446 change_description = ChangeDescription(description, bug, fixed)
1447
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001448 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1449 if options.add_owners_to:
1450 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001451 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001452 files, [], options.tbrs + options.reviewers)
1453 missing_files = [
1454 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001455 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001456 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001457 owners = self.owners_client.SuggestOwners(
1458 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001459 if options.add_owners_to == 'TBR':
1460 assert isinstance(options.tbrs, list), options.tbrs
1461 options.tbrs.extend(owners)
1462 else:
1463 assert isinstance(options.reviewers, list), options.reviewers
1464 options.reviewers.extend(owners)
1465
Edward Lemur5a644f82020-03-18 16:44:57 +00001466 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001467 if options.reviewers or options.tbrs:
1468 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001469
1470 return change_description
1471
1472 def _GetTitleForUpload(self, options):
1473 # When not squashing, just return options.title.
1474 if not options.squash:
1475 return options.title
1476
1477 # On first upload, patchset title is always this string, while options.title
1478 # gets converted to first line of message.
1479 if not self.GetIssue():
1480 return 'Initial upload'
1481
1482 # When uploading subsequent patchsets, options.message is taken as the title
1483 # if options.title is not provided.
1484 if options.title:
1485 return options.title
1486 if options.message:
1487 return options.message.strip()
1488
1489 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001490 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001491 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001492 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001493 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001494
1495 # Use the default title if the user confirms the default with a 'y'.
1496 if user_title.lower() == 'y':
1497 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001498 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001499
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001500 def CMDUpload(self, options, git_diff_args, orig_args):
1501 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001502 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001503 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001504 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001505 else:
1506 if self.GetBranch() is None:
1507 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1508
1509 # Default to diffing against common ancestor of upstream branch
1510 base_branch = self.GetCommonAncestorWithUpstream()
1511 git_diff_args = [base_branch, 'HEAD']
1512
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001513 # Fast best-effort checks to abort before running potentially expensive
1514 # hooks if uploading is likely to fail anyway. Passing these checks does
1515 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001516 self.EnsureAuthenticated(force=options.force)
1517 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001518
1519 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001520 watchlist = watchlists.Watchlists(settings.GetRoot())
1521 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001523 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524
Edward Lemur5a644f82020-03-18 16:44:57 +00001525 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001527 hook_results = self.RunHook(
1528 committing=False,
1529 may_prompt=not options.force,
1530 verbose=options.verbose,
1531 parallel=options.parallel,
1532 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001533 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001534 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001535 resultdb=options.resultdb,
1536 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001537 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001538
Aaron Gable13101a62018-02-09 13:20:41 -08001539 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001540 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001541 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001542 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001543 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001544 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545 # Run post upload hooks, if specified.
1546 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001547 self.RunPostUploadHook(
1548 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549
1550 # Upload all dependencies if specified.
1551 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001552 print()
1553 print('--dependencies has been specified.')
1554 print('All dependent local branches will be re-uploaded.')
1555 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001556 # Remove the dependencies flag from args so that we do not end up in a
1557 # loop.
1558 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001559 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 return ret
1561
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001562 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001563 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001564
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001565 Issue must have been already uploaded and known. Optionally allows for
1566 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001567 """
1568 assert new_state in _CQState.ALL_STATES
1569 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001570 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001571 vote_map = {
1572 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001573 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001574 _CQState.DRY_RUN: 1,
1575 _CQState.COMMIT: 2,
1576 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001577 if new_state == _CQState.QUICK_RUN:
1578 labels = {
1579 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1580 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1581 }
1582 else:
1583 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001584 notify = False if new_state == _CQState.DRY_RUN else None
1585 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001586 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001587 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001588 return 0
1589 except KeyboardInterrupt:
1590 raise
1591 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001592 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001593 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001594 ' * Your project has no CQ,\n'
1595 ' * You don\'t have permission to change the CQ state,\n'
1596 ' * There\'s a bug in this code (see stack trace below).\n'
1597 'Consider specifying which bots to trigger manually or asking your '
1598 'project owners for permissions or contacting Chrome Infra at:\n'
1599 'https://www.chromium.org/infra\n\n' %
1600 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001601 # Still raise exception so that stack trace is printed.
1602 raise
1603
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001604 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001605 # Lazy load of configs.
1606 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001607 if self._gerrit_host and '.' not in self._gerrit_host:
1608 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1609 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001610 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001611 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001612 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001613 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001614 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1615 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001616 return self._gerrit_host
1617
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001618 def _GetGitHost(self):
1619 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001620 remote_url = self.GetRemoteUrl()
1621 if not remote_url:
1622 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001623 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001624
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001625 def GetCodereviewServer(self):
1626 if not self._gerrit_server:
1627 # If we're on a branch then get the server potentially associated
1628 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001629 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001630 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001631 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001632 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001633 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001634 if not self._gerrit_server:
1635 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1636 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001637 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001638 parts[0] = parts[0] + '-review'
1639 self._gerrit_host = '.'.join(parts)
1640 self._gerrit_server = 'https://%s' % self._gerrit_host
1641 return self._gerrit_server
1642
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001643 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001644 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001645 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001646 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001647 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001648 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001649 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001650 if project.endswith('.git'):
1651 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001652 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1653 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1654 # gitiles/git-over-https protocol. E.g.,
1655 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1656 # as
1657 # https://chromium.googlesource.com/v8/v8
1658 if project.startswith('a/'):
1659 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001660 return project
1661
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001662 def _GerritChangeIdentifier(self):
1663 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1664
1665 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001666 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001667 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001668 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001669 if project:
1670 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1671 # Fall back on still unique, but less efficient change number.
1672 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001673
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001674 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001675 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001676 if settings.GetGerritSkipEnsureAuthenticated():
1677 # For projects with unusual authentication schemes.
1678 # See http://crbug.com/603378.
1679 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001680
1681 # Check presence of cookies only if using cookies-based auth method.
1682 cookie_auth = gerrit_util.Authenticator.get()
1683 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001684 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001685
Florian Mayerae510e82020-01-30 21:04:48 +00001686 remote_url = self.GetRemoteUrl()
1687 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001688 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001689 return
1690 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001691 logging.warning('Ignoring branch %(branch)s with non-https remote '
1692 '%(remote)s', {
1693 'branch': self.branch,
1694 'remote': self.GetRemoteUrl()
1695 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001696 return
1697
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001698 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699 self.GetCodereviewServer()
1700 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001701 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702
1703 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1704 git_auth = cookie_auth.get_auth_header(git_host)
1705 if gerrit_auth and git_auth:
1706 if gerrit_auth == git_auth:
1707 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001708 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001709 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001710 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001711 ' %s\n'
1712 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001713 ' Consider running the following command:\n'
1714 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001715 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001716 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001717 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001718 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001719 cookie_auth.get_new_password_message(git_host)))
1720 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001721 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001722 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001723
1724 missing = (
1725 ([] if gerrit_auth else [self._gerrit_host]) +
1726 ([] if git_auth else [git_host]))
1727 DieWithError('Credentials for the following hosts are required:\n'
1728 ' %s\n'
1729 'These are read from %s (or legacy %s)\n'
1730 '%s' % (
1731 '\n '.join(missing),
1732 cookie_auth.get_gitcookies_path(),
1733 cookie_auth.get_netrc_path(),
1734 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001735
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001736 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001737 if not self.GetIssue():
1738 return
1739
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001740 status = self._GetChangeDetail()['status']
1741 if status in ('MERGED', 'ABANDONED'):
1742 DieWithError('Change %s has been %s, new uploads are not allowed' %
1743 (self.GetIssueURL(),
1744 'submitted' if status == 'MERGED' else 'abandoned'))
1745
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001746 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1747 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1748 # Apparently this check is not very important? Otherwise get_auth_email
1749 # could have been added to other implementations of Authenticator.
1750 cookies_auth = gerrit_util.Authenticator.get()
1751 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001752 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001753
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001754 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001755 if self.GetIssueOwner() == cookies_user:
1756 return
1757 logging.debug('change %s owner is %s, cookies user is %s',
1758 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001759 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001760 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001761 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001762 if details['email'] == self.GetIssueOwner():
1763 return
1764 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001765 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001766 'as %s.\n'
1767 'Uploading may fail due to lack of permissions.' %
1768 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1769 confirm_or_exit(action='upload')
1770
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001771 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001772 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001773 or CQ status, assuming adherence to a common workflow.
1774
1775 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001776 * 'error' - error from review tool (including deleted issues)
1777 * 'unsent' - no reviewers added
1778 * 'waiting' - waiting for review
1779 * 'reply' - waiting for uploader to reply to review
1780 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001781 * 'dry-run' - dry-running in the CQ
1782 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001783 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001784 """
1785 if not self.GetIssue():
1786 return None
1787
1788 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001789 data = self._GetChangeDetail([
1790 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001791 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001792 return 'error'
1793
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001794 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001795 return 'closed'
1796
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001797 cq_label = data['labels'].get('Commit-Queue', {})
1798 max_cq_vote = 0
1799 for vote in cq_label.get('all', []):
1800 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1801 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001802 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001803 if max_cq_vote == 1:
1804 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001805
Aaron Gable9ab38c62017-04-06 14:36:33 -07001806 if data['labels'].get('Code-Review', {}).get('approved'):
1807 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001808
1809 if not data.get('reviewers', {}).get('REVIEWER', []):
1810 return 'unsent'
1811
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001812 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001813 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001814 while messages:
1815 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001816 if (m.get('tag', '').startswith('autogenerated:cq') or
1817 m.get('tag', '').startswith('autogenerated:cv')):
1818 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001819 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001820 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001821 # Most recent message was by owner.
1822 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001823
1824 # Some reply from non-owner.
1825 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001826
1827 # Somehow there are no messages even though there are reviewers.
1828 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001829
1830 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001831 if not self.GetIssue():
1832 return None
1833
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001834 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001835 patchset = data['revisions'][data['current_revision']]['_number']
1836 self.SetPatchset(patchset)
1837 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001838
Gavin Make61ccc52020-11-13 00:12:57 +00001839 def GetMostRecentDryRunPatchset(self):
1840 """Get patchsets equivalent to the most recent patchset and return
1841 the patchset with the latest dry run. If none have been dry run, return
1842 the latest patchset."""
1843 if not self.GetIssue():
1844 return None
1845
1846 data = self._GetChangeDetail(['ALL_REVISIONS'])
1847 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001848 dry_run = {int(m['_revision_number'])
1849 for m in data.get('messages', [])
1850 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001851
1852 for revision_info in sorted(data.get('revisions', {}).values(),
1853 key=lambda c: c['_number'], reverse=True):
1854 if revision_info['_number'] in dry_run:
1855 patchset = revision_info['_number']
1856 break
1857 if revision_info.get('kind', '') not in \
1858 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1859 break
1860 self.SetPatchset(patchset)
1861 return patchset
1862
Aaron Gable636b13f2017-07-14 10:42:48 -07001863 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001864 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001865 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001866 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001867
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001868 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001869 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001870 # CURRENT_REVISION is included to get the latest patchset so that
1871 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001872 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001873 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1874 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001875 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001876 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001877 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001878 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001879
1880 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001881 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001882 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001883 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001884 line_comments = file_comments.setdefault(path, [])
1885 line_comments.extend(
1886 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001887
1888 # Build dictionary of file comments for easy access and sorting later.
1889 # {author+date: {path: {patchset: {line: url+message}}}}
1890 comments = collections.defaultdict(
1891 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001892
1893 server = self.GetCodereviewServer()
1894 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1895 # /c/ is automatically added by short URL server.
1896 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1897 self.GetIssue())
1898 else:
1899 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1900
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001901 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001902 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 tag = comment.get('tag', '')
1904 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001905 continue
1906 key = (comment['author']['email'], comment['updated'])
1907 if comment.get('side', 'REVISION') == 'PARENT':
1908 patchset = 'Base'
1909 else:
1910 patchset = 'PS%d' % comment['patch_set']
1911 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001912 url = ('%s/%s/%s#%s%s' %
1913 (url_prefix, comment['patch_set'], path,
1914 'b' if comment.get('side') == 'PARENT' else '',
1915 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001916 comments[key][path][patchset][line] = (url, comment['message'])
1917
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001919 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 summary = self._BuildCommentSummary(msg, comments, readable)
1921 if summary:
1922 summaries.append(summary)
1923 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001924
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001925 @staticmethod
1926 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001927 if 'email' not in msg['author']:
1928 # Some bot accounts may not have an email associated.
1929 return None
1930
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001931 key = (msg['author']['email'], msg['date'])
1932 # Don't bother showing autogenerated messages that don't have associated
1933 # file or line comments. this will filter out most autogenerated
1934 # messages, but will keep robot comments like those from Tricium.
1935 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1936 if is_autogenerated and not comments.get(key):
1937 return None
1938 message = msg['message']
1939 # Gerrit spits out nanoseconds.
1940 assert len(msg['date'].split('.')[-1]) == 9
1941 date = datetime.datetime.strptime(msg['date'][:-3],
1942 '%Y-%m-%d %H:%M:%S.%f')
1943 if key in comments:
1944 message += '\n'
1945 for path, patchsets in sorted(comments.get(key, {}).items()):
1946 if readable:
1947 message += '\n%s' % path
1948 for patchset, lines in sorted(patchsets.items()):
1949 for line, (url, content) in sorted(lines.items()):
1950 if line:
1951 line_str = 'Line %d' % line
1952 path_str = '%s:%d:' % (path, line)
1953 else:
1954 line_str = 'File comment'
1955 path_str = '%s:0:' % path
1956 if readable:
1957 message += '\n %s, %s: %s' % (patchset, line_str, url)
1958 message += '\n %s\n' % content
1959 else:
1960 message += '\n%s ' % path_str
1961 message += '\n%s\n' % content
1962
1963 return _CommentSummary(
1964 date=date,
1965 message=message,
1966 sender=msg['author']['email'],
1967 autogenerated=is_autogenerated,
1968 # These could be inferred from the text messages and correlated with
1969 # Code-Review label maximum, however this is not reliable.
1970 # Leaving as is until the need arises.
1971 approval=False,
1972 disapproval=False,
1973 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001974
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001975 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001976 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001977 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001978
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001979 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001980 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00001981 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001982
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001983 def _GetChangeDetail(self, options=None):
1984 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001985 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001986 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001987
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001988 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001989 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001990 options.append('CURRENT_COMMIT')
1991
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001992 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001993 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001994 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001995
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001996 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1997 # Assumption: data fetched before with extra options is suitable
1998 # for return for a smaller set of options.
1999 # For example, if we cached data for
2000 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2001 # and request is for options=[CURRENT_REVISION],
2002 # THEN we can return prior cached data.
2003 if options_set.issubset(cached_options_set):
2004 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002005
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002006 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002007 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002008 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002009 except gerrit_util.GerritError as e:
2010 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002011 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002012 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002013
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002014 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002015 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002016
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002017 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002018 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002019 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002020 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002021 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002022 except gerrit_util.GerritError as e:
2023 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002024 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002025 raise
agable32978d92016-11-01 12:55:02 -07002026 return data
2027
Karen Qian40c19422019-03-13 21:28:29 +00002028 def _IsCqConfigured(self):
2029 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002030 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002031
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002032 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002033 if git_common.is_dirty_git_tree('land'):
2034 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002035
tandriid60367b2016-06-22 05:25:12 -07002036 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002037 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002038 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002039 'which can test and land changes for you. '
2040 'Are you sure you wish to bypass it?\n',
2041 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002042 differs = True
tandriic4344b52016-08-29 06:04:54 -07002043 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002044 # Note: git diff outputs nothing if there is no diff.
2045 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002046 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002047 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002048 if detail['current_revision'] == last_upload:
2049 differs = False
2050 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002051 print('WARNING: Local branch contents differ from latest uploaded '
2052 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002053 if differs:
2054 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002055 confirm_or_exit(
2056 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2057 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002058 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002059 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002060 upstream = self.GetCommonAncestorWithUpstream()
2061 if self.GetIssue():
2062 description = self.FetchDescription()
2063 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002064 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002065 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002066 committing=True,
2067 may_prompt=not force,
2068 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002069 parallel=parallel,
2070 upstream=upstream,
2071 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002072 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002073 resultdb=resultdb,
2074 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002075
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002076 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002077 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002078 links = self._GetChangeCommit().get('web_links', [])
2079 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002080 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002081 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002082 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002083 return 0
2084
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002085 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2086 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002087 assert parsed_issue_arg.valid
2088
Edward Lemur125d60a2019-09-13 18:25:41 +00002089 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002090
2091 if parsed_issue_arg.hostname:
2092 self._gerrit_host = parsed_issue_arg.hostname
2093 self._gerrit_server = 'https://%s' % self._gerrit_host
2094
tandriic2405f52016-10-10 08:13:15 -07002095 try:
2096 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002097 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002098 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002099
2100 if not parsed_issue_arg.patchset:
2101 # Use current revision by default.
2102 revision_info = detail['revisions'][detail['current_revision']]
2103 patchset = int(revision_info['_number'])
2104 else:
2105 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002106 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002107 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2108 break
2109 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002110 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002111 (parsed_issue_arg.patchset, self.GetIssue()))
2112
Edward Lemur125d60a2019-09-13 18:25:41 +00002113 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002114 if remote_url.endswith('.git'):
2115 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002116 remote_url = remote_url.rstrip('/')
2117
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002118 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002119 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002120
2121 if remote_url != fetch_info['url']:
2122 DieWithError('Trying to patch a change from %s but this repo appears '
2123 'to be %s.' % (fetch_info['url'], remote_url))
2124
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002126
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002127 # If we have created a new branch then do the "set issue" immediately in
2128 # case the cherry-pick fails, which happens when resolving conflicts.
2129 if newbranch:
2130 self.SetIssue(parsed_issue_arg.issue)
2131
Aaron Gable62619a32017-06-16 08:22:09 -07002132 if force:
2133 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2134 print('Checked out commit for change %i patchset %i locally' %
2135 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002136 elif nocommit:
2137 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2138 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002139 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002140 RunGit(['cherry-pick', 'FETCH_HEAD'])
2141 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002142 (parsed_issue_arg.issue, patchset))
2143 print('Note: this created a local commit which does not have '
2144 'the same hash as the one uploaded for review. This will make '
2145 'uploading changes based on top of this branch difficult.\n'
2146 'If you want to do that, use "git cl patch --force" instead.')
2147
Stefan Zagerd08043c2017-10-12 12:07:02 -07002148 if self.GetBranch():
2149 self.SetIssue(parsed_issue_arg.issue)
2150 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002151 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002152 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2153 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2154 else:
2155 print('WARNING: You are in detached HEAD state.\n'
2156 'The patch has been applied to your checkout, but you will not be '
2157 'able to upload a new patch set to the gerrit issue.\n'
2158 'Try using the \'-b\' option if you would like to work on a '
2159 'branch and/or upload a new patch set.')
2160
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 return 0
2162
tandrii16e0b4e2016-06-07 10:34:28 -07002163 def _GerritCommitMsgHookCheck(self, offer_removal):
2164 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2165 if not os.path.exists(hook):
2166 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002167 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2168 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002169 data = gclient_utils.FileRead(hook)
2170 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2171 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002172 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002173 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002174 'and may interfere with it in subtle ways.\n'
2175 'We recommend you remove the commit-msg hook.')
2176 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002177 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002178 gclient_utils.rm_file_or_tree(hook)
2179 print('Gerrit commit-msg hook removed.')
2180 else:
2181 print('OK, will keep Gerrit commit-msg hook in place.')
2182
Edward Lemur1b52d872019-05-09 21:12:12 +00002183 def _CleanUpOldTraces(self):
2184 """Keep only the last |MAX_TRACES| traces."""
2185 try:
2186 traces = sorted([
2187 os.path.join(TRACES_DIR, f)
2188 for f in os.listdir(TRACES_DIR)
2189 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2190 and not f.startswith('tmp'))
2191 ])
2192 traces_to_delete = traces[:-MAX_TRACES]
2193 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002194 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002195 except OSError:
2196 print('WARNING: Failed to remove old git traces from\n'
2197 ' %s'
2198 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002199
Edward Lemur5737f022019-05-17 01:24:00 +00002200 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002201 """Zip and write the git push traces stored in traces_dir."""
2202 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002203 traces_zip = trace_name + '-traces'
2204 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002205 # Create a temporary dir to store git config and gitcookies in. It will be
2206 # compressed and stored next to the traces.
2207 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002208 git_info_zip = trace_name + '-git-info'
2209
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002210 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002211
Edward Lemur1b52d872019-05-09 21:12:12 +00002212 git_push_metadata['trace_name'] = trace_name
2213 gclient_utils.FileWrite(
2214 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2215
2216 # Keep only the first 6 characters of the git hashes on the packet
2217 # trace. This greatly decreases size after compression.
2218 packet_traces = os.path.join(traces_dir, 'trace-packet')
2219 if os.path.isfile(packet_traces):
2220 contents = gclient_utils.FileRead(packet_traces)
2221 gclient_utils.FileWrite(
2222 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2223 shutil.make_archive(traces_zip, 'zip', traces_dir)
2224
2225 # Collect and compress the git config and gitcookies.
2226 git_config = RunGit(['config', '-l'])
2227 gclient_utils.FileWrite(
2228 os.path.join(git_info_dir, 'git-config'),
2229 git_config)
2230
2231 cookie_auth = gerrit_util.Authenticator.get()
2232 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2233 gitcookies_path = cookie_auth.get_gitcookies_path()
2234 if os.path.isfile(gitcookies_path):
2235 gitcookies = gclient_utils.FileRead(gitcookies_path)
2236 gclient_utils.FileWrite(
2237 os.path.join(git_info_dir, 'gitcookies'),
2238 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2239 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2240
Edward Lemur1b52d872019-05-09 21:12:12 +00002241 gclient_utils.rmtree(git_info_dir)
2242
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002243 def _RunGitPushWithTraces(self,
2244 refspec,
2245 refspec_opts,
2246 git_push_metadata,
2247 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002248 """Run git push and collect the traces resulting from the execution."""
2249 # Create a temporary directory to store traces in. Traces will be compressed
2250 # and stored in a 'traces' dir inside depot_tools.
2251 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002252 trace_name = os.path.join(
2253 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002254
2255 env = os.environ.copy()
2256 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2257 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002258 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002259 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2260 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2261 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2262
2263 try:
2264 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002265 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002266 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002267 push_cmd = ['git', 'push', remote_url, refspec]
2268 if git_push_options:
2269 for opt in git_push_options:
2270 push_cmd.extend(['-o', opt])
2271
Edward Lemur0f58ae42019-04-30 17:24:12 +00002272 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002273 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002274 env=env,
2275 print_stdout=True,
2276 # Flush after every line: useful for seeing progress when running as
2277 # recipe.
2278 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002279 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002280 except subprocess2.CalledProcessError as e:
2281 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002282 if 'blocked keyword' in str(e.stdout):
2283 raise GitPushError(
2284 'Failed to create a change, very likely due to blocked keyword. '
2285 'Please examine output above for the reason of the failure.\n'
2286 'If this is a false positive, you can try to bypass blocked '
2287 'keyword by using push option '
2288 '-o uploadvalidator~skip, e.g.:\n'
2289 'git cl upload -o uploadvalidator~skip\n\n'
2290 'If git-cl is not working correctly, file a bug under the '
2291 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002292 if 'git push -o nokeycheck' in str(e.stdout):
2293 raise GitPushError(
2294 'Failed to create a change, very likely due to a private key being '
2295 'detected. Please examine output above for the reason of the '
2296 'failure.\n'
2297 'If this is a false positive, you can try to bypass private key '
2298 'detection by using push option '
2299 '-o nokeycheck, e.g.:\n'
2300 'git cl upload -o nokeycheck\n\n'
2301 'If git-cl is not working correctly, file a bug under the '
2302 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002303
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002304 raise GitPushError(
2305 'Failed to create a change. Please examine output above for the '
2306 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002307 'For emergencies, Googlers can escalate to '
2308 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002309 'Hint: run command below to diagnose common Git/Gerrit '
2310 'credential problems:\n'
2311 ' git cl creds-check\n'
2312 '\n'
2313 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2314 'component including the files below.\n'
2315 'Review the files before upload, since they might contain sensitive '
2316 'information.\n'
2317 'Set the Restrict-View-Google label so that they are not publicly '
2318 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002319 finally:
2320 execution_time = time_time() - before_push
2321 metrics.collector.add_repeated('sub_commands', {
2322 'command': 'git push',
2323 'execution_time': execution_time,
2324 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002325 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002326 })
2327
Edward Lemur1b52d872019-05-09 21:12:12 +00002328 git_push_metadata['execution_time'] = execution_time
2329 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002330 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002331
Edward Lemur1b52d872019-05-09 21:12:12 +00002332 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002333 gclient_utils.rmtree(traces_dir)
2334
2335 return push_stdout
2336
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002337 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2338 change_desc):
2339 """Upload the current branch to Gerrit, retry if new remote HEAD is
2340 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002341 remote, remote_branch = self.GetRemoteBranch()
2342 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2343
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002344 try:
2345 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002346 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002347 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002348 # Repository might be in the middle of transition to main branch as
2349 # default, and uploads to old default might be blocked.
2350 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002351 DieWithError(str(e), change_desc)
2352
Josip Sokcevicb631a882021-01-06 18:18:10 +00002353 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2354 self.GetGerritProject())
2355 if project_head == branch:
2356 DieWithError(str(e), change_desc)
2357 branch = project_head
2358
2359 print("WARNING: Fetching remote state and retrying upload to default "
2360 "branch...")
2361 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002362 options.edit_description = False
2363 options.force = True
2364 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002365 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2366 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002367 except GitPushError as e:
2368 DieWithError(str(e), change_desc)
2369
2370 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002371 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002374 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002375 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002376 # User requested to change description
2377 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002378 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002380 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002381 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002382 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002383 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002384 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002385 if len(change_ids) == 1:
2386 change_id = change_ids[0]
2387 else:
2388 change_id = GenerateGerritChangeId(change_desc.description)
2389 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002390
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002391 if options.preserve_tryjobs:
2392 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002393
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002395 parent = self._ComputeParent(
2396 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002397 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002398 with gclient_utils.temporary_file() as desc_tempfile:
2399 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2400 ref_to_push = RunGit(
2401 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002402 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002403 if options.no_add_changeid:
2404 pass
2405 else: # adding Change-Ids is okay.
2406 if not git_footers.get_footer_change_id(change_desc.description):
2407 DownloadGerritHook(False)
2408 change_desc.set_description(
2409 self._AddChangeIdToCommitMessage(change_desc.description,
2410 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002412 # For no-squash mode, we assume the remote called "origin" is the one we
2413 # want. It is not worthwhile to support different workflows for
2414 # no-squash mode.
2415 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002416 # attempt to extract the changeid from the current description
2417 # fail informatively if not possible.
2418 change_id_candidates = git_footers.get_footer_change_id(
2419 change_desc.description)
2420 if not change_id_candidates:
2421 DieWithError("Unable to extract change-id from message.")
2422 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002423
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002424 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002425 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2426 ref_to_push)]).splitlines()
2427 if len(commits) > 1:
2428 print('WARNING: This will upload %d commits. Run the following command '
2429 'to see which commits will be uploaded: ' % len(commits))
2430 print('git log %s..%s' % (parent, ref_to_push))
2431 print('You can also use `git squash-branch` to squash these into a '
2432 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002433 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002434
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002435 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002436 cc = []
2437 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2438 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2439 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002440 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002441 if len(cc) > 100:
2442 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2443 'process/lsc/lsc_workflow.md')
2444 print('WARNING: This will auto-CC %s users.' % len(cc))
2445 print('LSC may be more appropriate: %s' % lsc)
2446 print('You can also use the --no-autocc flag to disable auto-CC.')
2447 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002448 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002449 if options.cc:
2450 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002451 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002452 if change_desc.get_cced():
2453 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002454 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002455 valid_accounts = set(reviewers + cc)
2456 # TODO(crbug/877717): relax this for all hosts.
2457 else:
2458 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002459 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002460 logging.info('accounts %s are recognized, %s invalid',
2461 sorted(valid_accounts),
2462 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002463
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002464 # Extra options that can be specified at push time. Doc:
2465 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002466 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002467
Aaron Gable844cf292017-06-28 11:32:59 -07002468 # By default, new changes are started in WIP mode, and subsequent patchsets
2469 # don't send email. At any time, passing --send-mail will mark the change
2470 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002471 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002472 refspec_opts.append('ready')
2473 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002474 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002475 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002476 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002477 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002478
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002479 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002480 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002481
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002482 # Set options.title in case user was prompted in _GetTitleForUpload and
2483 # _CMDUploadChange needs to be called again.
2484 options.title = self._GetTitleForUpload(options)
2485 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002486 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002487 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002488 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002489
agablec6787972016-09-09 16:13:34 -07002490 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002491 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002492
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002493 for r in sorted(reviewers):
2494 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002495 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002496 reviewers.remove(r)
2497 else:
2498 # TODO(tandrii): this should probably be a hard failure.
2499 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2500 % r)
2501 for c in sorted(cc):
2502 # refspec option will be rejected if cc doesn't correspond to an
2503 # account, even though REST call to add such arbitrary cc may succeed.
2504 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002505 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002506 cc.remove(c)
2507
rmistry9eadede2016-09-19 11:22:43 -07002508 if options.topic:
2509 # Documentation on Gerrit topics is here:
2510 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002511 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002512
Edward Lemur687ca902018-12-05 02:30:30 +00002513 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002514 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002515 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002516 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002517 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002518 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002519 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002520 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002521 elif options.cq_quick_run:
2522 refspec_opts.append('l=Commit-Queue+1')
2523 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002524
2525 if change_desc.get_reviewers(tbr_only=True):
2526 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002527 self.GetGerritHost(),
2528 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002529 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002530
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002531 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002532 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002533 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002534 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002535 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2536
2537 refspec_suffix = ''
2538 if refspec_opts:
2539 refspec_suffix = '%' + ','.join(refspec_opts)
2540 assert ' ' not in refspec_suffix, (
2541 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2542 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002543
Edward Lemur1b52d872019-05-09 21:12:12 +00002544 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002545 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002546 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002547 'change_id': change_id,
2548 'description': change_desc.description,
2549 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002550
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002551 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002552 git_push_metadata,
2553 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002554
2555 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002556 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002557 change_numbers = [m.group(1)
2558 for m in map(regex.match, push_stdout.splitlines())
2559 if m]
2560 if len(change_numbers) != 1:
2561 DieWithError(
2562 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002563 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002564 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002565 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002566
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002567 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002568 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002569 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002570 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002571 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002572 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002573 reviewers, cc,
2574 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002575
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002576 return 0
2577
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002578 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2579 change_desc):
2580 """Computes parent of the generated commit to be uploaded to Gerrit.
2581
2582 Returns revision or a ref name.
2583 """
2584 if custom_cl_base:
2585 # Try to avoid creating additional unintended CLs when uploading, unless
2586 # user wants to take this risk.
2587 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2588 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2589 local_ref_of_target_remote])
2590 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002591 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002592 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2593 'If you proceed with upload, more than 1 CL may be created by '
2594 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2595 'If you are certain that specified base `%s` has already been '
2596 'uploaded to Gerrit as another CL, you may proceed.\n' %
2597 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2598 if not force:
2599 confirm_or_exit(
2600 'Do you take responsibility for cleaning up potential mess '
2601 'resulting from proceeding with upload?',
2602 action='upload')
2603 return custom_cl_base
2604
Aaron Gablef97e33d2017-03-30 15:44:27 -07002605 if remote != '.':
2606 return self.GetCommonAncestorWithUpstream()
2607
2608 # If our upstream branch is local, we base our squashed commit on its
2609 # squashed version.
2610 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2611
Aaron Gablef97e33d2017-03-30 15:44:27 -07002612 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002613 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002614 if upstream_branch_name == 'main':
2615 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002616
2617 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002618 # TODO(tandrii): consider checking parent change in Gerrit and using its
2619 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2620 # the tree hash of the parent branch. The upside is less likely bogus
2621 # requests to reupload parent change just because it's uploadhash is
2622 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002623 parent = scm.GIT.GetBranchConfig(
2624 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002625 # Verify that the upstream branch has been uploaded too, otherwise
2626 # Gerrit will create additional CLs when uploading.
2627 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2628 RunGitSilent(['rev-parse', parent + ':'])):
2629 DieWithError(
2630 '\nUpload upstream branch %s first.\n'
2631 'It is likely that this branch has been rebased since its last '
2632 'upload, so you just need to upload it again.\n'
2633 '(If you uploaded it with --no-squash, then branch dependencies '
2634 'are not supported, and you should reupload with --squash.)'
2635 % upstream_branch_name,
2636 change_desc)
2637 return parent
2638
Edward Lemura12175c2020-03-09 16:58:26 +00002639 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002640 """Re-commits using the current message, assumes the commit hook is in
2641 place.
2642 """
Edward Lemura12175c2020-03-09 16:58:26 +00002643 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002644 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002645 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002646 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002647 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002648
2649 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002650
tandriie113dfd2016-10-11 10:20:12 -07002651 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002652 try:
2653 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002654 except GerritChangeNotExists:
2655 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002656
2657 if data['status'] in ('ABANDONED', 'MERGED'):
2658 return 'CL %s is closed' % self.GetIssue()
2659
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002660 def GetGerritChange(self, patchset=None):
2661 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002662 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002663 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002664 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002665 data = self._GetChangeDetail(['ALL_REVISIONS'])
2666
2667 assert host and issue and patchset, 'CL must be uploaded first'
2668
2669 has_patchset = any(
2670 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002671 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002672 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002673 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002674 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002675
tandrii8c5a3532016-11-04 07:52:02 -07002676 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002677 'host': host,
2678 'change': issue,
2679 'project': data['project'],
2680 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002681 }
tandriie113dfd2016-10-11 10:20:12 -07002682
tandriide281ae2016-10-12 06:02:30 -07002683 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002684 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002685
Edward Lemur707d70b2018-02-07 00:50:14 +01002686 def GetReviewers(self):
2687 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002688 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002689
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002690
Lei Zhang8a0efc12020-08-05 19:58:45 +00002691def _get_bug_line_values(default_project_prefix, bugs):
2692 """Given default_project_prefix and comma separated list of bugs, yields bug
2693 line values.
tandriif9aefb72016-07-01 09:06:51 -07002694
2695 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002696 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002697 * string, which is left as is.
2698
2699 This function may produce more than one line, because bugdroid expects one
2700 project per line.
2701
Lei Zhang8a0efc12020-08-05 19:58:45 +00002702 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002703 ['v8:123', 'chromium:789']
2704 """
2705 default_bugs = []
2706 others = []
2707 for bug in bugs.split(','):
2708 bug = bug.strip()
2709 if bug:
2710 try:
2711 default_bugs.append(int(bug))
2712 except ValueError:
2713 others.append(bug)
2714
2715 if default_bugs:
2716 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002717 if default_project_prefix:
2718 if not default_project_prefix.endswith(':'):
2719 default_project_prefix += ':'
2720 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002721 else:
2722 yield default_bugs
2723 for other in sorted(others):
2724 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2725 yield other
2726
2727
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002728class ChangeDescription(object):
2729 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002730 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002731 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002732 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002733 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002734 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002735 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2736 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002737 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002738 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002739
Dan Beamd8b04ca2019-10-10 21:23:26 +00002740 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002741 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002742 if bug:
2743 regexp = re.compile(self.BUG_LINE)
2744 prefix = settings.GetBugPrefix()
2745 if not any((regexp.match(line) for line in self._description_lines)):
2746 values = list(_get_bug_line_values(prefix, bug))
2747 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002748 if fixed:
2749 regexp = re.compile(self.FIXED_LINE)
2750 prefix = settings.GetBugPrefix()
2751 if not any((regexp.match(line) for line in self._description_lines)):
2752 values = list(_get_bug_line_values(prefix, fixed))
2753 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002754
agable@chromium.org42c20792013-09-12 17:34:49 +00002755 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002756 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002757 return '\n'.join(self._description_lines)
2758
2759 def set_description(self, desc):
2760 if isinstance(desc, basestring):
2761 lines = desc.splitlines()
2762 else:
2763 lines = [line.rstrip() for line in desc]
2764 while lines and not lines[0]:
2765 lines.pop(0)
2766 while lines and not lines[-1]:
2767 lines.pop(-1)
2768 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002769
Edward Lemur5a644f82020-03-18 16:44:57 +00002770 def ensure_change_id(self, change_id):
2771 description = self.description
2772 footer_change_ids = git_footers.get_footer_change_id(description)
2773 # Make sure that the Change-Id in the description matches the given one.
2774 if footer_change_ids != [change_id]:
2775 if footer_change_ids:
2776 # Remove any existing Change-Id footers since they don't match the
2777 # expected change_id footer.
2778 description = git_footers.remove_footer(description, 'Change-Id')
2779 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2780 'if you want to set a new one.')
2781 # Add the expected Change-Id footer.
2782 description = git_footers.add_footer_change_id(description, change_id)
2783 self.set_description(description)
2784
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002785 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002786 """Rewrites the R=/TBR= line(s) as a single line each.
2787
2788 Args:
2789 reviewers (list(str)) - list of additional emails to use for reviewers.
2790 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002791 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002792 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002793 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002794
2795 reviewers = set(reviewers)
2796 tbrs = set(tbrs)
2797 LOOKUP = {
2798 'TBR': tbrs,
2799 'R': reviewers,
2800 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002801
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002802 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002803 regexp = re.compile(self.R_LINE)
2804 matches = [regexp.match(line) for line in self._description_lines]
2805 new_desc = [l for i, l in enumerate(self._description_lines)
2806 if not matches[i]]
2807 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002808
agable@chromium.org42c20792013-09-12 17:34:49 +00002809 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002810
2811 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002812 for match in matches:
2813 if not match:
2814 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002815 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2816
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002817 # If any folks ended up in both groups, remove them from tbrs.
2818 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002819
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002820 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2821 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002822
2823 # Put the new lines in the description where the old first R= line was.
2824 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2825 if 0 <= line_loc < len(self._description_lines):
2826 if new_tbr_line:
2827 self._description_lines.insert(line_loc, new_tbr_line)
2828 if new_r_line:
2829 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002830 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002831 if new_r_line:
2832 self.append_footer(new_r_line)
2833 if new_tbr_line:
2834 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002835
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002836 def set_preserve_tryjobs(self):
2837 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2838 footers = git_footers.parse_footers(self.description)
2839 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2840 if v.lower() == 'true':
2841 return
2842 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2843
Anthony Polito8b955342019-09-24 19:01:36 +00002844 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002845 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 self.set_description([
2847 '# Enter a description of the change.',
2848 '# This will be displayed on the codereview site.',
2849 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002850 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002851 '--------------------',
2852 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002853 bug_regexp = re.compile(self.BUG_LINE)
2854 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002855 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002856 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002857
Dan Beamd8b04ca2019-10-10 21:23:26 +00002858 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002859 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002860
Bruce Dawsonfc487042020-10-27 19:11:37 +00002861 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002862 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002863 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002864 if not content:
2865 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002866 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002867
Bruce Dawson2377b012018-01-11 16:46:49 -08002868 # Strip off comments and default inserted "Bug:" line.
2869 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002870 (line.startswith('#') or
2871 line.rstrip() == "Bug:" or
2872 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002873 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002874 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002875 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002876
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002878 """Adds a footer line to the description.
2879
2880 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2881 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2882 that Gerrit footers are always at the end.
2883 """
2884 parsed_footer_line = git_footers.parse_footer(line)
2885 if parsed_footer_line:
2886 # Line is a gerrit footer in the form: Footer-Key: any value.
2887 # Thus, must be appended observing Gerrit footer rules.
2888 self.set_description(
2889 git_footers.add_footer(self.description,
2890 key=parsed_footer_line[0],
2891 value=parsed_footer_line[1]))
2892 return
2893
2894 if not self._description_lines:
2895 self._description_lines.append(line)
2896 return
2897
2898 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2899 if gerrit_footers:
2900 # git_footers.split_footers ensures that there is an empty line before
2901 # actual (gerrit) footers, if any. We have to keep it that way.
2902 assert top_lines and top_lines[-1] == ''
2903 top_lines, separator = top_lines[:-1], top_lines[-1:]
2904 else:
2905 separator = [] # No need for separator if there are no gerrit_footers.
2906
2907 prev_line = top_lines[-1] if top_lines else ''
2908 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2909 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2910 top_lines.append('')
2911 top_lines.append(line)
2912 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002913
tandrii99a72f22016-08-17 14:33:24 -07002914 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002915 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002916 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002917 reviewers = [match.group(2).strip()
2918 for match in matches
2919 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002920 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002921
bradnelsond975b302016-10-23 12:20:23 -07002922 def get_cced(self):
2923 """Retrieves the list of reviewers."""
2924 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2925 cced = [match.group(2).strip() for match in matches if match]
2926 return cleanup_list(cced)
2927
Nodir Turakulov23b82142017-11-16 11:04:25 -08002928 def get_hash_tags(self):
2929 """Extracts and sanitizes a list of Gerrit hashtags."""
2930 subject = (self._description_lines or ('',))[0]
2931 subject = re.sub(
2932 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2933
2934 tags = []
2935 start = 0
2936 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2937 while True:
2938 m = bracket_exp.match(subject, start)
2939 if not m:
2940 break
2941 tags.append(self.sanitize_hash_tag(m.group(1)))
2942 start = m.end()
2943
2944 if not tags:
2945 # Try "Tag: " prefix.
2946 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2947 if m:
2948 tags.append(self.sanitize_hash_tag(m.group(1)))
2949 return tags
2950
2951 @classmethod
2952 def sanitize_hash_tag(cls, tag):
2953 """Returns a sanitized Gerrit hash tag.
2954
2955 A sanitized hashtag can be used as a git push refspec parameter value.
2956 """
2957 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2958
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002959
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002960def FindCodereviewSettingsFile(filename='codereview.settings'):
2961 """Finds the given file starting in the cwd and going up.
2962
2963 Only looks up to the top of the repository unless an
2964 'inherit-review-settings-ok' file exists in the root of the repository.
2965 """
2966 inherit_ok_file = 'inherit-review-settings-ok'
2967 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002968 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002969 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2970 root = '/'
2971 while True:
2972 if filename in os.listdir(cwd):
2973 if os.path.isfile(os.path.join(cwd, filename)):
2974 return open(os.path.join(cwd, filename))
2975 if cwd == root:
2976 break
2977 cwd = os.path.dirname(cwd)
2978
2979
2980def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002981 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002982 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002983
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002984 def SetProperty(name, setting, unset_error_ok=False):
2985 fullname = 'rietveld.' + name
2986 if setting in keyvals:
2987 RunGit(['config', fullname, keyvals[setting]])
2988 else:
2989 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2990
tandrii48df5812016-10-17 03:55:37 -07002991 if not keyvals.get('GERRIT_HOST', False):
2992 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002993 # Only server setting is required. Other settings can be absent.
2994 # In that case, we ignore errors raised during option deletion attempt.
2995 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2996 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2997 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002998 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002999 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3000 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003001 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3002 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003003 SetProperty(
3004 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003005 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003006
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003007 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003008 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003009
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003010 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003011 RunGit(['config', 'gerrit.squash-uploads',
3012 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003013
tandrii@chromium.org28253532016-04-14 13:46:56 +00003014 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003015 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003016 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003018 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003019 # should be of the form
3020 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3021 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003022 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3023 keyvals['ORIGIN_URL_CONFIG']])
3024
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003025
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003026def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003027 """Downloads a network object to a local file, like urllib.urlretrieve.
3028
3029 This is necessary because urllib is broken for SSL connections via a proxy.
3030 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003031 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003032 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003033
3034
ukai@chromium.org712d6102013-11-27 00:52:58 +00003035def hasSheBang(fname):
3036 """Checks fname is a #! script."""
3037 with open(fname) as f:
3038 return f.read(2).startswith('#!')
3039
3040
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003041def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003042 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003043
3044 Args:
3045 force: True to update hooks. False to install hooks if not present.
3046 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003047 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003048 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3049 if not os.access(dst, os.X_OK):
3050 if os.path.exists(dst):
3051 if not force:
3052 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003053 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003054 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003055 if not hasSheBang(dst):
3056 DieWithError('Not a script: %s\n'
3057 'You need to download from\n%s\n'
3058 'into .git/hooks/commit-msg and '
3059 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003060 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3061 except Exception:
3062 if os.path.exists(dst):
3063 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003064 DieWithError('\nFailed to download hooks.\n'
3065 'You need to download from\n%s\n'
3066 'into .git/hooks/commit-msg and '
3067 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003068
3069
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003070class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003071 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003072
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003073 _GOOGLESOURCE = 'googlesource.com'
3074
3075 def __init__(self):
3076 # Cached list of [host, identity, source], where source is either
3077 # .gitcookies or .netrc.
3078 self._all_hosts = None
3079
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003080 def ensure_configured_gitcookies(self):
3081 """Runs checks and suggests fixes to make git use .gitcookies from default
3082 path."""
3083 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3084 configured_path = RunGitSilent(
3085 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003086 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003087 if configured_path:
3088 self._ensure_default_gitcookies_path(configured_path, default)
3089 else:
3090 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003091
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003092 @staticmethod
3093 def _ensure_default_gitcookies_path(configured_path, default_path):
3094 assert configured_path
3095 if configured_path == default_path:
3096 print('git is already configured to use your .gitcookies from %s' %
3097 configured_path)
3098 return
3099
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003100 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003101 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3102 (configured_path, default_path))
3103
3104 if not os.path.exists(configured_path):
3105 print('However, your configured .gitcookies file is missing.')
3106 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3107 action='reconfigure')
3108 RunGit(['config', '--global', 'http.cookiefile', default_path])
3109 return
3110
3111 if os.path.exists(default_path):
3112 print('WARNING: default .gitcookies file already exists %s' %
3113 default_path)
3114 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3115 default_path)
3116
3117 confirm_or_exit('Move existing .gitcookies to default location?',
3118 action='move')
3119 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003120 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003121 print('Moved and reconfigured git to use .gitcookies from %s' %
3122 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003123
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003124 @staticmethod
3125 def _configure_gitcookies_path(default_path):
3126 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3127 if os.path.exists(netrc_path):
3128 print('You seem to be using outdated .netrc for git credentials: %s' %
3129 netrc_path)
3130 print('This tool will guide you through setting up recommended '
3131 '.gitcookies store for git credentials.\n'
3132 '\n'
3133 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3134 ' git config --global --unset http.cookiefile\n'
3135 ' mv %s %s.backup\n\n' % (default_path, default_path))
3136 confirm_or_exit(action='setup .gitcookies')
3137 RunGit(['config', '--global', 'http.cookiefile', default_path])
3138 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003139
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003140 def get_hosts_with_creds(self, include_netrc=False):
3141 if self._all_hosts is None:
3142 a = gerrit_util.CookiesAuthenticator()
3143 self._all_hosts = [
3144 (h, u, s)
3145 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003146 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3147 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003148 )
3149 if h.endswith(self._GOOGLESOURCE)
3150 ]
3151
3152 if include_netrc:
3153 return self._all_hosts
3154 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3155
3156 def print_current_creds(self, include_netrc=False):
3157 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3158 if not hosts:
3159 print('No Git/Gerrit credentials found')
3160 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003161 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003162 header = [('Host', 'User', 'Which file'),
3163 ['=' * l for l in lengths]]
3164 for row in (header + hosts):
3165 print('\t'.join((('%%+%ds' % l) % s)
3166 for l, s in zip(lengths, row)))
3167
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003168 @staticmethod
3169 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003170 """Parses identity "git-<username>.domain" into <username> and domain."""
3171 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003172 # distinguishable from sub-domains. But we do know typical domains:
3173 if identity.endswith('.chromium.org'):
3174 domain = 'chromium.org'
3175 username = identity[:-len('.chromium.org')]
3176 else:
3177 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003178 if username.startswith('git-'):
3179 username = username[len('git-'):]
3180 return username, domain
3181
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003182 def _canonical_git_googlesource_host(self, host):
3183 """Normalizes Gerrit hosts (with '-review') to Git host."""
3184 assert host.endswith(self._GOOGLESOURCE)
3185 # Prefix doesn't include '.' at the end.
3186 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3187 if prefix.endswith('-review'):
3188 prefix = prefix[:-len('-review')]
3189 return prefix + '.' + self._GOOGLESOURCE
3190
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003191 def _canonical_gerrit_googlesource_host(self, host):
3192 git_host = self._canonical_git_googlesource_host(host)
3193 prefix = git_host.split('.', 1)[0]
3194 return prefix + '-review.' + self._GOOGLESOURCE
3195
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003196 def _get_counterpart_host(self, host):
3197 assert host.endswith(self._GOOGLESOURCE)
3198 git = self._canonical_git_googlesource_host(host)
3199 gerrit = self._canonical_gerrit_googlesource_host(git)
3200 return git if gerrit == host else gerrit
3201
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003202 def has_generic_host(self):
3203 """Returns whether generic .googlesource.com has been configured.
3204
3205 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3206 """
3207 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3208 if host == '.' + self._GOOGLESOURCE:
3209 return True
3210 return False
3211
3212 def _get_git_gerrit_identity_pairs(self):
3213 """Returns map from canonic host to pair of identities (Git, Gerrit).
3214
3215 One of identities might be None, meaning not configured.
3216 """
3217 host_to_identity_pairs = {}
3218 for host, identity, _ in self.get_hosts_with_creds():
3219 canonical = self._canonical_git_googlesource_host(host)
3220 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3221 idx = 0 if canonical == host else 1
3222 pair[idx] = identity
3223 return host_to_identity_pairs
3224
3225 def get_partially_configured_hosts(self):
3226 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003227 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003228 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003229 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003230
3231 def get_conflicting_hosts(self):
3232 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003233 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003234 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003235 if None not in (i1, i2) and i1 != i2)
3236
3237 def get_duplicated_hosts(self):
3238 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003239 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003240
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003241
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003242 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003243 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003244 hosts = sorted(hosts)
3245 assert hosts
3246 if extra_column_func is None:
3247 extras = [''] * len(hosts)
3248 else:
3249 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003250 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3251 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003252 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003253 lines.append(tmpl % he)
3254 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003255
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003257 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003258 yield ('.googlesource.com wildcard record detected',
3259 ['Chrome Infrastructure team recommends to list full host names '
3260 'explicitly.'],
3261 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003262
3263 dups = self.get_duplicated_hosts()
3264 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003265 yield ('The following hosts were defined twice',
3266 self._format_hosts(dups),
3267 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003268
3269 partial = self.get_partially_configured_hosts()
3270 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003271 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3272 'These hosts are missing',
3273 self._format_hosts(partial, lambda host: 'but %s defined' %
3274 self._get_counterpart_host(host)),
3275 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003276
3277 conflicting = self.get_conflicting_hosts()
3278 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003279 yield ('The following Git hosts have differing credentials from their '
3280 'Gerrit counterparts',
3281 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3282 tuple(self._get_git_gerrit_identity_pairs()[host])),
3283 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003284
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003285 def find_and_report_problems(self):
3286 """Returns True if there was at least one problem, else False."""
3287 found = False
3288 bad_hosts = set()
3289 for title, sublines, hosts in self._find_problems():
3290 if not found:
3291 found = True
3292 print('\n\n.gitcookies problem report:\n')
3293 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003294 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003295 if sublines:
3296 print()
3297 print(' %s' % '\n '.join(sublines))
3298 print()
3299
3300 if bad_hosts:
3301 assert found
3302 print(' You can manually remove corresponding lines in your %s file and '
3303 'visit the following URLs with correct account to generate '
3304 'correct credential lines:\n' %
3305 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3306 print(' %s' % '\n '.join(sorted(set(
3307 gerrit_util.CookiesAuthenticator().get_new_password_url(
3308 self._canonical_git_googlesource_host(host))
3309 for host in bad_hosts
3310 ))))
3311 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003312
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003313
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003314@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003315def CMDcreds_check(parser, args):
3316 """Checks credentials and suggests changes."""
3317 _, _ = parser.parse_args(args)
3318
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003319 # Code below checks .gitcookies. Abort if using something else.
3320 authn = gerrit_util.Authenticator.get()
3321 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003322 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003323 'This command is not designed for bot environment. It checks '
3324 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003325 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3326 if isinstance(authn, gerrit_util.GceAuthenticator):
3327 message += (
3328 '\n'
3329 'If you need to run this on GCE or a cloudtop instance, '
3330 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3331 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003332
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003333 checker = _GitCookiesChecker()
3334 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003335
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003336 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003337 checker.print_current_creds(include_netrc=True)
3338
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003339 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003340 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003341 return 0
3342 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003343
3344
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003345@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003346def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003347 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003348 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003349 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003350 _, args = parser.parse_args(args)
3351 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003352 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003353 return RunGit(['config', 'branch.%s.base-url' % branch],
3354 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003355
3356 print('Setting base-url to %s' % args[0])
3357 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3358 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003359
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003360
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003361def color_for_status(status):
3362 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003363 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003364 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003365 'unsent': BOLD + Fore.YELLOW,
3366 'waiting': BOLD + Fore.RED,
3367 'reply': BOLD + Fore.YELLOW,
3368 'not lgtm': BOLD + Fore.RED,
3369 'lgtm': BOLD + Fore.GREEN,
3370 'commit': BOLD + Fore.MAGENTA,
3371 'closed': BOLD + Fore.CYAN,
3372 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003373 }.get(status, Fore.WHITE)
3374
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003375
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003376def get_cl_statuses(changes, fine_grained, max_processes=None):
3377 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003378
3379 If fine_grained is true, this will fetch CL statuses from the server.
3380 Otherwise, simply indicate if there's a matching url for the given branches.
3381
3382 If max_processes is specified, it is used as the maximum number of processes
3383 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3384 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003385
3386 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003387 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003388 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003389 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003390
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003391 if not fine_grained:
3392 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003393 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003394 for cl in changes:
3395 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003396 return
3397
3398 # First, sort out authentication issues.
3399 logging.debug('ensuring credentials exist')
3400 for cl in changes:
3401 cl.EnsureAuthenticated(force=False, refresh=True)
3402
3403 def fetch(cl):
3404 try:
3405 return (cl, cl.GetStatus())
3406 except:
3407 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003408 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003409 raise
3410
3411 threads_count = len(changes)
3412 if max_processes:
3413 threads_count = max(1, min(threads_count, max_processes))
3414 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3415
Edward Lemur61bf4172020-02-24 23:22:37 +00003416 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003417 fetched_cls = set()
3418 try:
3419 it = pool.imap_unordered(fetch, changes).__iter__()
3420 while True:
3421 try:
3422 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003423 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003424 break
3425 fetched_cls.add(cl)
3426 yield cl, status
3427 finally:
3428 pool.close()
3429
3430 # Add any branches that failed to fetch.
3431 for cl in set(changes) - fetched_cls:
3432 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003433
rmistry@google.com2dd99862015-06-22 12:22:18 +00003434
Jose Lopes3863fc52020-04-07 17:00:25 +00003435def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003436 """Uploads CLs of local branches that are dependents of the current branch.
3437
3438 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003439
3440 test1 -> test2.1 -> test3.1
3441 -> test3.2
3442 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003443
3444 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3445 run on the dependent branches in this order:
3446 test2.1, test3.1, test3.2, test2.2, test3.3
3447
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003448 Note: This function does not rebase your local dependent branches. Use it
3449 when you make a change to the parent branch that will not conflict
3450 with its dependent branches, and you would like their dependencies
3451 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003452 """
3453 if git_common.is_dirty_git_tree('upload-branch-deps'):
3454 return 1
3455
3456 root_branch = cl.GetBranch()
3457 if root_branch is None:
3458 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3459 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003460 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003461 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3462 'patchset dependencies without an uploaded CL.')
3463
3464 branches = RunGit(['for-each-ref',
3465 '--format=%(refname:short) %(upstream:short)',
3466 'refs/heads'])
3467 if not branches:
3468 print('No local branches found.')
3469 return 0
3470
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003471 # Create a dictionary of all local branches to the branches that are
3472 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003473 tracked_to_dependents = collections.defaultdict(list)
3474 for b in branches.splitlines():
3475 tokens = b.split()
3476 if len(tokens) == 2:
3477 branch_name, tracked = tokens
3478 tracked_to_dependents[tracked].append(branch_name)
3479
vapiera7fbd5a2016-06-16 09:17:49 -07003480 print()
3481 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003482 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003483
rmistry@google.com2dd99862015-06-22 12:22:18 +00003484 def traverse_dependents_preorder(branch, padding=''):
3485 dependents_to_process = tracked_to_dependents.get(branch, [])
3486 padding += ' '
3487 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003489 dependents.append(dependent)
3490 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003491
rmistry@google.com2dd99862015-06-22 12:22:18 +00003492 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003493 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003494
3495 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003496 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003497 return 0
3498
Jose Lopes3863fc52020-04-07 17:00:25 +00003499 if not force:
3500 confirm_or_exit('This command will checkout all dependent branches and run '
3501 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003502
rmistry@google.com2dd99862015-06-22 12:22:18 +00003503 # Record all dependents that failed to upload.
3504 failures = {}
3505 # Go through all dependents, checkout the branch and upload.
3506 try:
3507 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003508 print()
3509 print('--------------------------------------')
3510 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003511 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003512 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003513 try:
3514 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003515 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003516 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003517 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003518 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003519 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 finally:
3521 # Swap back to the original root branch.
3522 RunGit(['checkout', '-q', root_branch])
3523
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print()
3525 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003526 for dependent_branch in dependents:
3527 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print(' %s : %s' % (dependent_branch, upload_status))
3529 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003530
3531 return 0
3532
3533
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003534def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003535 """Given a proposed tag name, returns a tag name that is guaranteed to be
3536 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3537 or 'foo-3', and so on."""
3538
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003539 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003540 for suffix_num in itertools.count(1):
3541 if suffix_num == 1:
3542 to_check = proposed_tag
3543 else:
3544 to_check = '%s-%d' % (proposed_tag, suffix_num)
3545
3546 if to_check not in existing_tags:
3547 return to_check
3548
3549
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003550@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003551def CMDarchive(parser, args):
3552 """Archives and deletes branches associated with closed changelists."""
3553 parser.add_option(
3554 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003555 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003556 parser.add_option(
3557 '-f', '--force', action='store_true',
3558 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003559 parser.add_option(
3560 '-d', '--dry-run', action='store_true',
3561 help='Skip the branch tagging and removal steps.')
3562 parser.add_option(
3563 '-t', '--notags', action='store_true',
3564 help='Do not tag archived branches. '
3565 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003566 parser.add_option(
3567 '-p',
3568 '--pattern',
3569 default='git-cl-archived-{issue}-{branch}',
3570 help='Format string for archive tags. '
3571 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003572
kmarshall3bff56b2016-06-06 18:31:47 -07003573 options, args = parser.parse_args(args)
3574 if args:
3575 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003576
3577 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3578 if not branches:
3579 return 0
3580
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003581 tags = RunGit(['for-each-ref', '--format=%(refname)',
3582 'refs/tags']).splitlines() or []
3583 tags = [t.split('/')[-1] for t in tags]
3584
vapiera7fbd5a2016-06-16 09:17:49 -07003585 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003586 changes = [Changelist(branchref=b)
3587 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003588 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3589 statuses = get_cl_statuses(changes,
3590 fine_grained=True,
3591 max_processes=options.maxjobs)
3592 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003593 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3594 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003595 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003596 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003597 proposal.sort()
3598
3599 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003600 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003601 return 0
3602
Edward Lemur85153282020-02-14 22:06:29 +00003603 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003604
vapiera7fbd5a2016-06-16 09:17:49 -07003605 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003606 if options.notags:
3607 for next_item in proposal:
3608 print(' ' + next_item[0])
3609 else:
3610 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3611 for next_item in proposal:
3612 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003613
kmarshall9249e012016-08-23 12:02:16 -07003614 # Quit now on precondition failure or if instructed by the user, either
3615 # via an interactive prompt or by command line flags.
3616 if options.dry_run:
3617 print('\nNo changes were made (dry run).\n')
3618 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003619
3620 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003621 print('You are currently on a branch \'%s\' which is associated with a '
3622 'closed codereview issue, so archive cannot proceed. Please '
3623 'checkout another branch and run this command again.' %
3624 current_branch)
3625 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003626
3627 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003628 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003629 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003631 return 1
3632
3633 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003634 if not options.notags:
3635 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003636
3637 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3638 # Clean up the tag if we failed to delete the branch.
3639 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003640
vapiera7fbd5a2016-06-16 09:17:49 -07003641 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003642
3643 return 0
3644
3645
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003646@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003647def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003648 """Show status of changelists.
3649
3650 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003651 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003652 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003653 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003654 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003655 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003656 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003657 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003658
3659 Also see 'git cl comments'.
3660 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003661 parser.add_option(
3662 '--no-branch-color',
3663 action='store_true',
3664 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003665 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003666 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003667 parser.add_option('-f', '--fast', action='store_true',
3668 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003669 parser.add_option(
3670 '-j', '--maxjobs', action='store', type=int,
3671 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003672 parser.add_option(
3673 '-i', '--issue', type=int,
3674 help='Operate on this issue instead of the current branch\'s implicit '
3675 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003676 parser.add_option('-d',
3677 '--date-order',
3678 action='store_true',
3679 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003680 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003681 if args:
3682 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003683
iannuccie53c9352016-08-17 14:40:40 -07003684 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003685 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003686
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003687 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003688 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003689 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003690 if cl.GetIssue():
3691 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003692 elif options.field == 'id':
3693 issueid = cl.GetIssue()
3694 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003695 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003696 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003697 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003698 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003699 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003700 elif options.field == 'status':
3701 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003702 elif options.field == 'url':
3703 url = cl.GetIssueURL()
3704 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003705 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003706 return 0
3707
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003708 branches = RunGit([
3709 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3710 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003711 if not branches:
3712 print('No local branch found.')
3713 return 0
3714
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003715 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003716 Changelist(branchref=b, commit_date=ct)
3717 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3718 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003719 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003720 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003721 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003722 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003723
Edward Lemur85153282020-02-14 22:06:29 +00003724 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003725
3726 def FormatBranchName(branch, colorize=False):
3727 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3728 an asterisk when it is the current branch."""
3729
3730 asterisk = ""
3731 color = Fore.RESET
3732 if branch == current_branch:
3733 asterisk = "* "
3734 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003735 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003736
3737 if colorize:
3738 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003739 return asterisk + branch_name
3740
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003741 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003742
3743 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003744
3745 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003746 sorted_changes = sorted(changes,
3747 key=lambda c: c.GetCommitDate(),
3748 reverse=True)
3749 else:
3750 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3751 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003752 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003753 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003754 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003755 branch_statuses[c.GetBranch()] = status
3756 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003757 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003758 if url and (not status or status == 'error'):
3759 # The issue probably doesn't exist anymore.
3760 url += ' (broken)'
3761
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003762 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003763 # Turn off bold as well as colors.
3764 END = '\033[0m'
3765 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003766 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003767 color = ''
3768 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003769 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003770
Alan Cuttera3be9a52019-03-04 18:50:33 +00003771 branch_display = FormatBranchName(branch)
3772 padding = ' ' * (alignment - len(branch_display))
3773 if not options.no_branch_color:
3774 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003775
Alan Cuttera3be9a52019-03-04 18:50:33 +00003776 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3777 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003778
vapiera7fbd5a2016-06-16 09:17:49 -07003779 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003780 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003781 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003782 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003783 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003784 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003785 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003786 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003787 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003788 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003789 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003790 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003791 return 0
3792
3793
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003794def colorize_CMDstatus_doc():
3795 """To be called once in main() to add colors to git cl status help."""
3796 colors = [i for i in dir(Fore) if i[0].isupper()]
3797
3798 def colorize_line(line):
3799 for color in colors:
3800 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003801 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003802 indent = len(line) - len(line.lstrip(' ')) + 1
3803 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3804 return line
3805
3806 lines = CMDstatus.__doc__.splitlines()
3807 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3808
3809
phajdan.jre328cf92016-08-22 04:12:17 -07003810def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003811 if path == '-':
3812 json.dump(contents, sys.stdout)
3813 else:
3814 with open(path, 'w') as f:
3815 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003816
3817
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003818@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003819@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003821 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003822
3823 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003824 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003825 parser.add_option('-r', '--reverse', action='store_true',
3826 help='Lookup the branch(es) for the specified issues. If '
3827 'no issues are specified, all branches with mapped '
3828 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003829 parser.add_option('--json',
3830 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003831 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003832
dnj@chromium.org406c4402015-03-03 17:22:28 +00003833 if options.reverse:
3834 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003835 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003836 # Reverse issue lookup.
3837 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003838
3839 git_config = {}
3840 for config in RunGit(['config', '--get-regexp',
3841 r'branch\..*issue']).splitlines():
3842 name, _space, val = config.partition(' ')
3843 git_config[name] = val
3844
dnj@chromium.org406c4402015-03-03 17:22:28 +00003845 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003846 issue = git_config.get(
3847 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003848 if issue:
3849 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003850 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003851 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003852 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003853 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003854 try:
3855 issue_num = int(issue)
3856 except ValueError:
3857 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003858 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003859 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003860 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003861 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003862 if options.json:
3863 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003864 return 0
3865
3866 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003867 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003868 if not issue.valid:
3869 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3870 'or no argument to list it.\n'
3871 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003872 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003873 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003874 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003875 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003876 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3877 if options.json:
3878 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003879 'gerrit_host': cl.GetGerritHost(),
3880 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003881 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003882 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003883 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003884 return 0
3885
3886
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003887@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003888def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003889 """Shows or posts review comments for any changelist."""
3890 parser.add_option('-a', '--add-comment', dest='comment',
3891 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003892 parser.add_option('-p', '--publish', action='store_true',
3893 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003894 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003895 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003896 parser.add_option('-m', '--machine-readable', dest='readable',
3897 action='store_false', default=True,
3898 help='output comments in a format compatible with '
3899 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003900 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003901 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003902 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003903
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003904 issue = None
3905 if options.issue:
3906 try:
3907 issue = int(options.issue)
3908 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003909 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003910
Edward Lemur934836a2019-09-09 20:16:54 +00003911 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003912
3913 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003914 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003915 return 0
3916
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003917 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3918 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003919 for comment in summary:
3920 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003921 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003922 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003923 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003924 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003925 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003926 elif comment.autogenerated:
3927 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003928 else:
3929 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003930 print('\n%s%s %s%s\n%s' % (
3931 color,
3932 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3933 comment.sender,
3934 Fore.RESET,
3935 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3936
smut@google.comc85ac942015-09-15 16:34:43 +00003937 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003938 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003939 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003940 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3941 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003942 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003943 return 0
3944
3945
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003946@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003947@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003948def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003949 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003950 parser.add_option('-d', '--display', action='store_true',
3951 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003952 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003953 help='New description to set for this issue (- for stdin, '
3954 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003955 parser.add_option('-f', '--force', action='store_true',
3956 help='Delete any unpublished Gerrit edits for this issue '
3957 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003958
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003959 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003960
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003961 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003962 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003963 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003964 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003965 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003966
Edward Lemur934836a2019-09-09 20:16:54 +00003967 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003968 if target_issue_arg:
3969 kwargs['issue'] = target_issue_arg.issue
3970 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003971
3972 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003973 if not cl.GetIssue():
3974 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003975
Edward Lemur678a6842019-10-03 22:25:05 +00003976 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003977 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003978
Edward Lemur6c6827c2020-02-06 21:15:18 +00003979 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003980
smut@google.com34fb6b12015-07-13 20:03:26 +00003981 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003983 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003984
3985 if options.new_description:
3986 text = options.new_description
3987 if text == '-':
3988 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003989 elif text == '+':
3990 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003991 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003992
3993 description.set_description(text)
3994 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003995 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003996 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003997 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003998 return 0
3999
4000
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004001@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004002def CMDlint(parser, args):
4003 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004004 parser.add_option('--filter', action='append', metavar='-x,+y',
4005 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004006 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004007
4008 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004009 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004010 try:
4011 import cpplint
4012 import cpplint_chromium
4013 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004014 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004015 return 1
4016
4017 # Change the current working directory before calling lint so that it
4018 # shows the correct base.
4019 previous_cwd = os.getcwd()
4020 os.chdir(settings.GetRoot())
4021 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004022 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004023 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004024 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004025 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004026 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004027
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004028 # Process cpplint arguments, if any.
4029 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4030 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004031 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004032
Lei Zhang379d1ad2020-07-15 19:40:06 +00004033 include_regex = re.compile(settings.GetLintRegex())
4034 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004035 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4036 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004037 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004039 continue
4040
4041 if ignore_regex.match(filename):
4042 print('Ignoring file %s' % filename)
4043 continue
4044
4045 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4046 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004047 finally:
4048 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004050 if cpplint._cpplint_state.error_count != 0:
4051 return 1
4052 return 0
4053
4054
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004055@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004056def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004057 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004058 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004059 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004060 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004061 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004062 parser.add_option('--all', action='store_true',
4063 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004064 parser.add_option('--parallel', action='store_true',
4065 help='Run all tests specified by input_api.RunTests in all '
4066 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004067 parser.add_option('--resultdb', action='store_true',
4068 help='Run presubmit checks in the ResultSink environment '
4069 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004070 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004071 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004072
sbc@chromium.org71437c02015-04-09 19:29:40 +00004073 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 return 1
4076
Edward Lemur934836a2019-09-09 20:16:54 +00004077 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004078 if args:
4079 base_branch = args[0]
4080 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004081 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004082 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004083
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004084 if cl.GetIssue():
4085 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004086 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004087 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004088
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004089 cl.RunHook(
4090 committing=not options.upload,
4091 may_prompt=False,
4092 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004093 parallel=options.parallel,
4094 upstream=base_branch,
4095 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004096 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004097 resultdb=options.resultdb,
4098 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004099 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004100
4101
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004102def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004103 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004104
4105 Works the same way as
4106 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4107 but can be called on demand on all platforms.
4108
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004109 The basic idea is to generate git hash of a state of the tree, original
4110 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004111 """
4112 lines = []
4113 tree_hash = RunGitSilent(['write-tree'])
4114 lines.append('tree %s' % tree_hash.strip())
4115 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4116 if code == 0:
4117 lines.append('parent %s' % parent.strip())
4118 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4119 lines.append('author %s' % author.strip())
4120 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4121 lines.append('committer %s' % committer.strip())
4122 lines.append('')
4123 # Note: Gerrit's commit-hook actually cleans message of some lines and
4124 # whitespace. This code is not doing this, but it clearly won't decrease
4125 # entropy.
4126 lines.append(message)
4127 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004128 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004129 return 'I%s' % change_hash.strip()
4130
4131
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004132def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004133 """Computes the remote branch ref to use for the CL.
4134
4135 Args:
4136 remote (str): The git remote for the CL.
4137 remote_branch (str): The git remote branch for the CL.
4138 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004139 """
4140 if not (remote and remote_branch):
4141 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004142
wittman@chromium.org455dc922015-01-26 20:15:50 +00004143 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004144 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004145 # refs, which are then translated into the remote full symbolic refs
4146 # below.
4147 if '/' not in target_branch:
4148 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4149 else:
4150 prefix_replacements = (
4151 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4152 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4153 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4154 )
4155 match = None
4156 for regex, replacement in prefix_replacements:
4157 match = re.search(regex, target_branch)
4158 if match:
4159 remote_branch = target_branch.replace(match.group(0), replacement)
4160 break
4161 if not match:
4162 # This is a branch path but not one we recognize; use as-is.
4163 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004164 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004165 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004166 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004167 # Handle the refs that need to land in different refs.
4168 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004169
wittman@chromium.org455dc922015-01-26 20:15:50 +00004170 # Create the true path to the remote branch.
4171 # Does the following translation:
4172 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004173 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004174 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4175 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4176 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4177 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4178 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4179 'refs/heads/')
4180 elif remote_branch.startswith('refs/remotes/branch-heads'):
4181 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004182
wittman@chromium.org455dc922015-01-26 20:15:50 +00004183 return remote_branch
4184
4185
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004186def cleanup_list(l):
4187 """Fixes a list so that comma separated items are put as individual items.
4188
4189 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4190 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4191 """
4192 items = sum((i.split(',') for i in l), [])
4193 stripped_items = (i.strip() for i in items)
4194 return sorted(filter(None, stripped_items))
4195
4196
Aaron Gable4db38df2017-11-03 14:59:07 -07004197@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004198@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004199def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004200 """Uploads the current changelist to codereview.
4201
4202 Can skip dependency patchset uploads for a branch by running:
4203 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004204 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004205 git config --unset branch.branch_name.skip-deps-uploads
4206 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004207
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004208 If the name of the checked out branch starts with "bug-" or "fix-" followed
4209 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004210 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004211
4212 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004213 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004214 [git-cl] add support for hashtags
4215 Foo bar: implement foo
4216 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004217 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004218 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4219 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004220 parser.add_option('--bypass-watchlists', action='store_true',
4221 dest='bypass_watchlists',
4222 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004223 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004224 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004225 parser.add_option('--message', '-m', dest='message',
4226 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004227 parser.add_option('-b', '--bug',
4228 help='pre-populate the bug number(s) for this issue. '
4229 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004230 parser.add_option('--message-file', dest='message_file',
4231 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004232 parser.add_option('--title', '-t', dest='title',
4233 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004234 parser.add_option('-T', '--skip-title', action='store_true',
4235 dest='skip_title',
4236 help='Use the most recent commit message as the title of '
4237 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004238 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004239 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004240 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004241 parser.add_option('--tbrs',
4242 action='append', default=[],
4243 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004244 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004245 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004246 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004247 parser.add_option('--hashtag', dest='hashtags',
4248 action='append', default=[],
4249 help=('Gerrit hashtag for new CL; '
4250 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004251 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004252 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004253 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004254 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004255 metavar='TARGET',
4256 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004257 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004258 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004259 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004260 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004261 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004262 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004263 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004264 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4265 const='TBR', help='add a set of OWNERS to TBR')
4266 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4267 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004268 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004269 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004270 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004271 'implies --send-mail')
4272 parser.add_option('-d', '--cq-dry-run',
4273 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004274 help='Send the patchset to do a CQ dry run right after '
4275 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004276 parser.add_option(
4277 '-q',
4278 '--cq-quick-run',
4279 action='store_true',
4280 default=False,
4281 help='Send the patchset to do a CQ quick run right after '
4282 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4283 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004284 parser.add_option('--set-bot-commit', action='store_true',
4285 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004286 parser.add_option('--preserve-tryjobs', action='store_true',
4287 help='instruct the CQ to let tryjobs running even after '
4288 'new patchsets are uploaded instead of canceling '
4289 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004290 parser.add_option('--dependencies', action='store_true',
4291 help='Uploads CLs of all the local branches that depend on '
4292 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004293 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4294 help='Sends your change to the CQ after an approval. Only '
4295 'works on repos that have the Auto-Submit label '
4296 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004297 parser.add_option('--parallel', action='store_true',
4298 help='Run all tests specified by input_api.RunTests in all '
4299 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004300 parser.add_option('--no-autocc', action='store_true',
4301 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004302 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004303 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004304 parser.add_option('-R', '--retry-failed', action='store_true',
4305 help='Retry failed tryjobs from old patchset immediately '
4306 'after uploading new patchset. Cannot be used with '
4307 '--use-commit-queue or --cq-dry-run.')
4308 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4309 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004310 parser.add_option('--fixed', '-x',
4311 help='List of bugs that will be commented on and marked '
4312 'fixed (pre-populates "Fixed:" tag). Same format as '
4313 '-b option / "Bug:" tag. If fixing several issues, '
4314 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004315 parser.add_option('--edit-description', action='store_true', default=False,
4316 help='Modify description before upload. Cannot be used '
4317 'with --force. It is a noop when --no-squash is set '
4318 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004319 parser.add_option('--git-completion-helper', action="store_true",
4320 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004321 parser.add_option('--resultdb', action='store_true',
4322 help='Run presubmit checks in the ResultSink environment '
4323 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004324 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004325 parser.add_option('-o',
4326 '--push-options',
4327 action='append',
4328 default=[],
4329 help='Transmit the given string to the server when '
4330 'performing git push (pass-through). See git-push '
4331 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004332 parser.add_option('--no-add-changeid',
4333 action='store_true',
4334 dest='no_add_changeid',
4335 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004336
rmistry@google.com2dd99862015-06-22 12:22:18 +00004337 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004338 (options, args) = parser.parse_args(args)
4339
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004340 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004341 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4342 if opt.help != optparse.SUPPRESS_HELP))
4343 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004344
sbc@chromium.org71437c02015-04-09 19:29:40 +00004345 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004346 return 1
4347
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004348 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004349 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004350 options.cc = cleanup_list(options.cc)
4351
Josipe827b0f2020-01-30 00:07:20 +00004352 if options.edit_description and options.force:
4353 parser.error('Only one of --force and --edit-description allowed')
4354
tandriib80458a2016-06-23 12:20:07 -07004355 if options.message_file:
4356 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004357 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004358 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004359
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004360 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004361 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 options.use_commit_queue,
4363 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004364 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4365 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004366
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004367 if options.skip_title and options.title:
4368 parser.error('Only one of --title and --skip-title allowed.')
4369
Aaron Gableedbc4132017-09-11 13:22:28 -07004370 if options.use_commit_queue:
4371 options.send_mail = True
4372
Edward Lesmes0dd54822020-03-26 18:24:25 +00004373 if options.squash is None:
4374 # Load default for user, repo, squash=true, in this order.
4375 options.squash = settings.GetSquashGerritUploads()
4376
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004377 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004378 # Warm change details cache now to avoid RPCs later, reducing latency for
4379 # developers.
4380 if cl.GetIssue():
4381 cl._GetChangeDetail(
4382 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4383
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004384 if options.retry_failed and not cl.GetIssue():
4385 print('No previous patchsets, so --retry-failed has no effect.')
4386 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004387
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004388 # cl.GetMostRecentPatchset uses cached information, and can return the last
4389 # patchset before upload. Calling it here makes it clear that it's the
4390 # last patchset before upload. Note that GetMostRecentPatchset will fail
4391 # if no CL has been uploaded yet.
4392 if options.retry_failed:
4393 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004394
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004395 ret = cl.CMDUpload(options, args, orig_args)
4396
4397 if options.retry_failed:
4398 if ret != 0:
4399 print('Upload failed, so --retry-failed has no effect.')
4400 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004401 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004402 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004403 jobs = _filter_failed_for_retry(builds)
4404 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004405 print('No failed tryjobs, so --retry-failed has no effect.')
4406 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004407 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004408
4409 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004410
4411
Francois Dorayd42c6812017-05-30 15:10:20 -04004412@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004413@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004414def CMDsplit(parser, args):
4415 """Splits a branch into smaller branches and uploads CLs.
4416
4417 Creates a branch and uploads a CL for each group of files modified in the
4418 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004419 comment, the string '$directory', is replaced with the directory containing
4420 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004421 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004422 parser.add_option('-d', '--description', dest='description_file',
4423 help='A text file containing a CL description in which '
4424 '$directory will be replaced by each CL\'s directory.')
4425 parser.add_option('-c', '--comment', dest='comment_file',
4426 help='A text file containing a CL comment.')
4427 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004428 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004429 help='List the files and reviewers for each CL that would '
4430 'be created, but don\'t create branches or CLs.')
4431 parser.add_option('--cq-dry-run', action='store_true',
4432 help='If set, will do a cq dry run for each uploaded CL. '
4433 'Please be careful when doing this; more than ~10 CLs '
4434 'has the potential to overload our build '
4435 'infrastructure. Try to upload these not during high '
4436 'load times (usually 11-3 Mountain View time). Email '
4437 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004438 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4439 default=True,
4440 help='Sends your change to the CQ after an approval. Only '
4441 'works on repos that have the Auto-Submit label '
4442 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004443 options, _ = parser.parse_args(args)
4444
4445 if not options.description_file:
4446 parser.error('No --description flag specified.')
4447
4448 def WrappedCMDupload(args):
4449 return CMDupload(OptionParser(), args)
4450
Edward Lemur2c62b332020-03-12 22:12:33 +00004451 return split_cl.SplitCl(
4452 options.description_file, options.comment_file, Changelist,
4453 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4454 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004455
4456
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004457@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004458@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004460 """DEPRECATED: Used to commit the current changelist via git-svn."""
4461 message = ('git-cl no longer supports committing to SVN repositories via '
4462 'git-svn. You probably want to use `git cl land` instead.')
4463 print(message)
4464 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465
4466
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004467@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004468@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004469def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004470 """Commits the current changelist via git.
4471
4472 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4473 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004474 """
4475 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4476 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004477 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004478 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004479 parser.add_option('--parallel', action='store_true',
4480 help='Run all tests specified by input_api.RunTests in all '
4481 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004482 parser.add_option('--resultdb', action='store_true',
4483 help='Run presubmit checks in the ResultSink environment '
4484 'and send results to the ResultDB database.')
4485 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004486 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004487
Edward Lemur934836a2019-09-09 20:16:54 +00004488 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004489
Robert Iannucci2e73d432018-03-14 01:10:47 -07004490 if not cl.GetIssue():
4491 DieWithError('You must upload the change first to Gerrit.\n'
4492 ' If you would rather have `git cl land` upload '
4493 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004494 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4495 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004496
4497
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004498@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004499@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004500def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004501 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004502 parser.add_option('-b', dest='newbranch',
4503 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004504 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004505 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004507 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004508
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004509 group = optparse.OptionGroup(
4510 parser,
4511 'Options for continuing work on the current issue uploaded from a '
4512 'different clone (e.g. different machine). Must be used independently '
4513 'from the other options. No issue number should be specified, and the '
4514 'branch must have an issue number associated with it')
4515 group.add_option('--reapply', action='store_true', dest='reapply',
4516 help='Reset the branch and reapply the issue.\n'
4517 'CAUTION: This will undo any local changes in this '
4518 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004519
4520 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004521 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004522 parser.add_option_group(group)
4523
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004524 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004525
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004526 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004527 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004528 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004529 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004530 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004531
Edward Lemur934836a2019-09-09 20:16:54 +00004532 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004533 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004535
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004536 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004537 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004538 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004539
4540 RunGit(['reset', '--hard', upstream])
4541 if options.pull:
4542 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004543
Edward Lemur678a6842019-10-03 22:25:05 +00004544 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004545 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4546 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004547
4548 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004549 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004550
Edward Lemurf38bc172019-09-03 21:02:13 +00004551 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004552 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004553 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004554
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004555 # We don't want uncommitted changes mixed up with the patch.
4556 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004557 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004558
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004559 if options.newbranch:
4560 if options.force:
4561 RunGit(['branch', '-D', options.newbranch],
4562 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004563 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004564
Edward Lemur678a6842019-10-03 22:25:05 +00004565 cl = Changelist(
4566 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004567
Edward Lemur678a6842019-10-03 22:25:05 +00004568 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004569 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004570
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004571 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4572 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004573
4574
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004575def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004576 """Fetches the tree status and returns either 'open', 'closed',
4577 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004578 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004580 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 if status.find('closed') != -1 or status == '0':
4582 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004583
4584 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004586
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004587 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 return 'unset'
4589
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004590
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004591def GetTreeStatusReason():
4592 """Fetches the tree status from a json url and returns the message
4593 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004594 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004595 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004596 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004597 status = json.loads(connection.read())
4598 connection.close()
4599 return status['message']
4600
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004601
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004602@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004604 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004605 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606 status = GetTreeStatus()
4607 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004608 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004609 return 2
4610
vapiera7fbd5a2016-06-16 09:17:49 -07004611 print('The tree is %s' % status)
4612 print()
4613 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614 if status != 'open':
4615 return 1
4616 return 0
4617
4618
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004619@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004620def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004621 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4622 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004623 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004624 '-b', '--bot', action='append',
4625 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4626 'times to specify multiple builders. ex: '
4627 '"-b win_rel -b win_layout". See '
4628 'the try server waterfall for the builders name and the tests '
4629 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004630 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004631 '-B', '--bucket', default='',
4632 help=('Buildbucket bucket to send the try requests.'))
4633 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004634 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004635 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004636 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004637 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004640 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004641 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004642 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004643 '-q',
4644 '--quick-run',
4645 action='store_true',
4646 default=False,
4647 help='trigger in quick run mode '
4648 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4649 'uick_run.md) (chromium only).')
4650 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004651 '--category', default='git_cl_try', help='Specify custom build category.')
4652 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004653 '--project',
4654 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004655 'in recipe to determine to which repository or directory to '
4656 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004657 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004658 '-p', '--property', dest='properties', action='append', default=[],
4659 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004660 'key2=value2 etc. The value will be treated as '
4661 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004662 'NOTE: using this may make your tryjob not usable for CQ, '
4663 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004664 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004665 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4666 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004667 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004668 parser.add_option(
4669 '-R', '--retry-failed', action='store_true', default=False,
4670 help='Retry failed jobs from the latest set of tryjobs. '
4671 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004672 parser.add_option(
4673 '-i', '--issue', type=int,
4674 help='Operate on this issue instead of the current branch\'s implicit '
4675 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004676 options, args = parser.parse_args(args)
4677
machenbach@chromium.org45453142015-09-15 08:45:22 +00004678 # Make sure that all properties are prop=value pairs.
4679 bad_params = [x for x in options.properties if '=' not in x]
4680 if bad_params:
4681 parser.error('Got properties with missing "=": %s' % bad_params)
4682
maruel@chromium.org15192402012-09-06 12:38:29 +00004683 if args:
4684 parser.error('Unknown arguments: %s' % args)
4685
Edward Lemur934836a2019-09-09 20:16:54 +00004686 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004687 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004688 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004689
Edward Lemurf38bc172019-09-03 21:02:13 +00004690 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004691 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004692
tandriie113dfd2016-10-11 10:20:12 -07004693 error_message = cl.CannotTriggerTryJobReason()
4694 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004695 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004696
Edward Lemur45768512020-03-02 19:03:14 +00004697 if options.bot:
4698 if options.retry_failed:
4699 parser.error('--bot is not compatible with --retry-failed.')
4700 if not options.bucket:
4701 parser.error('A bucket (e.g. "chromium/try") is required.')
4702
4703 triggered = [b for b in options.bot if 'triggered' in b]
4704 if triggered:
4705 parser.error(
4706 'Cannot schedule builds on triggered bots: %s.\n'
4707 'This type of bot requires an initial job from a parent (usually a '
4708 'builder). Schedule a job on the parent instead.\n' % triggered)
4709
4710 if options.bucket.startswith('.master'):
4711 parser.error('Buildbot masters are not supported.')
4712
4713 project, bucket = _parse_bucket(options.bucket)
4714 if project is None or bucket is None:
4715 parser.error('Invalid bucket: %s.' % options.bucket)
4716 jobs = sorted((project, bucket, bot) for bot in options.bot)
4717 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004718 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004719 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004720 if options.verbose:
4721 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004722 jobs = _filter_failed_for_retry(builds)
4723 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004724 print('There are no failed jobs in the latest set of jobs '
4725 '(patchset #%d), doing nothing.' % patchset)
4726 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004727 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004728 if num_builders > 10:
4729 confirm_or_exit('There are %d builders with failed builds.'
4730 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004731 elif options.quick_run:
4732 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4733 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004734 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004735 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004736 print('git cl try with no bots now defaults to CQ dry run.')
4737 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4738 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004739
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004740 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004741 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004742 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004743 except BuildbucketResponseException as ex:
4744 print('ERROR: %s' % ex)
4745 return 1
4746 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004747
4748
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004749@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004750def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004751 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004752 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004753 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004754 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004755 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004756 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004757 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004758 '--color', action='store_true', default=setup_color.IS_TTY,
4759 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004760 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004761 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4762 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004763 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004764 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004765 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004766 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004767 parser.add_option(
4768 '-i', '--issue', type=int,
4769 help='Operate on this issue instead of the current branch\'s implicit '
4770 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004771 options, args = parser.parse_args(args)
4772 if args:
4773 parser.error('Unrecognized args: %s' % ' '.join(args))
4774
Edward Lemur934836a2019-09-09 20:16:54 +00004775 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004776 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004777 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004778
tandrii221ab252016-10-06 08:12:04 -07004779 patchset = options.patchset
4780 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004781 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004782 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004783 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004784 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004785 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004786 cl.GetIssue())
4787
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004788 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004789 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004790 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004791 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004792 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004793 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004794 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004795 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004796 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004797 return 0
4798
4799
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004800@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004801@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004802def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004803 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004804 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004805 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004806 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004807
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004808 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004809 if args:
4810 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004811 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004812 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004813 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004814 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004815
4816 # Clear configured merge-base, if there is one.
4817 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004818 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004819 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004820 return 0
4821
4822
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004823@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004824def CMDweb(parser, args):
4825 """Opens the current CL in the web browser."""
4826 _, args = parser.parse_args(args)
4827 if args:
4828 parser.error('Unrecognized args: %s' % ' '.join(args))
4829
4830 issue_url = Changelist().GetIssueURL()
4831 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004832 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004833 return 1
4834
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004835 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004836 # allows us to hide the "Created new window in existing browser session."
4837 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004838 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004839 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004840 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004841 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004842 os.open(os.devnull, os.O_RDWR)
4843 try:
4844 webbrowser.open(issue_url)
4845 finally:
4846 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004847 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004848 return 0
4849
4850
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004851@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004852def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004853 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004854 parser.add_option('-d', '--dry-run', action='store_true',
4855 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004856 parser.add_option(
4857 '-q',
4858 '--quick-run',
4859 action='store_true',
4860 help='trigger in quick run mode '
4861 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4862 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004863 parser.add_option('-c', '--clear', action='store_true',
4864 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004865 parser.add_option(
4866 '-i', '--issue', type=int,
4867 help='Operate on this issue instead of the current branch\'s implicit '
4868 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004869 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004870 if args:
4871 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004872 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4873 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004874
Edward Lemur934836a2019-09-09 20:16:54 +00004875 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004876 if not cl.GetIssue():
4877 parser.error('Must upload the issue first.')
4878
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004879 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004880 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004881 elif options.quick_run:
4882 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004883 elif options.dry_run:
4884 state = _CQState.DRY_RUN
4885 else:
4886 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004887 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004888 return 0
4889
4890
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004891@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004892def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004893 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004894 parser.add_option(
4895 '-i', '--issue', type=int,
4896 help='Operate on this issue instead of the current branch\'s implicit '
4897 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004898 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004899 if args:
4900 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004901 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004902 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004903 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004904 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004905 cl.CloseIssue()
4906 return 0
4907
4908
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004909@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004910def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004911 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004912 parser.add_option(
4913 '--stat',
4914 action='store_true',
4915 dest='stat',
4916 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004917 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004918 if args:
4919 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004920
Edward Lemur934836a2019-09-09 20:16:54 +00004921 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004922 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004923 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004924 if not issue:
4925 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004926
Aaron Gablea718c3e2017-08-28 17:47:28 -07004927 base = cl._GitGetBranchConfigValue('last-upload-hash')
4928 if not base:
4929 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4930 if not base:
4931 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4932 revision_info = detail['revisions'][detail['current_revision']]
4933 fetch_info = revision_info['fetch']['http']
4934 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4935 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004936
Aaron Gablea718c3e2017-08-28 17:47:28 -07004937 cmd = ['git', 'diff']
4938 if options.stat:
4939 cmd.append('--stat')
4940 cmd.append(base)
4941 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004942
4943 return 0
4944
4945
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004946@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004947def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004948 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004949 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004950 '--ignore-current',
4951 action='store_true',
4952 help='Ignore the CL\'s current reviewers and start from scratch.')
4953 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004954 '--ignore-self',
4955 action='store_true',
4956 help='Do not consider CL\'s author as an owners.')
4957 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004958 '--no-color',
4959 action='store_true',
4960 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004961 parser.add_option(
4962 '--batch',
4963 action='store_true',
4964 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004965 # TODO: Consider moving this to another command, since other
4966 # git-cl owners commands deal with owners for a given CL.
4967 parser.add_option(
4968 '--show-all',
4969 action='store_true',
4970 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004971 options, args = parser.parse_args(args)
4972
Edward Lemur934836a2019-09-09 20:16:54 +00004973 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004974 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004975
Yang Guo6e269a02019-06-26 11:17:02 +00004976 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004977 if len(args) == 0:
4978 print('No files specified for --show-all. Nothing to do.')
4979 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004980 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004981 for path in args:
4982 print('Owners for %s:' % path)
4983 print('\n'.join(
4984 ' - %s' % owner
4985 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004986 return 0
4987
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004988 if args:
4989 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004990 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004991 base_branch = args[0]
4992 else:
4993 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004994 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995
Edward Lemur2c62b332020-03-12 22:12:33 +00004996 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004997
4998 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004999 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5000 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005001 return 0
5002
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005003 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005004 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005005 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005006 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005007 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005008 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005009 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005010
5011
Aiden Bennerc08566e2018-10-03 17:52:42 +00005012def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005013 """Generates a diff command."""
5014 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005015 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5016
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005017 if allow_prefix:
5018 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5019 # case that diff.noprefix is set in the user's git config.
5020 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5021 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005022 diff_cmd += ['--no-prefix']
5023
5024 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005025
5026 if args:
5027 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005028 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005029 diff_cmd.append(arg)
5030 else:
5031 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005032
5033 return diff_cmd
5034
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005035
Jamie Madill5e96ad12020-01-13 16:08:35 +00005036def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5037 """Runs clang-format-diff and sets a return value if necessary."""
5038
5039 if not clang_diff_files:
5040 return 0
5041
5042 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5043 # formatted. This is used to block during the presubmit.
5044 return_value = 0
5045
5046 # Locate the clang-format binary in the checkout
5047 try:
5048 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5049 except clang_format.NotFoundError as e:
5050 DieWithError(e)
5051
5052 if opts.full or settings.GetFormatFullByDefault():
5053 cmd = [clang_format_tool]
5054 if not opts.dry_run and not opts.diff:
5055 cmd.append('-i')
5056 if opts.dry_run:
5057 for diff_file in clang_diff_files:
5058 with open(diff_file, 'r') as myfile:
5059 code = myfile.read().replace('\r\n', '\n')
5060 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5061 stdout = stdout.replace('\r\n', '\n')
5062 if opts.diff:
5063 sys.stdout.write(stdout)
5064 if code != stdout:
5065 return_value = 2
5066 else:
5067 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5068 if opts.diff:
5069 sys.stdout.write(stdout)
5070 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005071 try:
5072 script = clang_format.FindClangFormatScriptInChromiumTree(
5073 'clang-format-diff.py')
5074 except clang_format.NotFoundError as e:
5075 DieWithError(e)
5076
Edward Lesmes89624cd2020-04-06 17:51:56 +00005077 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005078 if not opts.dry_run and not opts.diff:
5079 cmd.append('-i')
5080
5081 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005082 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005083
Edward Lesmes89624cd2020-04-06 17:51:56 +00005084 env = os.environ.copy()
5085 env['PATH'] = (
5086 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5087 stdout = RunCommand(
5088 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005089 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005090 if opts.diff:
5091 sys.stdout.write(stdout)
5092 if opts.dry_run and len(stdout) > 0:
5093 return_value = 2
5094
5095 return return_value
5096
5097
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005098def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5099 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5100 presubmit checks have failed (and returns 0 otherwise)."""
5101
5102 if not rust_diff_files:
5103 return 0
5104
5105 # Locate the rustfmt binary.
5106 try:
5107 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5108 except rustfmt.NotFoundError as e:
5109 DieWithError(e)
5110
5111 # TODO(crbug.com/1231317): Support formatting only the changed lines
5112 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5113 # https://github.com/emilio/rustfmt-format-diff
5114 cmd = [rustfmt_tool]
5115 if opts.dry_run:
5116 cmd.append('--check')
5117 cmd += rust_diff_files
5118 rustfmt_exitcode = subprocess2.call(cmd)
5119
5120 if opts.presubmit and rustfmt_exitcode != 0:
5121 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005122
5123 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005124
5125
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005126def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005127 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005128 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005129
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005130
enne@chromium.org555cfe42014-01-29 18:21:39 +00005131@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005132@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005133def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005134 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005135 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005136 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005137 RUST_EXTS = ['.rs']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005138 parser.add_option('--full', action='store_true',
5139 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005140 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005141 parser.add_option('--dry-run', action='store_true',
5142 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005143 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005144 '--no-clang-format',
5145 dest='clang_format',
5146 action='store_false',
5147 default=True,
5148 help='Disables formatting of various file types using clang-format.')
5149 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005150 '--python',
5151 action='store_true',
5152 default=None,
5153 help='Enables python formatting on all python files.')
5154 parser.add_option(
5155 '--no-python',
5156 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005157 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005158 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005159 'If neither --python or --no-python are set, python files that have a '
5160 '.style.yapf file in an ancestor directory will be formatted. '
5161 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005162 parser.add_option(
5163 '--js',
5164 action='store_true',
5165 help='Format javascript code with clang-format. '
5166 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005167 parser.add_option('--diff', action='store_true',
5168 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005169 parser.add_option('--presubmit', action='store_true',
5170 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005171
5172 parser.add_option('--rust-fmt',
5173 dest='use_rust_fmt',
5174 action='store_true',
5175 default=rustfmt.IsRustfmtSupported(),
5176 help='Enables formatting of Rust file types using rustfmt.')
5177 parser.add_option(
5178 '--no-rust-fmt',
5179 dest='use_rust_fmt',
5180 action='store_false',
5181 help='Disables formatting of Rust file types using rustfmt.')
5182
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005183 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005184
Garrett Beaty91a6f332020-01-06 16:57:24 +00005185 if opts.python is not None and opts.no_python:
5186 raise parser.error('Cannot set both --python and --no-python')
5187 if opts.no_python:
5188 opts.python = False
5189
Daniel Chengc55eecf2016-12-30 03:11:02 -08005190 # Normalize any remaining args against the current path, so paths relative to
5191 # the current directory are still resolved as expected.
5192 args = [os.path.join(os.getcwd(), arg) for arg in args]
5193
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005194 # git diff generates paths against the root of the repository. Change
5195 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005196 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005197 if rel_base_path:
5198 os.chdir(rel_base_path)
5199
digit@chromium.org29e47272013-05-17 17:01:46 +00005200 # Grab the merge-base commit, i.e. the upstream commit of the current
5201 # branch when it was created or the last time it was rebased. This is
5202 # to cover the case where the user may have called "git fetch origin",
5203 # moving the origin branch to a newer commit, but hasn't rebased yet.
5204 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005205 upstream_branch = opts.upstream
5206 if not upstream_branch:
5207 cl = Changelist()
5208 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005209 if upstream_branch:
5210 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5211 upstream_commit = upstream_commit.strip()
5212
5213 if not upstream_commit:
5214 DieWithError('Could not find base commit for this branch. '
5215 'Are you in detached state?')
5216
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005217 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5218 diff_output = RunGit(changed_files_cmd)
5219 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005220 # Filter out files deleted by this CL
5221 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005222
Andreas Haas417d89c2020-02-06 10:24:27 +00005223 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005224 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005225
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005226 clang_diff_files = []
5227 if opts.clang_format:
5228 clang_diff_files = [
5229 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5230 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005231 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005232 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005233 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005234
Edward Lesmes50da7702020-03-30 19:23:43 +00005235 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005236
Jamie Madill5e96ad12020-01-13 16:08:35 +00005237 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5238 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005239
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005240 if opts.use_rust_fmt:
5241 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5242 upstream_commit)
5243 if rust_fmt_return_value == 2:
5244 return_value = 2
5245
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005246 # Similar code to above, but using yapf on .py files rather than clang-format
5247 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005248 py_explicitly_disabled = opts.python is not None and not opts.python
5249 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005250 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5251 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005252
Aiden Bennerc08566e2018-10-03 17:52:42 +00005253 # Used for caching.
5254 yapf_configs = {}
5255 for f in python_diff_files:
5256 # Find the yapf style config for the current file, defaults to depot
5257 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005258 _FindYapfConfigFile(f, yapf_configs, top_dir)
5259
5260 # Turn on python formatting by default if a yapf config is specified.
5261 # This breaks in the case of this repo though since the specified
5262 # style file is also the global default.
5263 if opts.python is None:
5264 filtered_py_files = []
5265 for f in python_diff_files:
5266 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5267 filtered_py_files.append(f)
5268 else:
5269 filtered_py_files = python_diff_files
5270
5271 # Note: yapf still seems to fix indentation of the entire file
5272 # even if line ranges are specified.
5273 # See https://github.com/google/yapf/issues/499
5274 if not opts.full and filtered_py_files:
5275 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5276
Brian Sheedyb4307d52019-12-02 19:18:17 +00005277 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5278 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5279 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005280
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005281 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005282 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5283 # Default to pep8 if not .style.yapf is found.
5284 if not yapf_style:
5285 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005286
Peter Wend9399922020-06-17 17:33:49 +00005287 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005288 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005289 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005290 else:
5291 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005292
5293 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005294
5295 has_formattable_lines = False
5296 if not opts.full:
5297 # Only run yapf over changed line ranges.
5298 for diff_start, diff_len in py_line_diffs[f]:
5299 diff_end = diff_start + diff_len - 1
5300 # Yapf errors out if diff_end < diff_start but this
5301 # is a valid line range diff for a removal.
5302 if diff_end >= diff_start:
5303 has_formattable_lines = True
5304 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5305 # If all line diffs were removals we have nothing to format.
5306 if not has_formattable_lines:
5307 continue
5308
5309 if opts.diff or opts.dry_run:
5310 cmd += ['--diff']
5311 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005312 stdout = RunCommand(cmd,
5313 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005314 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005315 cwd=top_dir,
5316 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005317 if opts.diff:
5318 sys.stdout.write(stdout)
5319 elif len(stdout) > 0:
5320 return_value = 2
5321 else:
5322 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005323 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005324
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005325 # Format GN build files. Always run on full build files for canonical form.
5326 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005327 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005328 if opts.dry_run or opts.diff:
5329 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005330 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005331 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005332 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005333 cwd=top_dir)
5334 if opts.dry_run and gn_ret == 2:
5335 return_value = 2 # Not formatted.
5336 elif opts.diff and gn_ret == 2:
5337 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005338 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005339 elif gn_ret != 0:
5340 # For non-dry run cases (and non-2 return values for dry-run), a
5341 # nonzero error code indicates a failure, probably because the file
5342 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005343 DieWithError('gn format failed on ' + gn_diff_file +
5344 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005345
Ilya Shermane081cbe2017-08-15 17:51:04 -07005346 # Skip the metrics formatting from the global presubmit hook. These files have
5347 # a separate presubmit hook that issues an error if the files need formatting,
5348 # whereas the top-level presubmit script merely issues a warning. Formatting
5349 # these files is somewhat slow, so it's important not to duplicate the work.
5350 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005351 for diff_xml in GetDiffXMLs(diff_files):
5352 xml_dir = GetMetricsDir(diff_xml)
5353 if not xml_dir:
5354 continue
5355
Ilya Shermane081cbe2017-08-15 17:51:04 -07005356 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005357 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5358 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005359
5360 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5361 # command as histograms/pretty_print.py now needs a relative path argument
5362 # after splitting the histograms into multiple directories.
5363 # For example, in tools/metrics/ukm, pretty-print could be run using:
5364 # $ python pretty_print.py
5365 # But in tools/metrics/histogrmas, pretty-print should be run with an
5366 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005367 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005368 # $ python pretty_print.py enums.xml
5369
5370 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5371 # version of histograms/pretty_print.py is released.
5372 filepath_required = os.path.exists(
5373 os.path.join(tool_dir, 'validate_prefix.py'))
5374
Weilun Shib92c4b72020-08-27 17:45:11 +00005375 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5376 or diff_xml.endswith('histogram_suffixes_list.xml')
5377 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005378 cmd.append(diff_xml)
5379
Ilya Shermane081cbe2017-08-15 17:51:04 -07005380 if opts.dry_run or opts.diff:
5381 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005382
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005383 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5384 # `shell` param and instead replace `'vpython'` with
5385 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005386 stdout = RunCommand(cmd,
5387 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005388 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005389 if opts.diff:
5390 sys.stdout.write(stdout)
5391 if opts.dry_run and stdout:
5392 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005393
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005394 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005395
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005396
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005397def GetDiffXMLs(diff_files):
5398 return [
5399 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5400 ]
5401
5402
5403def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005404 metrics_xml_dirs = [
5405 os.path.join('tools', 'metrics', 'actions'),
5406 os.path.join('tools', 'metrics', 'histograms'),
5407 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005408 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005409 os.path.join('tools', 'metrics', 'ukm'),
5410 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005411 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005412 if diff_xml.startswith(xml_dir):
5413 return xml_dir
5414 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005415
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005416
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005417@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005419def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005420 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005421 _, args = parser.parse_args(args)
5422
5423 if len(args) != 1:
5424 parser.print_help()
5425 return 1
5426
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005427 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005428 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005429 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005430
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005431 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005432
Edward Lemur52969c92020-02-06 18:15:28 +00005433 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005434 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005435 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005436
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005437 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005438 for key, issue in [x.split() for x in output.splitlines()]:
5439 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005440 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005441
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005442 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005443 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005444 return 1
5445 if len(branches) == 1:
5446 RunGit(['checkout', branches[0]])
5447 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005448 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005449 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005450 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005451 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005452 try:
5453 RunGit(['checkout', branches[int(which)]])
5454 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005455 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005456 return 1
5457
5458 return 0
5459
5460
maruel@chromium.org29404b52014-09-08 22:58:00 +00005461def CMDlol(parser, args):
5462 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005463 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005464 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5465 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5466 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005467 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005468 return 0
5469
5470
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005471class OptionParser(optparse.OptionParser):
5472 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005473
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005474 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005475 optparse.OptionParser.__init__(
5476 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005477 self.add_option(
5478 '-v', '--verbose', action='count', default=0,
5479 help='Use 2 times for more debugging info')
5480
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005481 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005482 try:
5483 return self._parse_args(args)
5484 finally:
5485 # Regardless of success or failure of args parsing, we want to report
5486 # metrics, but only after logging has been initialized (if parsing
5487 # succeeded).
5488 global settings
5489 settings = Settings()
5490
Edward Lesmes9c349062021-05-06 20:02:39 +00005491 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005492 # GetViewVCUrl ultimately calls logging method.
5493 project_url = settings.GetViewVCUrl().strip('/+')
5494 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5495 metrics.collector.add('project_urls', [project_url])
5496
5497 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005498 # Create an optparse.Values object that will store only the actual passed
5499 # options, without the defaults.
5500 actual_options = optparse.Values()
5501 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5502 # Create an optparse.Values object with the default options.
5503 options = optparse.Values(self.get_default_values().__dict__)
5504 # Update it with the options passed by the user.
5505 options._update_careful(actual_options.__dict__)
5506 # Store the options passed by the user in an _actual_options attribute.
5507 # We store only the keys, and not the values, since the values can contain
5508 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005509 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005510
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005511 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005512 logging.basicConfig(
5513 level=levels[min(options.verbose, len(levels) - 1)],
5514 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5515 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005516
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005517 return options, args
5518
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005519
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005520def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005521 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005522 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005523 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005524 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005525
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005526 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005527 dispatcher = subcommand.CommandDispatcher(__name__)
5528 try:
5529 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005530 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005531 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005532 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005533 if e.code != 500:
5534 raise
5535 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005536 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005537 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005538 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005539
5540
5541if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005542 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5543 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005544 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005545 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005546 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005547 sys.exit(main(sys.argv[1:]))