blob: 349f35e3df67a06c84e5f789a457c0be12efba17 [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
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000111DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
112DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
Edward Lesmes50da7702020-03-30 19:23:43 +0000121# The issue, patchset and codereview server are stored on git config for each
122# branch under branch.<branch-name>.<config-key>.
123ISSUE_CONFIG_KEY = 'gerritissue'
124PATCHSET_CONFIG_KEY = 'gerritpatchset'
125CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
126
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000127# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000128Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000129
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000130# Initialized in main()
131settings = None
132
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100133# Used by tests/git_cl_test.py to add extra logging.
134# Inside the weirdly failing test, add this:
135# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700136# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100137_IS_BEING_TESTED = False
138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000140_KNOWN_GERRIT_TO_SHORT_URLS = {
141 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
142 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
143}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000144assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
145 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000146
147
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000148class GitPushError(Exception):
149 pass
150
151
Christopher Lamf732cd52017-01-24 12:40:11 +1100152def DieWithError(message, change_desc=None):
153 if change_desc:
154 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000155 print('\n ** Content of CL description **\n' +
156 '='*72 + '\n' +
157 change_desc.description + '\n' +
158 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100159
vapiera7fbd5a2016-06-16 09:17:49 -0700160 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 sys.exit(1)
162
163
Christopher Lamf732cd52017-01-24 12:40:11 +1100164def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000165 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000166 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000167 with open(backup_path, 'w') as backup_file:
168 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100169
170
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000171def GetNoGitPagerEnv():
172 env = os.environ.copy()
173 # 'cat' is a magical git string that disables pagers on all platforms.
174 env['GIT_PAGER'] = 'cat'
175 return env
176
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000177
bsep@chromium.org627d9002016-04-29 00:00:52 +0000178def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000180 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
181 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000182 except subprocess2.CalledProcessError as e:
183 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000185 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
186 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
190def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000191 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000195def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700197 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000198 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700199 else:
200 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000201 try:
tandrii5d48c322016-08-18 16:19:37 -0700202 (out, _), code = subprocess2.communicate(['git'] + args,
203 env=GetNoGitPagerEnv(),
204 stdout=subprocess2.PIPE,
205 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000206 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700207 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900208 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000210
211
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000212def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000213 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000214 return RunGitWithCode(args, suppress_stderr=True)[1]
215
216
tandrii2a16b952016-10-19 07:09:44 -0700217def time_sleep(seconds):
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700220 return time.sleep(seconds)
221
222
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000223def time_time():
224 # Use this so that it can be mocked in tests without interfering with python
225 # system machinery.
226 return time.time()
227
228
Edward Lemur1b52d872019-05-09 21:12:12 +0000229def datetime_now():
230 # Use this so that it can be mocked in tests without interfering with python
231 # system machinery.
232 return datetime.datetime.now()
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000245 gclient_utils.AskForData(
246 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100247
248
249def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000250 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000251 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252 while True:
253 if 'yes'.startswith(result):
254 return True
255 if 'no'.startswith(result):
256 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000257 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100258
259
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000261 prop_list = getattr(options, 'properties', [])
262 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000263 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264 try:
265 properties[key] = json.loads(val)
266 except ValueError:
267 pass # If a value couldn't be evaluated, treat it as a string.
268 return properties
269
270
Edward Lemur4c707a22019-09-24 21:13:43 +0000271def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000272 """Calls a buildbucket v2 method and returns the parsed json response."""
273 headers = {
274 'Accept': 'application/json',
275 'Content-Type': 'application/json',
276 }
277 request = json.dumps(request)
278 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
279
280 logging.info('POST %s with %s' % (url, request))
281
282 attempts = 1
283 time_to_sleep = 1
284 while True:
285 response, content = http.request(url, 'POST', body=request, headers=headers)
286 if response.status == 200:
287 return json.loads(content[4:])
288 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
289 msg = '%s error when calling POST %s with %s: %s' % (
290 response.status, url, request, content)
291 raise BuildbucketResponseException(msg)
292 logging.debug(
293 '%s error when calling POST %s with %s. '
294 'Sleeping for %d seconds and retrying...' % (
295 response.status, url, request, time_to_sleep))
296 time.sleep(time_to_sleep)
297 time_to_sleep *= 2
298 attempts += 1
299
300 assert False, 'unreachable'
301
302
Edward Lemur6215c792019-10-03 21:59:05 +0000303def _parse_bucket(raw_bucket):
304 legacy = True
305 project = bucket = None
306 if '/' in raw_bucket:
307 legacy = False
308 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000309 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000310 elif raw_bucket.startswith('luci.'):
311 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000312 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000313 elif '.' in raw_bucket:
314 project = raw_bucket.split('.')[0]
315 bucket = raw_bucket
316 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000317 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000318 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
319 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000320
321
Quinten Yearsley777660f2020-03-04 23:37:06 +0000322def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000323 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700324
325 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000326 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000327 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700328 options: Command-line options.
329 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000331 for project, bucket, builder in jobs:
332 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 print('To see results here, run: git cl try-results')
334 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700335
Quinten Yearsley777660f2020-03-04 23:37:06 +0000336 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 if not requests:
338 return
339
Edward Lemur5b929a42019-10-21 17:57:39 +0000340 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 http.force_exception_to_status_code = True
342
343 batch_request = {'requests': requests}
344 batch_response = _call_buildbucket(
345 http, options.buildbucket_host, 'Batch', batch_request)
346
347 errors = [
348 ' ' + response['error']['message']
349 for response in batch_response.get('responses', [])
350 if 'error' in response
351 ]
352 if errors:
353 raise BuildbucketResponseException(
354 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
355
356
Quinten Yearsley777660f2020-03-04 23:37:06 +0000357def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000358 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000359 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000360 shared_properties = {
361 'category': options.ensure_value('category', 'git_cl_try')
362 }
363 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 shared_properties['clobber'] = True
365 shared_properties.update(_get_properties_from_options(options) or {})
366
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000367 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000368 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000369 shared_tags.append({'key': 'retry_failed',
370 'value': '1'})
371
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000372 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000373 for (project, bucket, builder) in jobs:
374 properties = shared_properties.copy()
375 if 'presubmit' in builder.lower():
376 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377
Edward Lemur45768512020-03-02 19:03:14 +0000378 requests.append({
379 'scheduleBuild': {
380 'requestId': str(uuid.uuid4()),
381 'builder': {
382 'project': getattr(options, 'project', None) or project,
383 'bucket': bucket,
384 'builder': builder,
385 },
386 'gerritChanges': gerrit_changes,
387 'properties': properties,
388 'tags': [
389 {'key': 'builder', 'value': builder},
390 ] + shared_tags,
391 }
392 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000393
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000394 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000395 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000396 requests[-1]['scheduleBuild']['gitilesCommit'] = {
397 'host': gerrit_changes[0]['host'],
398 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000399 'id': options.revision,
400 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000401 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000402
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000403 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000404
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000405
Quinten Yearsley777660f2020-03-04 23:37:06 +0000406def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000407 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000408
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000409 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000410 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000411 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000412 request = {
413 'predicate': {
414 'gerritChanges': [changelist.GetGerritChange(patchset)],
415 },
416 'fields': ','.join('builds.*.' + field for field in fields),
417 }
tandrii221ab252016-10-06 08:12:04 -0700418
Edward Lemur5b929a42019-10-21 17:57:39 +0000419 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000420 if authenticator.has_cached_credentials():
421 http = authenticator.authorize(httplib2.Http())
422 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700423 print('Warning: Some results might be missing because %s' %
424 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000425 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000426 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000427 http.force_exception_to_status_code = True
428
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000429 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
430 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431
Edward Lemur45768512020-03-02 19:03:14 +0000432
Edward Lemur5b929a42019-10-21 17:57:39 +0000433def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000434 """Fetches builds from the latest patchset that has builds (within
435 the last few patchsets).
436
437 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000438 changelist (Changelist): The CL to fetch builds for
439 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000440 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
441 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000442 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000443 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
444 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000445 """
446 assert buildbucket_host
447 assert changelist.GetIssue(), 'CL must be uploaded first'
448 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000449 if latest_patchset is None:
450 assert changelist.GetMostRecentPatchset()
451 ps = changelist.GetMostRecentPatchset()
452 else:
453 assert latest_patchset > 0, latest_patchset
454 ps = latest_patchset
455
Quinten Yearsley983111f2019-09-26 17:18:48 +0000456 min_ps = max(1, ps - 5)
457 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000458 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000459 if len(builds):
460 return builds, ps
461 ps -= 1
462 return [], 0
463
464
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000465def _filter_failed_for_retry(all_builds):
466 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000467
468 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000469 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000470 i.e. a list of buildbucket.v2.Builds which includes status and builder
471 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000472
473 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000474 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000475 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000476 """
Edward Lemur45768512020-03-02 19:03:14 +0000477 grouped = {}
478 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000479 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000480 key = (builder['project'], builder['bucket'], builder['builder'])
481 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000482
Edward Lemur45768512020-03-02 19:03:14 +0000483 jobs = []
484 for (project, bucket, builder), builds in grouped.items():
485 if 'triggered' in builder:
486 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
487 'from a parent. Please schedule a manual job for the parent '
488 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000489 continue
490 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
491 # Don't retry if any are running.
492 continue
Edward Lemur45768512020-03-02 19:03:14 +0000493 # If builder had several builds, retry only if the last one failed.
494 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
495 # build, but in case of retrying failed jobs retrying a flaky one makes
496 # sense.
497 builds = sorted(builds, key=lambda b: b['createTime'])
498 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
499 continue
500 # Don't retry experimental build previously triggered by CQ.
501 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
502 for t in builds[-1]['tags']):
503 continue
504 jobs.append((project, bucket, builder))
505
506 # Sort the jobs to make testing easier.
507 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000508
509
Quinten Yearsley777660f2020-03-04 23:37:06 +0000510def _print_tryjobs(options, builds):
511 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000513 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000514 return
515
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000516 longest_builder = max(len(b['builder']['builder']) for b in builds)
517 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000519 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
520 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000521
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000522 builds_by_status = {}
523 for b in builds:
524 builds_by_status.setdefault(b['status'], []).append({
525 'id': b['id'],
526 'name': name_fmt.format(
527 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
528 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000530 sort_key = lambda b: (b['name'], b['id'])
531
532 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 if not builds:
535 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000538 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540 else:
541 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
542
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000543 print(colorize(title))
544 for b in sorted(builds, key=sort_key):
545 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546
547 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 print_builds(
549 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
550 print_builds(
551 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
552 color=Fore.MAGENTA)
553 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
554 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
555 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000556 print_builds('Started:', builds_by_status.pop('STARTED', []),
557 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000558 print_builds(
559 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000561 print_builds(
562 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000563 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564
565
Aiden Bennerc08566e2018-10-03 17:52:42 +0000566def _ComputeDiffLineRanges(files, upstream_commit):
567 """Gets the changed line ranges for each file since upstream_commit.
568
569 Parses a git diff on provided files and returns a dict that maps a file name
570 to an ordered list of range tuples in the form (start_line, count).
571 Ranges are in the same format as a git diff.
572 """
573 # If files is empty then diff_output will be a full diff.
574 if len(files) == 0:
575 return {}
576
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000577 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000578 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000579 diff_output = RunGit(diff_cmd)
580
581 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
582 # 2 capture groups
583 # 0 == fname of diff file
584 # 1 == 'diff_start,diff_count' or 'diff_start'
585 # will match each of
586 # diff --git a/foo.foo b/foo.py
587 # @@ -12,2 +14,3 @@
588 # @@ -12,2 +17 @@
589 # running re.findall on the above string with pattern will give
590 # [('foo.py', ''), ('', '14,3'), ('', '17')]
591
592 curr_file = None
593 line_diffs = {}
594 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
595 if match[0] != '':
596 # Will match the second filename in diff --git a/a.py b/b.py.
597 curr_file = match[0]
598 line_diffs[curr_file] = []
599 else:
600 # Matches +14,3
601 if ',' in match[1]:
602 diff_start, diff_count = match[1].split(',')
603 else:
604 # Single line changes are of the form +12 instead of +12,1.
605 diff_start = match[1]
606 diff_count = 1
607
608 diff_start = int(diff_start)
609 diff_count = int(diff_count)
610
611 # If diff_count == 0 this is a removal we can ignore.
612 line_diffs[curr_file].append((diff_start, diff_count))
613
614 return line_diffs
615
616
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000617def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000618 """Checks if a yapf file is in any parent directory of fpath until top_dir.
619
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000620 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000621 is found returns None. Uses yapf_config_cache as a cache for previously found
622 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000624 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000625 # Return result if we've already computed it.
626 if fpath in yapf_config_cache:
627 return yapf_config_cache[fpath]
628
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000629 parent_dir = os.path.dirname(fpath)
630 if os.path.isfile(fpath):
631 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000632 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000633 # Otherwise fpath is a directory
634 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
635 if os.path.isfile(yapf_file):
636 ret = yapf_file
637 elif fpath == top_dir or parent_dir == fpath:
638 # If we're at the top level directory, or if we're at root
639 # there is no provided style.
640 ret = None
641 else:
642 # Otherwise recurse on the current directory.
643 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000644 yapf_config_cache[fpath] = ret
645 return ret
646
647
Brian Sheedyb4307d52019-12-02 19:18:17 +0000648def _GetYapfIgnorePatterns(top_dir):
649 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000650
651 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
652 but this functionality appears to break when explicitly passing files to
653 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000654 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000655 the .yapfignore file should be in the directory that yapf is invoked from,
656 which we assume to be the top level directory in this case.
657
658 Args:
659 top_dir: The top level directory for the repository being formatted.
660
661 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000662 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000663 """
664 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000665 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000666 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000668
Anthony Politoc64e3902021-04-30 21:55:25 +0000669 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
670 stripped_line = line.strip()
671 # Comments and blank lines should be ignored.
672 if stripped_line.startswith('#') or stripped_line == '':
673 continue
674 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000675 return ignore_patterns
676
677
678def _FilterYapfIgnoredFiles(filepaths, patterns):
679 """Filters out any filepaths that match any of the given patterns.
680
681 Args:
682 filepaths: An iterable of strings containing filepaths to filter.
683 patterns: An iterable of strings containing fnmatch patterns to filter on.
684
685 Returns:
686 A list of strings containing all the elements of |filepaths| that did not
687 match any of the patterns in |patterns|.
688 """
689 # Not inlined so that tests can use the same implementation.
690 return [f for f in filepaths
691 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000692
693
Aaron Gable13101a62018-02-09 13:20:41 -0800694def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000695 """Prints statistics about the change to the user."""
696 # --no-ext-diff is broken in some versions of Git, so try to work around
697 # this by overriding the environment (but there is still a problem if the
698 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000699 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 if 'GIT_EXTERNAL_DIFF' in env:
701 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000702
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000703 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800704 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000705 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000706
707
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000708class BuildbucketResponseException(Exception):
709 pass
710
711
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000712class Settings(object):
713 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000714 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000715 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716 self.tree_status_url = None
717 self.viewvc_url = None
718 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000719 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000720 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000721 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000722 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000723 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000724 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000725
Edward Lemur26964072020-02-19 19:18:51 +0000726 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000727 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000728 if self.updated:
729 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000730
Edward Lemur26964072020-02-19 19:18:51 +0000731 # The only value that actually changes the behavior is
732 # autoupdate = "false". Everything else means "true".
733 autoupdate = (
734 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
735
736 cr_settings_file = FindCodereviewSettingsFile()
737 if autoupdate != 'false' and cr_settings_file:
738 LoadCodereviewSettingsFromFile(cr_settings_file)
739 cr_settings_file.close()
740
741 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000742
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000743 @staticmethod
744 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000745 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000746
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000747 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000748 if self.root is None:
749 self.root = os.path.abspath(self.GetRelativeRoot())
750 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 def GetTreeStatusUrl(self, error_ok=False):
753 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000754 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
755 if self.tree_status_url is None and not error_ok:
756 DieWithError(
757 'You must configure your tree status URL by running '
758 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000759 return self.tree_status_url
760
761 def GetViewVCUrl(self):
762 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000763 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 return self.viewvc_url
765
rmistry@google.com90752582014-01-14 21:04:50 +0000766 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000767 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000768
rmistry@google.com5626a922015-02-26 14:03:30 +0000769 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000770 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000771 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000772 return run_post_upload_hook == "True"
773
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000774 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000775 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000776
Dirk Pranke6f0df682021-06-25 00:42:33 +0000777 def GetUsePython3(self):
778 return self._GetConfig('rietveld.use-python3')
779
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000780 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000781 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000782 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000783 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
784 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000785 # Default is squash now (http://crbug.com/611892#c23).
786 self.squash_gerrit_uploads = self._GetConfig(
787 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000788 return self.squash_gerrit_uploads
789
Edward Lesmes4de54132020-05-05 19:41:33 +0000790 def GetSquashGerritUploadsOverride(self):
791 """Return True or False if codereview.settings should be overridden.
792
793 Returns None if no override has been defined.
794 """
795 # See also http://crbug.com/611892#c23
796 result = self._GetConfig('gerrit.override-squash-uploads').lower()
797 if result == 'true':
798 return True
799 if result == 'false':
800 return False
801 return None
802
tandrii@chromium.org28253532016-04-14 13:46:56 +0000803 def GetGerritSkipEnsureAuthenticated(self):
804 """Return True if EnsureAuthenticated should not be done for Gerrit
805 uploads."""
806 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000807 self.gerrit_skip_ensure_authenticated = self._GetConfig(
808 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000809 return self.gerrit_skip_ensure_authenticated
810
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000811 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000812 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000813 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000814 # Git requires single quotes for paths with spaces. We need to replace
815 # them with double quotes for Windows to treat such paths as a single
816 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000817 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000818 return self.git_editor or None
819
thestig@chromium.org44202a22014-03-11 19:22:18 +0000820 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000821 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000822
823 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000824 return self._GetConfig(
825 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000826
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000827 def GetFormatFullByDefault(self):
828 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000829 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000830 result = (
831 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
832 error_ok=True).strip())
833 self.format_full_by_default = (result == 'true')
834 return self.format_full_by_default
835
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000836 def IsStatusCommitOrderByDate(self):
837 if self.is_status_commit_order_by_date is None:
838 result = (RunGit(['config', '--bool', 'cl.date-order'],
839 error_ok=True).strip())
840 self.is_status_commit_order_by_date = (result == 'true')
841 return self.is_status_commit_order_by_date
842
Edward Lemur26964072020-02-19 19:18:51 +0000843 def _GetConfig(self, key, default=''):
844 self._LazyUpdateIfNeeded()
845 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000846
847
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000848class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000849 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000850 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000851 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000852 DRY_RUN = 'dry_run'
853 COMMIT = 'commit'
854
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000855 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000856
857
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000858class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000859 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000860 self.issue = issue
861 self.patchset = patchset
862 self.hostname = hostname
863
864 @property
865 def valid(self):
866 return self.issue is not None
867
868
Edward Lemurf38bc172019-09-03 21:02:13 +0000869def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000870 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
871 fail_result = _ParsedIssueNumberArgument()
872
Edward Lemur678a6842019-10-03 22:25:05 +0000873 if isinstance(arg, int):
874 return _ParsedIssueNumberArgument(issue=arg)
875 if not isinstance(arg, basestring):
876 return fail_result
877
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000878 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000879 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000880 if not arg.startswith('http'):
881 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700882
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000883 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000884 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
885 if url.startswith(short_url):
886 url = gerrit_url + url[len(short_url):]
887 break
888
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000889 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000890 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000891 except ValueError:
892 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200893
Edward Lemur678a6842019-10-03 22:25:05 +0000894 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
895 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
896 # Short urls like https://domain/<issue_number> can be used, but don't allow
897 # specifying the patchset (you'd 404), but we allow that here.
898 if parsed_url.path == '/':
899 part = parsed_url.fragment
900 else:
901 part = parsed_url.path
902
903 match = re.match(
904 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
905 if not match:
906 return fail_result
907
908 issue = int(match.group('issue'))
909 patchset = match.group('patchset')
910 return _ParsedIssueNumberArgument(
911 issue=issue,
912 patchset=int(patchset) if patchset else None,
913 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000914
915
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000916def _create_description_from_log(args):
917 """Pulls out the commit log to use as a base for the CL description."""
918 log_args = []
919 if len(args) == 1 and not args[0].endswith('.'):
920 log_args = [args[0] + '..']
921 elif len(args) == 1 and args[0].endswith('...'):
922 log_args = [args[0][:-1]]
923 elif len(args) == 2:
924 log_args = [args[0] + '..' + args[1]]
925 else:
926 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000927 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000928
929
Aaron Gablea45ee112016-11-22 15:14:38 -0800930class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700931 def __init__(self, issue, url):
932 self.issue = issue
933 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800934 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700935
936 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800937 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700938 self.issue, self.url)
939
940
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100941_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000942 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100943 # TODO(tandrii): these two aren't known in Gerrit.
944 'approval', 'disapproval'])
945
946
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000947class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000948 """Changelist works with one changelist in local branch.
949
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000950 Notes:
951 * Not safe for concurrent multi-{thread,process} use.
952 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700953 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000954 """
955
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000956 def __init__(self,
957 branchref=None,
958 issue=None,
959 codereview_host=None,
960 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000961 """Create a new ChangeList instance.
962
Edward Lemurf38bc172019-09-03 21:02:13 +0000963 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000964 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000965 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000966 global settings
967 if not settings:
968 # Happens when git_cl.py is used as a utility library.
969 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000970
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971 self.branchref = branchref
972 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000973 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000974 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000975 else:
976 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000977 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000978 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000979 self.lookedup_issue = False
980 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000981 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000982 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000983 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000984 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800985 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000986 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000987 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000988
Edward Lemur125d60a2019-09-13 18:25:41 +0000989 # Lazily cached values.
990 self._gerrit_host = None # e.g. chromium-review.googlesource.com
991 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +0000992 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +0000993 # Map from change number (issue) to its detail cache.
994 self._detail_cache = {}
995
996 if codereview_host is not None:
997 assert not codereview_host.startswith('https://'), codereview_host
998 self._gerrit_host = codereview_host
999 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001000
Edward Lesmese1576912021-02-16 21:53:34 +00001001 @property
1002 def owners_client(self):
1003 if self._owners_client is None:
1004 remote, remote_branch = self.GetRemoteBranch()
1005 branch = GetTargetRef(remote, remote_branch, None)
1006 self._owners_client = owners_client.GetCodeOwnersClient(
1007 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001008 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001009 host=self.GetGerritHost(),
1010 project=self.GetGerritProject(),
1011 branch=branch)
1012 return self._owners_client
1013
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001014 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001015 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001016
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001017 The return value is a string suitable for passing to git cl with the --cc
1018 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001019 """
1020 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001021 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001022 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001023 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1024 return self.cc
1025
Daniel Cheng7227d212017-11-17 08:12:37 -08001026 def ExtendCC(self, more_cc):
1027 """Extends the list of users to cc on this CL based on the changed files."""
1028 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001030 def GetCommitDate(self):
1031 """Returns the commit date as provided in the constructor"""
1032 return self.commit_date
1033
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001035 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001037 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001038 if not branchref:
1039 return None
1040 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001041 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 return self.branch
1043
1044 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001045 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 self.GetBranch() # Poke the lazy loader.
1047 return self.branchref
1048
Edward Lemur85153282020-02-14 22:06:29 +00001049 def _GitGetBranchConfigValue(self, key, default=None):
1050 return scm.GIT.GetBranchConfig(
1051 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001052
Edward Lemur85153282020-02-14 22:06:29 +00001053 def _GitSetBranchConfigValue(self, key, value):
1054 action = 'set %s to %r' % (key, value)
1055 if not value:
1056 action = 'unset %s' % key
1057 assert self.GetBranch(), 'a branch is needed to ' + action
1058 return scm.GIT.SetBranchConfig(
1059 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001060
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001061 @staticmethod
1062 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001063 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001064 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001065 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001066 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1067 settings.GetRoot(), branch)
1068 if not remote or not upstream_branch:
1069 DieWithError(
1070 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001071 'Verify this branch is set up to track another \n'
1072 '(via the --track argument to "git checkout -b ..."). \n'
1073 'or pass complete "git diff"-style arguments if supported, like\n'
1074 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001075
1076 return remote, upstream_branch
1077
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001078 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001079 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001080 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001081 DieWithError('The upstream for the current branch (%s) does not exist '
1082 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001083 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001084 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001085
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001086 def GetUpstreamBranch(self):
1087 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001088 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001089 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001090 upstream_branch = upstream_branch.replace('refs/heads/',
1091 'refs/remotes/%s/' % remote)
1092 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1093 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094 self.upstream_branch = upstream_branch
1095 return self.upstream_branch
1096
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001097 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001098 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001099 remote, branch = None, self.GetBranch()
1100 seen_branches = set()
1101 while branch not in seen_branches:
1102 seen_branches.add(branch)
1103 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001104 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001105 if remote != '.' or branch.startswith('refs/remotes'):
1106 break
1107 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001108 remotes = RunGit(['remote'], error_ok=True).split()
1109 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001110 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001111 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001113 logging.warning('Could not determine which remote this change is '
1114 'associated with, so defaulting to "%s".' %
1115 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001116 else:
Gavin Make6a62332020-12-04 21:57:10 +00001117 logging.warning('Could not determine which remote this change is '
1118 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001119 branch = 'HEAD'
1120 if branch.startswith('refs/remotes'):
1121 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001122 elif branch.startswith('refs/branch-heads/'):
1123 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 else:
1125 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001126 return self._remote
1127
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 def GetRemoteUrl(self):
1129 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1130
1131 Returns None if there is no remote.
1132 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001133 is_cached, value = self._cached_remote_url
1134 if is_cached:
1135 return value
1136
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001137 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001138 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001139
Edward Lemur298f2cf2019-02-22 21:40:39 +00001140 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001141 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001142 if host:
1143 self._cached_remote_url = (True, url)
1144 return url
1145
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001146 # If it cannot be parsed as an url, assume it is a local directory,
1147 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001148 logging.warning('"%s" doesn\'t appear to point to a git host. '
1149 'Interpreting it as a local directory.', url)
1150 if not os.path.isdir(url):
1151 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001152 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1153 'but it doesn\'t exist.',
1154 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001155 return None
1156
1157 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001158 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001159
Edward Lemur79d4f992019-11-11 23:49:02 +00001160 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001161 if not host:
1162 logging.error(
1163 'Remote "%(remote)s" for branch "%(branch)s" points to '
1164 '"%(cache_path)s", but it is misconfigured.\n'
1165 '"%(cache_path)s" must be a git repo and must have a remote named '
1166 '"%(remote)s" pointing to the git host.', {
1167 'remote': remote,
1168 'cache_path': cache_path,
1169 'branch': self.GetBranch()})
1170 return None
1171
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001172 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001173 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001174
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001175 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001176 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001177 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001178 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001179 if self.issue is not None:
1180 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001181 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001182 return self.issue
1183
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001184 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001186 issue = self.GetIssue()
1187 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001188 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001189 server = self.GetCodereviewServer()
1190 if short:
1191 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1192 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193
Dirk Pranke6f0df682021-06-25 00:42:33 +00001194 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001195 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001196
Edward Lemur6c6827c2020-02-06 21:15:18 +00001197 def FetchDescription(self, pretty=False):
1198 assert self.GetIssue(), 'issue is required to query Gerrit'
1199
Edward Lemur9aa1a962020-02-25 00:58:38 +00001200 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001201 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1202 current_rev = data['current_revision']
1203 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001204
1205 if not pretty:
1206 return self.description
1207
1208 # Set width to 72 columns + 2 space indent.
1209 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1210 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1211 lines = self.description.splitlines()
1212 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001213
1214 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001215 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001216 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001217 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001218 if self.patchset is not None:
1219 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001220 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001221 return self.patchset
1222
Edward Lemur9aa1a962020-02-25 00:58:38 +00001223 def GetAuthor(self):
1224 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1225
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001226 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001227 """Set this branch's patchset. If patchset=0, clears the patchset."""
1228 assert self.GetBranch()
1229 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001230 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001231 else:
1232 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001233 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001235 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001236 """Set this branch's issue. If issue isn't given, clears the issue."""
1237 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001238 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001239 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001240 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001241 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001242 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001243 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001244 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001245 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 else:
tandrii5d48c322016-08-18 16:19:37 -07001247 # Reset all of these just to be clean.
1248 reset_suffixes = [
1249 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001250 ISSUE_CONFIG_KEY,
1251 PATCHSET_CONFIG_KEY,
1252 CODEREVIEW_SERVER_CONFIG_KEY,
1253 'gerritsquashhash',
1254 ]
tandrii5d48c322016-08-18 16:19:37 -07001255 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001256 try:
1257 self._GitSetBranchConfigValue(prop, None)
1258 except subprocess2.CalledProcessError:
1259 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001260 msg = RunGit(['log', '-1', '--format=%B']).strip()
1261 if msg and git_footers.get_footer_change_id(msg):
1262 print('WARNING: The change patched into this branch has a Change-Id. '
1263 'Removing it.')
1264 RunGit(['commit', '--amend', '-m',
1265 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001266 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001267 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001268 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269
Edward Lemur2c62b332020-03-12 22:12:33 +00001270 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001271 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001272 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001273 except subprocess2.CalledProcessError:
1274 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001275 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001276 'This branch probably doesn\'t exist anymore. To reset the\n'
1277 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001278 ' git branch --set-upstream-to origin/main %s\n'
1279 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001280 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001281
dsansomee2d6fd92016-09-08 00:10:47 -07001282 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001283 assert self.GetIssue(), 'issue is required to update description'
1284
1285 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001286 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001287 if not force:
1288 confirm_or_exit(
1289 'The description cannot be modified while the issue has a pending '
1290 'unpublished edit. Either publish the edit in the Gerrit web UI '
1291 'or delete it.\n\n', action='delete the unpublished edit')
1292
1293 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001294 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001295 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001296 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001297 description, notify='NONE')
1298
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001299 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001300
Edward Lemur75526302020-02-27 22:31:05 +00001301 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001302 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001303 '--root', settings.GetRoot(),
1304 '--upstream', upstream,
1305 ]
1306
1307 args.extend(['--verbose'] * verbose)
1308
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001309 remote, remote_branch = self.GetRemoteBranch()
1310 target_ref = GetTargetRef(remote, remote_branch, None)
1311 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1312 args.extend(['--gerrit_project', self.GetGerritProject()])
1313 args.extend(['--gerrit_branch', target_ref])
1314
Edward Lemur99df04e2020-03-05 19:39:43 +00001315 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001316 issue = self.GetIssue()
1317 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001318 if author:
1319 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001320 if issue:
1321 args.extend(['--issue', str(issue)])
1322 if patchset:
1323 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001324
Edward Lemur75526302020-02-27 22:31:05 +00001325 return args
1326
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001327 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001328 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001329 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1330 args = self._GetCommonPresubmitArgs(verbose, upstream)
1331 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001332 if may_prompt:
1333 args.append('--may_prompt')
1334 if parallel:
1335 args.append('--parallel')
1336 if all_files:
1337 args.append('--all_files')
1338
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001339 if resultdb and not realm:
1340 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1341 # it is not required to pass the realm flag
1342 print('Note: ResultDB reporting will NOT be performed because --realm'
1343 ' was not specified. To enable ResultDB, please run the command'
1344 ' again with the --realm argument to specify the LUCI realm.')
1345
1346 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1347 use_python3=False)
1348 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1349 use_python3=True)
1350 return self._MergePresubmitResults(py2_results, py3_results)
1351
1352 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1353 args = args[:]
1354 vpython = 'vpython3' if use_python3 else 'vpython'
1355
Edward Lemur227d5102020-02-25 23:45:35 +00001356 with gclient_utils.temporary_file() as description_file:
1357 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001358 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001359 args.extend(['--json_output', json_output])
1360 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001361 if self.GetUsePython3():
1362 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001363 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001364 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001365 if resultdb and realm:
1366 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001367
1368 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001369 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001370
Edward Lemur227d5102020-02-25 23:45:35 +00001371 metrics.collector.add_repeated('sub_commands', {
1372 'command': 'presubmit',
1373 'execution_time': time_time() - start,
1374 'exit_code': exit_code,
1375 })
1376
1377 if exit_code:
1378 sys.exit(exit_code)
1379
1380 json_results = gclient_utils.FileRead(json_output)
1381 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001382
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001383 def _MergePresubmitResults(self, py2_results, py3_results):
1384 return {
1385 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1386 py3_results.get('more_cc', []))),
1387 'errors': (
1388 py2_results.get('errors', []) + py3_results.get('errors', [])),
1389 'notifications': (
1390 py2_results.get('notifications', []) +
1391 py3_results.get('notifications', [])),
1392 'warnings': (
1393 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1394 }
1395
Edward Lemur75526302020-02-27 22:31:05 +00001396 def RunPostUploadHook(self, verbose, upstream, description):
1397 args = self._GetCommonPresubmitArgs(verbose, upstream)
1398 args.append('--post_upload')
1399
1400 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001401 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001402 args.extend(['--description_file', description_file])
1403 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1404 p.wait()
1405
Edward Lemur5a644f82020-03-18 16:44:57 +00001406 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1407 # Get description message for upload.
1408 if self.GetIssue():
1409 description = self.FetchDescription()
1410 elif options.message:
1411 description = options.message
1412 else:
1413 description = _create_description_from_log(git_diff_args)
1414 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001415 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001416
Edward Lemur5a644f82020-03-18 16:44:57 +00001417 bug = options.bug
1418 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001419 if not self.GetIssue():
1420 # Extract bug number from branch name, but only if issue is being created.
1421 # It must start with bug or fix, followed by _ or - and number.
1422 # Optionally, it may contain _ or - after number with arbitrary text.
1423 # Examples:
1424 # bug-123
1425 # bug_123
1426 # fix-123
1427 # fix-123-some-description
1428 match = re.match(
1429 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1430 self.GetBranch())
1431 if not bug and not fixed and match:
1432 if match.group('type') == 'bug':
1433 bug = match.group('bugnum')
1434 else:
1435 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001436
1437 change_description = ChangeDescription(description, bug, fixed)
1438
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001439 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1440 if options.add_owners_to:
1441 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001442 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001443 files, [], options.tbrs + options.reviewers)
1444 missing_files = [
1445 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001446 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001447 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001448 owners = self.owners_client.SuggestOwners(
1449 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001450 if options.add_owners_to == 'TBR':
1451 assert isinstance(options.tbrs, list), options.tbrs
1452 options.tbrs.extend(owners)
1453 else:
1454 assert isinstance(options.reviewers, list), options.reviewers
1455 options.reviewers.extend(owners)
1456
Edward Lemur5a644f82020-03-18 16:44:57 +00001457 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001458 if options.reviewers or options.tbrs:
1459 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001460
1461 return change_description
1462
1463 def _GetTitleForUpload(self, options):
1464 # When not squashing, just return options.title.
1465 if not options.squash:
1466 return options.title
1467
1468 # On first upload, patchset title is always this string, while options.title
1469 # gets converted to first line of message.
1470 if not self.GetIssue():
1471 return 'Initial upload'
1472
1473 # When uploading subsequent patchsets, options.message is taken as the title
1474 # if options.title is not provided.
1475 if options.title:
1476 return options.title
1477 if options.message:
1478 return options.message.strip()
1479
1480 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001481 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001482 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001483 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001484 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001485
1486 # Use the default title if the user confirms the default with a 'y'.
1487 if user_title.lower() == 'y':
1488 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001489 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001490
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001491 def CMDUpload(self, options, git_diff_args, orig_args):
1492 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001493 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001494 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001495 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001496 else:
1497 if self.GetBranch() is None:
1498 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1499
1500 # Default to diffing against common ancestor of upstream branch
1501 base_branch = self.GetCommonAncestorWithUpstream()
1502 git_diff_args = [base_branch, 'HEAD']
1503
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001504 # Fast best-effort checks to abort before running potentially expensive
1505 # hooks if uploading is likely to fail anyway. Passing these checks does
1506 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001507 self.EnsureAuthenticated(force=options.force)
1508 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001509
1510 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001511 watchlist = watchlists.Watchlists(settings.GetRoot())
1512 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001513 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001514 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515
Edward Lemur5a644f82020-03-18 16:44:57 +00001516 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001517 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001518 hook_results = self.RunHook(
1519 committing=False,
1520 may_prompt=not options.force,
1521 verbose=options.verbose,
1522 parallel=options.parallel,
1523 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001524 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001525 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001526 resultdb=options.resultdb,
1527 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001528 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001529
Aaron Gable13101a62018-02-09 13:20:41 -08001530 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001531 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001532 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001533 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001534 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001535 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536 # Run post upload hooks, if specified.
1537 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001538 self.RunPostUploadHook(
1539 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540
1541 # Upload all dependencies if specified.
1542 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001543 print()
1544 print('--dependencies has been specified.')
1545 print('All dependent local branches will be re-uploaded.')
1546 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 # Remove the dependencies flag from args so that we do not end up in a
1548 # loop.
1549 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001550 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001551 return ret
1552
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001553 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001554 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001555
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001556 Issue must have been already uploaded and known. Optionally allows for
1557 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001558 """
1559 assert new_state in _CQState.ALL_STATES
1560 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001561 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001562 vote_map = {
1563 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001564 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001565 _CQState.DRY_RUN: 1,
1566 _CQState.COMMIT: 2,
1567 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001568 if new_state == _CQState.QUICK_RUN:
1569 labels = {
1570 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1571 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1572 }
1573 else:
1574 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001575 notify = False if new_state == _CQState.DRY_RUN else None
1576 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001577 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001578 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001579 return 0
1580 except KeyboardInterrupt:
1581 raise
1582 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001583 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001584 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001585 ' * Your project has no CQ,\n'
1586 ' * You don\'t have permission to change the CQ state,\n'
1587 ' * There\'s a bug in this code (see stack trace below).\n'
1588 'Consider specifying which bots to trigger manually or asking your '
1589 'project owners for permissions or contacting Chrome Infra at:\n'
1590 'https://www.chromium.org/infra\n\n' %
1591 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001592 # Still raise exception so that stack trace is printed.
1593 raise
1594
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001595 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001596 # Lazy load of configs.
1597 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001598 if self._gerrit_host and '.' not in self._gerrit_host:
1599 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1600 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001601 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001602 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001603 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001604 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001605 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1606 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607 return self._gerrit_host
1608
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001609 def _GetGitHost(self):
1610 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001611 remote_url = self.GetRemoteUrl()
1612 if not remote_url:
1613 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001614 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001615
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001616 def GetCodereviewServer(self):
1617 if not self._gerrit_server:
1618 # If we're on a branch then get the server potentially associated
1619 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001620 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001621 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001622 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001623 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001624 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001625 if not self._gerrit_server:
1626 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1627 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001628 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001629 parts[0] = parts[0] + '-review'
1630 self._gerrit_host = '.'.join(parts)
1631 self._gerrit_server = 'https://%s' % self._gerrit_host
1632 return self._gerrit_server
1633
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001634 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001635 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001636 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001637 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001638 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001639 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001640 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001641 if project.endswith('.git'):
1642 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001643 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1644 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1645 # gitiles/git-over-https protocol. E.g.,
1646 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1647 # as
1648 # https://chromium.googlesource.com/v8/v8
1649 if project.startswith('a/'):
1650 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001651 return project
1652
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001653 def _GerritChangeIdentifier(self):
1654 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1655
1656 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001657 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001658 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001659 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001660 if project:
1661 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1662 # Fall back on still unique, but less efficient change number.
1663 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001664
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001665 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001666 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001667 if settings.GetGerritSkipEnsureAuthenticated():
1668 # For projects with unusual authentication schemes.
1669 # See http://crbug.com/603378.
1670 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001671
1672 # Check presence of cookies only if using cookies-based auth method.
1673 cookie_auth = gerrit_util.Authenticator.get()
1674 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001675 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001676
Florian Mayerae510e82020-01-30 21:04:48 +00001677 remote_url = self.GetRemoteUrl()
1678 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001679 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001680 return
1681 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001682 logging.warning('Ignoring branch %(branch)s with non-https remote '
1683 '%(remote)s', {
1684 'branch': self.branch,
1685 'remote': self.GetRemoteUrl()
1686 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001687 return
1688
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001689 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001690 self.GetCodereviewServer()
1691 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001692 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001693
1694 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1695 git_auth = cookie_auth.get_auth_header(git_host)
1696 if gerrit_auth and git_auth:
1697 if gerrit_auth == git_auth:
1698 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001699 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001700 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001701 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001702 ' %s\n'
1703 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001704 ' Consider running the following command:\n'
1705 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001706 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001707 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001708 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001709 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001710 cookie_auth.get_new_password_message(git_host)))
1711 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001712 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001713 return
1714 else:
1715 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001716 ([] if gerrit_auth else [self._gerrit_host]) +
1717 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001718 DieWithError('Credentials for the following hosts are required:\n'
1719 ' %s\n'
1720 'These are read from %s (or legacy %s)\n'
1721 '%s' % (
1722 '\n '.join(missing),
1723 cookie_auth.get_gitcookies_path(),
1724 cookie_auth.get_netrc_path(),
1725 cookie_auth.get_new_password_message(git_host)))
1726
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001727 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001728 if not self.GetIssue():
1729 return
1730
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001731 status = self._GetChangeDetail()['status']
1732 if status in ('MERGED', 'ABANDONED'):
1733 DieWithError('Change %s has been %s, new uploads are not allowed' %
1734 (self.GetIssueURL(),
1735 'submitted' if status == 'MERGED' else 'abandoned'))
1736
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001737 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1738 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1739 # Apparently this check is not very important? Otherwise get_auth_email
1740 # could have been added to other implementations of Authenticator.
1741 cookies_auth = gerrit_util.Authenticator.get()
1742 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001743 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001744
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001745 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001746 if self.GetIssueOwner() == cookies_user:
1747 return
1748 logging.debug('change %s owner is %s, cookies user is %s',
1749 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001750 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001751 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001752 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001753 if details['email'] == self.GetIssueOwner():
1754 return
1755 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001756 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 'as %s.\n'
1758 'Uploading may fail due to lack of permissions.' %
1759 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1760 confirm_or_exit(action='upload')
1761
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001762 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001763 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001764 or CQ status, assuming adherence to a common workflow.
1765
1766 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001767 * 'error' - error from review tool (including deleted issues)
1768 * 'unsent' - no reviewers added
1769 * 'waiting' - waiting for review
1770 * 'reply' - waiting for uploader to reply to review
1771 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001772 * 'dry-run' - dry-running in the CQ
1773 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001774 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001775 """
1776 if not self.GetIssue():
1777 return None
1778
1779 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001780 data = self._GetChangeDetail([
1781 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001782 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001783 return 'error'
1784
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001785 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001786 return 'closed'
1787
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001788 cq_label = data['labels'].get('Commit-Queue', {})
1789 max_cq_vote = 0
1790 for vote in cq_label.get('all', []):
1791 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1792 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001793 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001794 if max_cq_vote == 1:
1795 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001796
Aaron Gable9ab38c62017-04-06 14:36:33 -07001797 if data['labels'].get('Code-Review', {}).get('approved'):
1798 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001799
1800 if not data.get('reviewers', {}).get('REVIEWER', []):
1801 return 'unsent'
1802
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001803 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001804 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001805 while messages:
1806 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001807 if (m.get('tag', '').startswith('autogenerated:cq') or
1808 m.get('tag', '').startswith('autogenerated:cv')):
1809 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001810 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001811 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 # Most recent message was by owner.
1813 return 'waiting'
1814 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001815 # Some reply from non-owner.
1816 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817
1818 # Somehow there are no messages even though there are reviewers.
1819 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820
1821 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001822 if not self.GetIssue():
1823 return None
1824
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001825 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001826 patchset = data['revisions'][data['current_revision']]['_number']
1827 self.SetPatchset(patchset)
1828 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001829
Gavin Make61ccc52020-11-13 00:12:57 +00001830 def GetMostRecentDryRunPatchset(self):
1831 """Get patchsets equivalent to the most recent patchset and return
1832 the patchset with the latest dry run. If none have been dry run, return
1833 the latest patchset."""
1834 if not self.GetIssue():
1835 return None
1836
1837 data = self._GetChangeDetail(['ALL_REVISIONS'])
1838 patchset = data['revisions'][data['current_revision']]['_number']
1839 dry_run = set([int(m['_revision_number'])
1840 for m in data.get('messages', [])
1841 if m.get('tag', '').endswith('dry-run')])
1842
1843 for revision_info in sorted(data.get('revisions', {}).values(),
1844 key=lambda c: c['_number'], reverse=True):
1845 if revision_info['_number'] in dry_run:
1846 patchset = revision_info['_number']
1847 break
1848 if revision_info.get('kind', '') not in \
1849 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1850 break
1851 self.SetPatchset(patchset)
1852 return patchset
1853
Aaron Gable636b13f2017-07-14 10:42:48 -07001854 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001855 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001856 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001857 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001858
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001859 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001860 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001861 # CURRENT_REVISION is included to get the latest patchset so that
1862 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001863 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001864 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1865 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001866 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001867 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001869 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001870
1871 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001872 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001873 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001874 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001875 line_comments = file_comments.setdefault(path, [])
1876 line_comments.extend(
1877 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001878
1879 # Build dictionary of file comments for easy access and sorting later.
1880 # {author+date: {path: {patchset: {line: url+message}}}}
1881 comments = collections.defaultdict(
1882 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001883
1884 server = self.GetCodereviewServer()
1885 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1886 # /c/ is automatically added by short URL server.
1887 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1888 self.GetIssue())
1889 else:
1890 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1891
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001892 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001893 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001894 tag = comment.get('tag', '')
1895 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001896 continue
1897 key = (comment['author']['email'], comment['updated'])
1898 if comment.get('side', 'REVISION') == 'PARENT':
1899 patchset = 'Base'
1900 else:
1901 patchset = 'PS%d' % comment['patch_set']
1902 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001903 url = ('%s/%s/%s#%s%s' %
1904 (url_prefix, comment['patch_set'], path,
1905 'b' if comment.get('side') == 'PARENT' else '',
1906 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001907 comments[key][path][patchset][line] = (url, comment['message'])
1908
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001909 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001910 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001911 summary = self._BuildCommentSummary(msg, comments, readable)
1912 if summary:
1913 summaries.append(summary)
1914 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001915
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001916 @staticmethod
1917 def _BuildCommentSummary(msg, comments, readable):
1918 key = (msg['author']['email'], msg['date'])
1919 # Don't bother showing autogenerated messages that don't have associated
1920 # file or line comments. this will filter out most autogenerated
1921 # messages, but will keep robot comments like those from Tricium.
1922 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1923 if is_autogenerated and not comments.get(key):
1924 return None
1925 message = msg['message']
1926 # Gerrit spits out nanoseconds.
1927 assert len(msg['date'].split('.')[-1]) == 9
1928 date = datetime.datetime.strptime(msg['date'][:-3],
1929 '%Y-%m-%d %H:%M:%S.%f')
1930 if key in comments:
1931 message += '\n'
1932 for path, patchsets in sorted(comments.get(key, {}).items()):
1933 if readable:
1934 message += '\n%s' % path
1935 for patchset, lines in sorted(patchsets.items()):
1936 for line, (url, content) in sorted(lines.items()):
1937 if line:
1938 line_str = 'Line %d' % line
1939 path_str = '%s:%d:' % (path, line)
1940 else:
1941 line_str = 'File comment'
1942 path_str = '%s:0:' % path
1943 if readable:
1944 message += '\n %s, %s: %s' % (patchset, line_str, url)
1945 message += '\n %s\n' % content
1946 else:
1947 message += '\n%s ' % path_str
1948 message += '\n%s\n' % content
1949
1950 return _CommentSummary(
1951 date=date,
1952 message=message,
1953 sender=msg['author']['email'],
1954 autogenerated=is_autogenerated,
1955 # These could be inferred from the text messages and correlated with
1956 # Code-Review label maximum, however this is not reliable.
1957 # Leaving as is until the need arises.
1958 approval=False,
1959 disapproval=False,
1960 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001961
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001962 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001963 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001964 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001966 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001967 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001968 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001969 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001970
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001971 def _GetChangeDetail(self, options=None):
1972 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001973 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001974 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001975
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001976 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001977 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001978 options.append('CURRENT_COMMIT')
1979
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001980 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001981 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001982 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001983
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001984 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1985 # Assumption: data fetched before with extra options is suitable
1986 # for return for a smaller set of options.
1987 # For example, if we cached data for
1988 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1989 # and request is for options=[CURRENT_REVISION],
1990 # THEN we can return prior cached data.
1991 if options_set.issubset(cached_options_set):
1992 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001993
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001994 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001995 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001996 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001997 except gerrit_util.GerritError as e:
1998 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001999 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002000 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002001
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002002 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002003 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002004
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002005 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002006 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002007 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002008 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002009 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002010 except gerrit_util.GerritError as e:
2011 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002012 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002013 raise
agable32978d92016-11-01 12:55:02 -07002014 return data
2015
Karen Qian40c19422019-03-13 21:28:29 +00002016 def _IsCqConfigured(self):
2017 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002018 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002019
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002020 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002021 if git_common.is_dirty_git_tree('land'):
2022 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002023
tandriid60367b2016-06-22 05:25:12 -07002024 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002025 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002026 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002027 'which can test and land changes for you. '
2028 'Are you sure you wish to bypass it?\n',
2029 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002030 differs = True
tandriic4344b52016-08-29 06:04:54 -07002031 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002032 # Note: git diff outputs nothing if there is no diff.
2033 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002034 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002035 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002036 if detail['current_revision'] == last_upload:
2037 differs = False
2038 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002039 print('WARNING: Local branch contents differ from latest uploaded '
2040 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002041 if differs:
2042 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002043 confirm_or_exit(
2044 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2045 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002046 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002047 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002048 upstream = self.GetCommonAncestorWithUpstream()
2049 if self.GetIssue():
2050 description = self.FetchDescription()
2051 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002052 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002053 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002054 committing=True,
2055 may_prompt=not force,
2056 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002057 parallel=parallel,
2058 upstream=upstream,
2059 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002060 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002061 resultdb=resultdb,
2062 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063
2064 self.SubmitIssue(wait_for_merge=True)
2065 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002066 links = self._GetChangeCommit().get('web_links', [])
2067 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002068 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002069 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002070 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002071 return 0
2072
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002073 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2074 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002075 assert parsed_issue_arg.valid
2076
Edward Lemur125d60a2019-09-13 18:25:41 +00002077 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002078
2079 if parsed_issue_arg.hostname:
2080 self._gerrit_host = parsed_issue_arg.hostname
2081 self._gerrit_server = 'https://%s' % self._gerrit_host
2082
tandriic2405f52016-10-10 08:13:15 -07002083 try:
2084 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002085 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002086 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002087
2088 if not parsed_issue_arg.patchset:
2089 # Use current revision by default.
2090 revision_info = detail['revisions'][detail['current_revision']]
2091 patchset = int(revision_info['_number'])
2092 else:
2093 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002094 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002095 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2096 break
2097 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002098 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002099 (parsed_issue_arg.patchset, self.GetIssue()))
2100
Edward Lemur125d60a2019-09-13 18:25:41 +00002101 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002102 if remote_url.endswith('.git'):
2103 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002104 remote_url = remote_url.rstrip('/')
2105
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002106 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002107 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002108
2109 if remote_url != fetch_info['url']:
2110 DieWithError('Trying to patch a change from %s but this repo appears '
2111 'to be %s.' % (fetch_info['url'], remote_url))
2112
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002114
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002115 # If we have created a new branch then do the "set issue" immediately in
2116 # case the cherry-pick fails, which happens when resolving conflicts.
2117 if newbranch:
2118 self.SetIssue(parsed_issue_arg.issue)
2119
Aaron Gable62619a32017-06-16 08:22:09 -07002120 if force:
2121 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2122 print('Checked out commit for change %i patchset %i locally' %
2123 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002124 elif nocommit:
2125 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2126 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002127 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002128 RunGit(['cherry-pick', 'FETCH_HEAD'])
2129 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002130 (parsed_issue_arg.issue, patchset))
2131 print('Note: this created a local commit which does not have '
2132 'the same hash as the one uploaded for review. This will make '
2133 'uploading changes based on top of this branch difficult.\n'
2134 'If you want to do that, use "git cl patch --force" instead.')
2135
Stefan Zagerd08043c2017-10-12 12:07:02 -07002136 if self.GetBranch():
2137 self.SetIssue(parsed_issue_arg.issue)
2138 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002139 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002140 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2141 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2142 else:
2143 print('WARNING: You are in detached HEAD state.\n'
2144 'The patch has been applied to your checkout, but you will not be '
2145 'able to upload a new patch set to the gerrit issue.\n'
2146 'Try using the \'-b\' option if you would like to work on a '
2147 'branch and/or upload a new patch set.')
2148
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 return 0
2150
tandrii16e0b4e2016-06-07 10:34:28 -07002151 def _GerritCommitMsgHookCheck(self, offer_removal):
2152 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2153 if not os.path.exists(hook):
2154 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002155 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2156 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002157 data = gclient_utils.FileRead(hook)
2158 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2159 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002160 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002161 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002162 'and may interfere with it in subtle ways.\n'
2163 'We recommend you remove the commit-msg hook.')
2164 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002165 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002166 gclient_utils.rm_file_or_tree(hook)
2167 print('Gerrit commit-msg hook removed.')
2168 else:
2169 print('OK, will keep Gerrit commit-msg hook in place.')
2170
Edward Lemur1b52d872019-05-09 21:12:12 +00002171 def _CleanUpOldTraces(self):
2172 """Keep only the last |MAX_TRACES| traces."""
2173 try:
2174 traces = sorted([
2175 os.path.join(TRACES_DIR, f)
2176 for f in os.listdir(TRACES_DIR)
2177 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2178 and not f.startswith('tmp'))
2179 ])
2180 traces_to_delete = traces[:-MAX_TRACES]
2181 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002182 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002183 except OSError:
2184 print('WARNING: Failed to remove old git traces from\n'
2185 ' %s'
2186 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002187
Edward Lemur5737f022019-05-17 01:24:00 +00002188 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002189 """Zip and write the git push traces stored in traces_dir."""
2190 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002191 traces_zip = trace_name + '-traces'
2192 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002193 # Create a temporary dir to store git config and gitcookies in. It will be
2194 # compressed and stored next to the traces.
2195 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002196 git_info_zip = trace_name + '-git-info'
2197
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002198 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002199
Edward Lemur1b52d872019-05-09 21:12:12 +00002200 git_push_metadata['trace_name'] = trace_name
2201 gclient_utils.FileWrite(
2202 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2203
2204 # Keep only the first 6 characters of the git hashes on the packet
2205 # trace. This greatly decreases size after compression.
2206 packet_traces = os.path.join(traces_dir, 'trace-packet')
2207 if os.path.isfile(packet_traces):
2208 contents = gclient_utils.FileRead(packet_traces)
2209 gclient_utils.FileWrite(
2210 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2211 shutil.make_archive(traces_zip, 'zip', traces_dir)
2212
2213 # Collect and compress the git config and gitcookies.
2214 git_config = RunGit(['config', '-l'])
2215 gclient_utils.FileWrite(
2216 os.path.join(git_info_dir, 'git-config'),
2217 git_config)
2218
2219 cookie_auth = gerrit_util.Authenticator.get()
2220 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2221 gitcookies_path = cookie_auth.get_gitcookies_path()
2222 if os.path.isfile(gitcookies_path):
2223 gitcookies = gclient_utils.FileRead(gitcookies_path)
2224 gclient_utils.FileWrite(
2225 os.path.join(git_info_dir, 'gitcookies'),
2226 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2227 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2228
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 gclient_utils.rmtree(git_info_dir)
2230
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002231 def _RunGitPushWithTraces(self,
2232 refspec,
2233 refspec_opts,
2234 git_push_metadata,
2235 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002236 """Run git push and collect the traces resulting from the execution."""
2237 # Create a temporary directory to store traces in. Traces will be compressed
2238 # and stored in a 'traces' dir inside depot_tools.
2239 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002240 trace_name = os.path.join(
2241 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002242
2243 env = os.environ.copy()
2244 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2245 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002246 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002247 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2248 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2249 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2250
2251 try:
2252 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002253 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002254 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002255 push_cmd = ['git', 'push', remote_url, refspec]
2256 if git_push_options:
2257 for opt in git_push_options:
2258 push_cmd.extend(['-o', opt])
2259
Edward Lemur0f58ae42019-04-30 17:24:12 +00002260 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002261 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002262 env=env,
2263 print_stdout=True,
2264 # Flush after every line: useful for seeing progress when running as
2265 # recipe.
2266 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002267 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002268 except subprocess2.CalledProcessError as e:
2269 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002270 if 'blocked keyword' in str(e.stdout):
2271 raise GitPushError(
2272 'Failed to create a change, very likely due to blocked keyword. '
2273 'Please examine output above for the reason of the failure.\n'
2274 'If this is a false positive, you can try to bypass blocked '
2275 'keyword by using push option '
2276 '-o uploadvalidator~skip, e.g.:\n'
2277 'git cl upload -o uploadvalidator~skip\n\n'
2278 'If git-cl is not working correctly, file a bug under the '
2279 'Infra>SDK component.')
2280
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002281 raise GitPushError(
2282 'Failed to create a change. Please examine output above for the '
2283 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002284 'For emergencies, Googlers can escalate to '
2285 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002286 'Hint: run command below to diagnose common Git/Gerrit '
2287 'credential problems:\n'
2288 ' git cl creds-check\n'
2289 '\n'
2290 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2291 'component including the files below.\n'
2292 'Review the files before upload, since they might contain sensitive '
2293 'information.\n'
2294 'Set the Restrict-View-Google label so that they are not publicly '
2295 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002296 finally:
2297 execution_time = time_time() - before_push
2298 metrics.collector.add_repeated('sub_commands', {
2299 'command': 'git push',
2300 'execution_time': execution_time,
2301 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002302 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002303 })
2304
Edward Lemur1b52d872019-05-09 21:12:12 +00002305 git_push_metadata['execution_time'] = execution_time
2306 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002307 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002308
Edward Lemur1b52d872019-05-09 21:12:12 +00002309 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002310 gclient_utils.rmtree(traces_dir)
2311
2312 return push_stdout
2313
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002314 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2315 change_desc):
2316 """Upload the current branch to Gerrit, retry if new remote HEAD is
2317 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002318 remote, remote_branch = self.GetRemoteBranch()
2319 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2320
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002321 try:
2322 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002323 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002324 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002325 # Repository might be in the middle of transition to main branch as
2326 # default, and uploads to old default might be blocked.
2327 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002328 DieWithError(str(e), change_desc)
2329
Josip Sokcevicb631a882021-01-06 18:18:10 +00002330 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2331 self.GetGerritProject())
2332 if project_head == branch:
2333 DieWithError(str(e), change_desc)
2334 branch = project_head
2335
2336 print("WARNING: Fetching remote state and retrying upload to default "
2337 "branch...")
2338 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002339 options.edit_description = False
2340 options.force = True
2341 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002342 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2343 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002344 except GitPushError as e:
2345 DieWithError(str(e), change_desc)
2346
2347 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002348 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002349 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002350 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002351 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002352 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002353 # User requested to change description
2354 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002355 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002356 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002357 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002358 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002359 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002360 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002361 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002362 if len(change_ids) == 1:
2363 change_id = change_ids[0]
2364 else:
2365 change_id = GenerateGerritChangeId(change_desc.description)
2366 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002368 if options.preserve_tryjobs:
2369 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002370
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002371 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002372 parent = self._ComputeParent(
2373 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002375 with gclient_utils.temporary_file() as desc_tempfile:
2376 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2377 ref_to_push = RunGit(
2378 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002379 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002380 if options.no_add_changeid:
2381 pass
2382 else: # adding Change-Ids is okay.
2383 if not git_footers.get_footer_change_id(change_desc.description):
2384 DownloadGerritHook(False)
2385 change_desc.set_description(
2386 self._AddChangeIdToCommitMessage(change_desc.description,
2387 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002389 # For no-squash mode, we assume the remote called "origin" is the one we
2390 # want. It is not worthwhile to support different workflows for
2391 # no-squash mode.
2392 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002393 # attempt to extract the changeid from the current description
2394 # fail informatively if not possible.
2395 change_id_candidates = git_footers.get_footer_change_id(
2396 change_desc.description)
2397 if not change_id_candidates:
2398 DieWithError("Unable to extract change-id from message.")
2399 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002400
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002401 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2403 ref_to_push)]).splitlines()
2404 if len(commits) > 1:
2405 print('WARNING: This will upload %d commits. Run the following command '
2406 'to see which commits will be uploaded: ' % len(commits))
2407 print('git log %s..%s' % (parent, ref_to_push))
2408 print('You can also use `git squash-branch` to squash these into a '
2409 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002410 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002412 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002413 cc = []
2414 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2415 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2416 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002417 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002418 if len(cc) > 100:
2419 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2420 'process/lsc/lsc_workflow.md')
2421 print('WARNING: This will auto-CC %s users.' % len(cc))
2422 print('LSC may be more appropriate: %s' % lsc)
2423 print('You can also use the --no-autocc flag to disable auto-CC.')
2424 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002425 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002426 if options.cc:
2427 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002428 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002429 if change_desc.get_cced():
2430 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002431 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002432 valid_accounts = set(reviewers + cc)
2433 # TODO(crbug/877717): relax this for all hosts.
2434 else:
2435 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002436 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002437 logging.info('accounts %s are recognized, %s invalid',
2438 sorted(valid_accounts),
2439 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002440
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002441 # Extra options that can be specified at push time. Doc:
2442 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002443 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002444
Aaron Gable844cf292017-06-28 11:32:59 -07002445 # By default, new changes are started in WIP mode, and subsequent patchsets
2446 # don't send email. At any time, passing --send-mail will mark the change
2447 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002448 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002449 refspec_opts.append('ready')
2450 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002451 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002452 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002453 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002454 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002455
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002456 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002457 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002458
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002459 # Set options.title in case user was prompted in _GetTitleForUpload and
2460 # _CMDUploadChange needs to be called again.
2461 options.title = self._GetTitleForUpload(options)
2462 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002463 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002464 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002465 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002466
agablec6787972016-09-09 16:13:34 -07002467 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002468 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002469
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002470 for r in sorted(reviewers):
2471 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002472 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002473 reviewers.remove(r)
2474 else:
2475 # TODO(tandrii): this should probably be a hard failure.
2476 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2477 % r)
2478 for c in sorted(cc):
2479 # refspec option will be rejected if cc doesn't correspond to an
2480 # account, even though REST call to add such arbitrary cc may succeed.
2481 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002482 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002483 cc.remove(c)
2484
rmistry9eadede2016-09-19 11:22:43 -07002485 if options.topic:
2486 # Documentation on Gerrit topics is here:
2487 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002488 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002489
Edward Lemur687ca902018-12-05 02:30:30 +00002490 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002491 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002492 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002493 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002494 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002495 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002496 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002497 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002498 elif options.cq_quick_run:
2499 refspec_opts.append('l=Commit-Queue+1')
2500 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002501
2502 if change_desc.get_reviewers(tbr_only=True):
2503 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002504 self.GetGerritHost(),
2505 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002506 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002507
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002508 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002509 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002510 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002511 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002512 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2513
2514 refspec_suffix = ''
2515 if refspec_opts:
2516 refspec_suffix = '%' + ','.join(refspec_opts)
2517 assert ' ' not in refspec_suffix, (
2518 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2519 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002520
Edward Lemur1b52d872019-05-09 21:12:12 +00002521 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002522 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002523 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002524 'change_id': change_id,
2525 'description': change_desc.description,
2526 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002527
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002528 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002529 git_push_metadata,
2530 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002531
2532 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002533 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534 change_numbers = [m.group(1)
2535 for m in map(regex.match, push_stdout.splitlines())
2536 if m]
2537 if len(change_numbers) != 1:
2538 DieWithError(
2539 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002540 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002541 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002542 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002543
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002544 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002545 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002546 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002547 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002548 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002549 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002550 reviewers, cc,
2551 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002552
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002553 return 0
2554
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002555 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2556 change_desc):
2557 """Computes parent of the generated commit to be uploaded to Gerrit.
2558
2559 Returns revision or a ref name.
2560 """
2561 if custom_cl_base:
2562 # Try to avoid creating additional unintended CLs when uploading, unless
2563 # user wants to take this risk.
2564 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2565 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2566 local_ref_of_target_remote])
2567 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002568 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002569 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2570 'If you proceed with upload, more than 1 CL may be created by '
2571 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2572 'If you are certain that specified base `%s` has already been '
2573 'uploaded to Gerrit as another CL, you may proceed.\n' %
2574 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2575 if not force:
2576 confirm_or_exit(
2577 'Do you take responsibility for cleaning up potential mess '
2578 'resulting from proceeding with upload?',
2579 action='upload')
2580 return custom_cl_base
2581
Aaron Gablef97e33d2017-03-30 15:44:27 -07002582 if remote != '.':
2583 return self.GetCommonAncestorWithUpstream()
2584
2585 # If our upstream branch is local, we base our squashed commit on its
2586 # squashed version.
2587 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2588
Aaron Gablef97e33d2017-03-30 15:44:27 -07002589 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002590 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002591 if upstream_branch_name == 'main':
2592 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002593
2594 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002595 # TODO(tandrii): consider checking parent change in Gerrit and using its
2596 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2597 # the tree hash of the parent branch. The upside is less likely bogus
2598 # requests to reupload parent change just because it's uploadhash is
2599 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002600 parent = scm.GIT.GetBranchConfig(
2601 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002602 # Verify that the upstream branch has been uploaded too, otherwise
2603 # Gerrit will create additional CLs when uploading.
2604 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2605 RunGitSilent(['rev-parse', parent + ':'])):
2606 DieWithError(
2607 '\nUpload upstream branch %s first.\n'
2608 'It is likely that this branch has been rebased since its last '
2609 'upload, so you just need to upload it again.\n'
2610 '(If you uploaded it with --no-squash, then branch dependencies '
2611 'are not supported, and you should reupload with --squash.)'
2612 % upstream_branch_name,
2613 change_desc)
2614 return parent
2615
Edward Lemura12175c2020-03-09 16:58:26 +00002616 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002617 """Re-commits using the current message, assumes the commit hook is in
2618 place.
2619 """
Edward Lemura12175c2020-03-09 16:58:26 +00002620 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002621 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002622 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002623 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002624 return new_log_desc
2625 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002626 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627
tandriie113dfd2016-10-11 10:20:12 -07002628 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002629 try:
2630 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002631 except GerritChangeNotExists:
2632 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002633
2634 if data['status'] in ('ABANDONED', 'MERGED'):
2635 return 'CL %s is closed' % self.GetIssue()
2636
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002637 def GetGerritChange(self, patchset=None):
2638 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002639 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002640 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002641 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002642 data = self._GetChangeDetail(['ALL_REVISIONS'])
2643
2644 assert host and issue and patchset, 'CL must be uploaded first'
2645
2646 has_patchset = any(
2647 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002648 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002649 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002650 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002651 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002652
tandrii8c5a3532016-11-04 07:52:02 -07002653 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002654 'host': host,
2655 'change': issue,
2656 'project': data['project'],
2657 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002658 }
tandriie113dfd2016-10-11 10:20:12 -07002659
tandriide281ae2016-10-12 06:02:30 -07002660 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002661 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002662
Edward Lemur707d70b2018-02-07 00:50:14 +01002663 def GetReviewers(self):
2664 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002665 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002666
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002667
Lei Zhang8a0efc12020-08-05 19:58:45 +00002668def _get_bug_line_values(default_project_prefix, bugs):
2669 """Given default_project_prefix and comma separated list of bugs, yields bug
2670 line values.
tandriif9aefb72016-07-01 09:06:51 -07002671
2672 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002673 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002674 * string, which is left as is.
2675
2676 This function may produce more than one line, because bugdroid expects one
2677 project per line.
2678
Lei Zhang8a0efc12020-08-05 19:58:45 +00002679 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002680 ['v8:123', 'chromium:789']
2681 """
2682 default_bugs = []
2683 others = []
2684 for bug in bugs.split(','):
2685 bug = bug.strip()
2686 if bug:
2687 try:
2688 default_bugs.append(int(bug))
2689 except ValueError:
2690 others.append(bug)
2691
2692 if default_bugs:
2693 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002694 if default_project_prefix:
2695 if not default_project_prefix.endswith(':'):
2696 default_project_prefix += ':'
2697 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002698 else:
2699 yield default_bugs
2700 for other in sorted(others):
2701 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2702 yield other
2703
2704
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002705class ChangeDescription(object):
2706 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002707 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002708 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002709 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002710 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002711 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002712 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2713 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002714 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002715 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002716
Dan Beamd8b04ca2019-10-10 21:23:26 +00002717 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002718 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002719 if bug:
2720 regexp = re.compile(self.BUG_LINE)
2721 prefix = settings.GetBugPrefix()
2722 if not any((regexp.match(line) for line in self._description_lines)):
2723 values = list(_get_bug_line_values(prefix, bug))
2724 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002725 if fixed:
2726 regexp = re.compile(self.FIXED_LINE)
2727 prefix = settings.GetBugPrefix()
2728 if not any((regexp.match(line) for line in self._description_lines)):
2729 values = list(_get_bug_line_values(prefix, fixed))
2730 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002731
agable@chromium.org42c20792013-09-12 17:34:49 +00002732 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002733 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002734 return '\n'.join(self._description_lines)
2735
2736 def set_description(self, desc):
2737 if isinstance(desc, basestring):
2738 lines = desc.splitlines()
2739 else:
2740 lines = [line.rstrip() for line in desc]
2741 while lines and not lines[0]:
2742 lines.pop(0)
2743 while lines and not lines[-1]:
2744 lines.pop(-1)
2745 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002746
Edward Lemur5a644f82020-03-18 16:44:57 +00002747 def ensure_change_id(self, change_id):
2748 description = self.description
2749 footer_change_ids = git_footers.get_footer_change_id(description)
2750 # Make sure that the Change-Id in the description matches the given one.
2751 if footer_change_ids != [change_id]:
2752 if footer_change_ids:
2753 # Remove any existing Change-Id footers since they don't match the
2754 # expected change_id footer.
2755 description = git_footers.remove_footer(description, 'Change-Id')
2756 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2757 'if you want to set a new one.')
2758 # Add the expected Change-Id footer.
2759 description = git_footers.add_footer_change_id(description, change_id)
2760 self.set_description(description)
2761
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002762 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002763 """Rewrites the R=/TBR= line(s) as a single line each.
2764
2765 Args:
2766 reviewers (list(str)) - list of additional emails to use for reviewers.
2767 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002768 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002769 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002770 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002771
2772 reviewers = set(reviewers)
2773 tbrs = set(tbrs)
2774 LOOKUP = {
2775 'TBR': tbrs,
2776 'R': reviewers,
2777 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002778
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002779 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002780 regexp = re.compile(self.R_LINE)
2781 matches = [regexp.match(line) for line in self._description_lines]
2782 new_desc = [l for i, l in enumerate(self._description_lines)
2783 if not matches[i]]
2784 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002785
agable@chromium.org42c20792013-09-12 17:34:49 +00002786 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002787
2788 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002789 for match in matches:
2790 if not match:
2791 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002792 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2793
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002794 # If any folks ended up in both groups, remove them from tbrs.
2795 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002796
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002797 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2798 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002799
2800 # Put the new lines in the description where the old first R= line was.
2801 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2802 if 0 <= line_loc < len(self._description_lines):
2803 if new_tbr_line:
2804 self._description_lines.insert(line_loc, new_tbr_line)
2805 if new_r_line:
2806 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002807 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002808 if new_r_line:
2809 self.append_footer(new_r_line)
2810 if new_tbr_line:
2811 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002812
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002813 def set_preserve_tryjobs(self):
2814 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2815 footers = git_footers.parse_footers(self.description)
2816 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2817 if v.lower() == 'true':
2818 return
2819 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2820
Anthony Polito8b955342019-09-24 19:01:36 +00002821 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002822 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002823 self.set_description([
2824 '# Enter a description of the change.',
2825 '# This will be displayed on the codereview site.',
2826 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002827 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002828 '--------------------',
2829 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002830 bug_regexp = re.compile(self.BUG_LINE)
2831 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002832 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002833 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002834
Dan Beamd8b04ca2019-10-10 21:23:26 +00002835 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002836 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002837
Bruce Dawsonfc487042020-10-27 19:11:37 +00002838 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002839 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002840 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002841 if not content:
2842 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002844
Bruce Dawson2377b012018-01-11 16:46:49 -08002845 # Strip off comments and default inserted "Bug:" line.
2846 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002847 (line.startswith('#') or
2848 line.rstrip() == "Bug:" or
2849 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002850 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002851 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002853
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002854 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002855 """Adds a footer line to the description.
2856
2857 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2858 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2859 that Gerrit footers are always at the end.
2860 """
2861 parsed_footer_line = git_footers.parse_footer(line)
2862 if parsed_footer_line:
2863 # Line is a gerrit footer in the form: Footer-Key: any value.
2864 # Thus, must be appended observing Gerrit footer rules.
2865 self.set_description(
2866 git_footers.add_footer(self.description,
2867 key=parsed_footer_line[0],
2868 value=parsed_footer_line[1]))
2869 return
2870
2871 if not self._description_lines:
2872 self._description_lines.append(line)
2873 return
2874
2875 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2876 if gerrit_footers:
2877 # git_footers.split_footers ensures that there is an empty line before
2878 # actual (gerrit) footers, if any. We have to keep it that way.
2879 assert top_lines and top_lines[-1] == ''
2880 top_lines, separator = top_lines[:-1], top_lines[-1:]
2881 else:
2882 separator = [] # No need for separator if there are no gerrit_footers.
2883
2884 prev_line = top_lines[-1] if top_lines else ''
2885 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2886 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2887 top_lines.append('')
2888 top_lines.append(line)
2889 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002890
tandrii99a72f22016-08-17 14:33:24 -07002891 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002892 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002894 reviewers = [match.group(2).strip()
2895 for match in matches
2896 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002897 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002898
bradnelsond975b302016-10-23 12:20:23 -07002899 def get_cced(self):
2900 """Retrieves the list of reviewers."""
2901 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2902 cced = [match.group(2).strip() for match in matches if match]
2903 return cleanup_list(cced)
2904
Nodir Turakulov23b82142017-11-16 11:04:25 -08002905 def get_hash_tags(self):
2906 """Extracts and sanitizes a list of Gerrit hashtags."""
2907 subject = (self._description_lines or ('',))[0]
2908 subject = re.sub(
2909 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2910
2911 tags = []
2912 start = 0
2913 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2914 while True:
2915 m = bracket_exp.match(subject, start)
2916 if not m:
2917 break
2918 tags.append(self.sanitize_hash_tag(m.group(1)))
2919 start = m.end()
2920
2921 if not tags:
2922 # Try "Tag: " prefix.
2923 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2924 if m:
2925 tags.append(self.sanitize_hash_tag(m.group(1)))
2926 return tags
2927
2928 @classmethod
2929 def sanitize_hash_tag(cls, tag):
2930 """Returns a sanitized Gerrit hash tag.
2931
2932 A sanitized hashtag can be used as a git push refspec parameter value.
2933 """
2934 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2935
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002936
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002937def FindCodereviewSettingsFile(filename='codereview.settings'):
2938 """Finds the given file starting in the cwd and going up.
2939
2940 Only looks up to the top of the repository unless an
2941 'inherit-review-settings-ok' file exists in the root of the repository.
2942 """
2943 inherit_ok_file = 'inherit-review-settings-ok'
2944 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002945 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002946 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2947 root = '/'
2948 while True:
2949 if filename in os.listdir(cwd):
2950 if os.path.isfile(os.path.join(cwd, filename)):
2951 return open(os.path.join(cwd, filename))
2952 if cwd == root:
2953 break
2954 cwd = os.path.dirname(cwd)
2955
2956
2957def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002958 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002959 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002960
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002961 def SetProperty(name, setting, unset_error_ok=False):
2962 fullname = 'rietveld.' + name
2963 if setting in keyvals:
2964 RunGit(['config', fullname, keyvals[setting]])
2965 else:
2966 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2967
tandrii48df5812016-10-17 03:55:37 -07002968 if not keyvals.get('GERRIT_HOST', False):
2969 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002970 # Only server setting is required. Other settings can be absent.
2971 # In that case, we ignore errors raised during option deletion attempt.
2972 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2973 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2974 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002975 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002976 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2977 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002978 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2979 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002980 SetProperty(
2981 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00002982 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002983
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002984 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002985 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002986
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002987 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002988 RunGit(['config', 'gerrit.squash-uploads',
2989 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002990
tandrii@chromium.org28253532016-04-14 13:46:56 +00002991 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002992 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002993 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2994
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002995 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002996 # should be of the form
2997 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2998 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3000 keyvals['ORIGIN_URL_CONFIG']])
3001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003002
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003003def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003004 """Downloads a network object to a local file, like urllib.urlretrieve.
3005
3006 This is necessary because urllib is broken for SSL connections via a proxy.
3007 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003008 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003009 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003010
3011
ukai@chromium.org712d6102013-11-27 00:52:58 +00003012def hasSheBang(fname):
3013 """Checks fname is a #! script."""
3014 with open(fname) as f:
3015 return f.read(2).startswith('#!')
3016
3017
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003018def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003019 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003020
3021 Args:
3022 force: True to update hooks. False to install hooks if not present.
3023 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003024 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003025 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3026 if not os.access(dst, os.X_OK):
3027 if os.path.exists(dst):
3028 if not force:
3029 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003030 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003031 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003032 if not hasSheBang(dst):
3033 DieWithError('Not a script: %s\n'
3034 'You need to download from\n%s\n'
3035 'into .git/hooks/commit-msg and '
3036 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003037 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3038 except Exception:
3039 if os.path.exists(dst):
3040 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003041 DieWithError('\nFailed to download hooks.\n'
3042 'You need to download from\n%s\n'
3043 'into .git/hooks/commit-msg and '
3044 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003045
3046
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003047class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003048 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003049
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003050 _GOOGLESOURCE = 'googlesource.com'
3051
3052 def __init__(self):
3053 # Cached list of [host, identity, source], where source is either
3054 # .gitcookies or .netrc.
3055 self._all_hosts = None
3056
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003057 def ensure_configured_gitcookies(self):
3058 """Runs checks and suggests fixes to make git use .gitcookies from default
3059 path."""
3060 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3061 configured_path = RunGitSilent(
3062 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003063 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003064 if configured_path:
3065 self._ensure_default_gitcookies_path(configured_path, default)
3066 else:
3067 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003068
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003069 @staticmethod
3070 def _ensure_default_gitcookies_path(configured_path, default_path):
3071 assert configured_path
3072 if configured_path == default_path:
3073 print('git is already configured to use your .gitcookies from %s' %
3074 configured_path)
3075 return
3076
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003077 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003078 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3079 (configured_path, default_path))
3080
3081 if not os.path.exists(configured_path):
3082 print('However, your configured .gitcookies file is missing.')
3083 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3084 action='reconfigure')
3085 RunGit(['config', '--global', 'http.cookiefile', default_path])
3086 return
3087
3088 if os.path.exists(default_path):
3089 print('WARNING: default .gitcookies file already exists %s' %
3090 default_path)
3091 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3092 default_path)
3093
3094 confirm_or_exit('Move existing .gitcookies to default location?',
3095 action='move')
3096 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003097 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003098 print('Moved and reconfigured git to use .gitcookies from %s' %
3099 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003100
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003101 @staticmethod
3102 def _configure_gitcookies_path(default_path):
3103 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3104 if os.path.exists(netrc_path):
3105 print('You seem to be using outdated .netrc for git credentials: %s' %
3106 netrc_path)
3107 print('This tool will guide you through setting up recommended '
3108 '.gitcookies store for git credentials.\n'
3109 '\n'
3110 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3111 ' git config --global --unset http.cookiefile\n'
3112 ' mv %s %s.backup\n\n' % (default_path, default_path))
3113 confirm_or_exit(action='setup .gitcookies')
3114 RunGit(['config', '--global', 'http.cookiefile', default_path])
3115 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003116
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003117 def get_hosts_with_creds(self, include_netrc=False):
3118 if self._all_hosts is None:
3119 a = gerrit_util.CookiesAuthenticator()
3120 self._all_hosts = [
3121 (h, u, s)
3122 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003123 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3124 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003125 )
3126 if h.endswith(self._GOOGLESOURCE)
3127 ]
3128
3129 if include_netrc:
3130 return self._all_hosts
3131 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3132
3133 def print_current_creds(self, include_netrc=False):
3134 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3135 if not hosts:
3136 print('No Git/Gerrit credentials found')
3137 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003138 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003139 header = [('Host', 'User', 'Which file'),
3140 ['=' * l for l in lengths]]
3141 for row in (header + hosts):
3142 print('\t'.join((('%%+%ds' % l) % s)
3143 for l, s in zip(lengths, row)))
3144
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003145 @staticmethod
3146 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003147 """Parses identity "git-<username>.domain" into <username> and domain."""
3148 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003149 # distinguishable from sub-domains. But we do know typical domains:
3150 if identity.endswith('.chromium.org'):
3151 domain = 'chromium.org'
3152 username = identity[:-len('.chromium.org')]
3153 else:
3154 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003155 if username.startswith('git-'):
3156 username = username[len('git-'):]
3157 return username, domain
3158
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003159 def _canonical_git_googlesource_host(self, host):
3160 """Normalizes Gerrit hosts (with '-review') to Git host."""
3161 assert host.endswith(self._GOOGLESOURCE)
3162 # Prefix doesn't include '.' at the end.
3163 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3164 if prefix.endswith('-review'):
3165 prefix = prefix[:-len('-review')]
3166 return prefix + '.' + self._GOOGLESOURCE
3167
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003168 def _canonical_gerrit_googlesource_host(self, host):
3169 git_host = self._canonical_git_googlesource_host(host)
3170 prefix = git_host.split('.', 1)[0]
3171 return prefix + '-review.' + self._GOOGLESOURCE
3172
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003173 def _get_counterpart_host(self, host):
3174 assert host.endswith(self._GOOGLESOURCE)
3175 git = self._canonical_git_googlesource_host(host)
3176 gerrit = self._canonical_gerrit_googlesource_host(git)
3177 return git if gerrit == host else gerrit
3178
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003179 def has_generic_host(self):
3180 """Returns whether generic .googlesource.com has been configured.
3181
3182 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3183 """
3184 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3185 if host == '.' + self._GOOGLESOURCE:
3186 return True
3187 return False
3188
3189 def _get_git_gerrit_identity_pairs(self):
3190 """Returns map from canonic host to pair of identities (Git, Gerrit).
3191
3192 One of identities might be None, meaning not configured.
3193 """
3194 host_to_identity_pairs = {}
3195 for host, identity, _ in self.get_hosts_with_creds():
3196 canonical = self._canonical_git_googlesource_host(host)
3197 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3198 idx = 0 if canonical == host else 1
3199 pair[idx] = identity
3200 return host_to_identity_pairs
3201
3202 def get_partially_configured_hosts(self):
3203 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003204 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003205 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003206 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003207
3208 def get_conflicting_hosts(self):
3209 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003210 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003211 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003212 if None not in (i1, i2) and i1 != i2)
3213
3214 def get_duplicated_hosts(self):
3215 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003216 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003217
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003218
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003219 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003220 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003221 hosts = sorted(hosts)
3222 assert hosts
3223 if extra_column_func is None:
3224 extras = [''] * len(hosts)
3225 else:
3226 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003227 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3228 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003229 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003230 lines.append(tmpl % he)
3231 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003232
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003233 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003234 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003235 yield ('.googlesource.com wildcard record detected',
3236 ['Chrome Infrastructure team recommends to list full host names '
3237 'explicitly.'],
3238 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003239
3240 dups = self.get_duplicated_hosts()
3241 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003242 yield ('The following hosts were defined twice',
3243 self._format_hosts(dups),
3244 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003245
3246 partial = self.get_partially_configured_hosts()
3247 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003248 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3249 'These hosts are missing',
3250 self._format_hosts(partial, lambda host: 'but %s defined' %
3251 self._get_counterpart_host(host)),
3252 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003253
3254 conflicting = self.get_conflicting_hosts()
3255 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003256 yield ('The following Git hosts have differing credentials from their '
3257 'Gerrit counterparts',
3258 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3259 tuple(self._get_git_gerrit_identity_pairs()[host])),
3260 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003261
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003262 def find_and_report_problems(self):
3263 """Returns True if there was at least one problem, else False."""
3264 found = False
3265 bad_hosts = set()
3266 for title, sublines, hosts in self._find_problems():
3267 if not found:
3268 found = True
3269 print('\n\n.gitcookies problem report:\n')
3270 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003271 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003272 if sublines:
3273 print()
3274 print(' %s' % '\n '.join(sublines))
3275 print()
3276
3277 if bad_hosts:
3278 assert found
3279 print(' You can manually remove corresponding lines in your %s file and '
3280 'visit the following URLs with correct account to generate '
3281 'correct credential lines:\n' %
3282 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3283 print(' %s' % '\n '.join(sorted(set(
3284 gerrit_util.CookiesAuthenticator().get_new_password_url(
3285 self._canonical_git_googlesource_host(host))
3286 for host in bad_hosts
3287 ))))
3288 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003290
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003291@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003292def CMDcreds_check(parser, args):
3293 """Checks credentials and suggests changes."""
3294 _, _ = parser.parse_args(args)
3295
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003296 # Code below checks .gitcookies. Abort if using something else.
3297 authn = gerrit_util.Authenticator.get()
3298 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003299 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003300 'This command is not designed for bot environment. It checks '
3301 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003302 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3303 if isinstance(authn, gerrit_util.GceAuthenticator):
3304 message += (
3305 '\n'
3306 'If you need to run this on GCE or a cloudtop instance, '
3307 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3308 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003309
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003310 checker = _GitCookiesChecker()
3311 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003312
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003314 checker.print_current_creds(include_netrc=True)
3315
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003316 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003317 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003318 return 0
3319 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003320
3321
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003322@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003323def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003324 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003325 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003326 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003327 _, args = parser.parse_args(args)
3328 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003329 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003330 return RunGit(['config', 'branch.%s.base-url' % branch],
3331 error_ok=False).strip()
3332 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003333 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003334 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3335 error_ok=False).strip()
3336
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003337
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003338def color_for_status(status):
3339 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003340 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003341 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003342 'unsent': BOLD + Fore.YELLOW,
3343 'waiting': BOLD + Fore.RED,
3344 'reply': BOLD + Fore.YELLOW,
3345 'not lgtm': BOLD + Fore.RED,
3346 'lgtm': BOLD + Fore.GREEN,
3347 'commit': BOLD + Fore.MAGENTA,
3348 'closed': BOLD + Fore.CYAN,
3349 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003350 }.get(status, Fore.WHITE)
3351
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003352
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003353def get_cl_statuses(changes, fine_grained, max_processes=None):
3354 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003355
3356 If fine_grained is true, this will fetch CL statuses from the server.
3357 Otherwise, simply indicate if there's a matching url for the given branches.
3358
3359 If max_processes is specified, it is used as the maximum number of processes
3360 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3361 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003362
3363 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003364 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003365 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003366 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003367
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003368 if not fine_grained:
3369 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003370 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003371 for cl in changes:
3372 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003373 return
3374
3375 # First, sort out authentication issues.
3376 logging.debug('ensuring credentials exist')
3377 for cl in changes:
3378 cl.EnsureAuthenticated(force=False, refresh=True)
3379
3380 def fetch(cl):
3381 try:
3382 return (cl, cl.GetStatus())
3383 except:
3384 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003385 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003386 raise
3387
3388 threads_count = len(changes)
3389 if max_processes:
3390 threads_count = max(1, min(threads_count, max_processes))
3391 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3392
Edward Lemur61bf4172020-02-24 23:22:37 +00003393 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003394 fetched_cls = set()
3395 try:
3396 it = pool.imap_unordered(fetch, changes).__iter__()
3397 while True:
3398 try:
3399 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003400 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003401 break
3402 fetched_cls.add(cl)
3403 yield cl, status
3404 finally:
3405 pool.close()
3406
3407 # Add any branches that failed to fetch.
3408 for cl in set(changes) - fetched_cls:
3409 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003410
rmistry@google.com2dd99862015-06-22 12:22:18 +00003411
Jose Lopes3863fc52020-04-07 17:00:25 +00003412def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003413 """Uploads CLs of local branches that are dependents of the current branch.
3414
3415 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003416
3417 test1 -> test2.1 -> test3.1
3418 -> test3.2
3419 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003420
3421 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3422 run on the dependent branches in this order:
3423 test2.1, test3.1, test3.2, test2.2, test3.3
3424
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003425 Note: This function does not rebase your local dependent branches. Use it
3426 when you make a change to the parent branch that will not conflict
3427 with its dependent branches, and you would like their dependencies
3428 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003429 """
3430 if git_common.is_dirty_git_tree('upload-branch-deps'):
3431 return 1
3432
3433 root_branch = cl.GetBranch()
3434 if root_branch is None:
3435 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3436 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003437 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003438 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3439 'patchset dependencies without an uploaded CL.')
3440
3441 branches = RunGit(['for-each-ref',
3442 '--format=%(refname:short) %(upstream:short)',
3443 'refs/heads'])
3444 if not branches:
3445 print('No local branches found.')
3446 return 0
3447
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003448 # Create a dictionary of all local branches to the branches that are
3449 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003450 tracked_to_dependents = collections.defaultdict(list)
3451 for b in branches.splitlines():
3452 tokens = b.split()
3453 if len(tokens) == 2:
3454 branch_name, tracked = tokens
3455 tracked_to_dependents[tracked].append(branch_name)
3456
vapiera7fbd5a2016-06-16 09:17:49 -07003457 print()
3458 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003459 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003460
rmistry@google.com2dd99862015-06-22 12:22:18 +00003461 def traverse_dependents_preorder(branch, padding=''):
3462 dependents_to_process = tracked_to_dependents.get(branch, [])
3463 padding += ' '
3464 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003465 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003466 dependents.append(dependent)
3467 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003468
rmistry@google.com2dd99862015-06-22 12:22:18 +00003469 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003470 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003471
3472 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003473 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003474 return 0
3475
Jose Lopes3863fc52020-04-07 17:00:25 +00003476 if not force:
3477 confirm_or_exit('This command will checkout all dependent branches and run '
3478 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003479
rmistry@google.com2dd99862015-06-22 12:22:18 +00003480 # Record all dependents that failed to upload.
3481 failures = {}
3482 # Go through all dependents, checkout the branch and upload.
3483 try:
3484 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003485 print()
3486 print('--------------------------------------')
3487 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003488 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003489 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003490 try:
3491 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003492 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003493 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003494 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003496 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003497 finally:
3498 # Swap back to the original root branch.
3499 RunGit(['checkout', '-q', root_branch])
3500
vapiera7fbd5a2016-06-16 09:17:49 -07003501 print()
3502 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003503 for dependent_branch in dependents:
3504 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003505 print(' %s : %s' % (dependent_branch, upload_status))
3506 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003507
3508 return 0
3509
3510
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003511def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003512 """Given a proposed tag name, returns a tag name that is guaranteed to be
3513 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3514 or 'foo-3', and so on."""
3515
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003516 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003517 for suffix_num in itertools.count(1):
3518 if suffix_num == 1:
3519 to_check = proposed_tag
3520 else:
3521 to_check = '%s-%d' % (proposed_tag, suffix_num)
3522
3523 if to_check not in existing_tags:
3524 return to_check
3525
3526
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003527@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003528def CMDarchive(parser, args):
3529 """Archives and deletes branches associated with closed changelists."""
3530 parser.add_option(
3531 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003532 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003533 parser.add_option(
3534 '-f', '--force', action='store_true',
3535 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003536 parser.add_option(
3537 '-d', '--dry-run', action='store_true',
3538 help='Skip the branch tagging and removal steps.')
3539 parser.add_option(
3540 '-t', '--notags', action='store_true',
3541 help='Do not tag archived branches. '
3542 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003543 parser.add_option(
3544 '-p',
3545 '--pattern',
3546 default='git-cl-archived-{issue}-{branch}',
3547 help='Format string for archive tags. '
3548 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003549
kmarshall3bff56b2016-06-06 18:31:47 -07003550 options, args = parser.parse_args(args)
3551 if args:
3552 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003553
3554 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3555 if not branches:
3556 return 0
3557
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003558 tags = RunGit(['for-each-ref', '--format=%(refname)',
3559 'refs/tags']).splitlines() or []
3560 tags = [t.split('/')[-1] for t in tags]
3561
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003563 changes = [Changelist(branchref=b)
3564 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003565 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3566 statuses = get_cl_statuses(changes,
3567 fine_grained=True,
3568 max_processes=options.maxjobs)
3569 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003570 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3571 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003572 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003573 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003574 proposal.sort()
3575
3576 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003577 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003578 return 0
3579
Edward Lemur85153282020-02-14 22:06:29 +00003580 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003581
vapiera7fbd5a2016-06-16 09:17:49 -07003582 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003583 if options.notags:
3584 for next_item in proposal:
3585 print(' ' + next_item[0])
3586 else:
3587 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3588 for next_item in proposal:
3589 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003590
kmarshall9249e012016-08-23 12:02:16 -07003591 # Quit now on precondition failure or if instructed by the user, either
3592 # via an interactive prompt or by command line flags.
3593 if options.dry_run:
3594 print('\nNo changes were made (dry run).\n')
3595 return 0
3596 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003597 print('You are currently on a branch \'%s\' which is associated with a '
3598 'closed codereview issue, so archive cannot proceed. Please '
3599 'checkout another branch and run this command again.' %
3600 current_branch)
3601 return 1
kmarshall9249e012016-08-23 12:02:16 -07003602 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003603 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003604 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003605 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003606 return 1
3607
3608 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003609 if not options.notags:
3610 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003611
3612 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3613 # Clean up the tag if we failed to delete the branch.
3614 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003615
vapiera7fbd5a2016-06-16 09:17:49 -07003616 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003617
3618 return 0
3619
3620
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003621@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003622def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003623 """Show status of changelists.
3624
3625 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003626 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003627 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003628 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003629 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003630 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003631 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003632 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003633
3634 Also see 'git cl comments'.
3635 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003636 parser.add_option(
3637 '--no-branch-color',
3638 action='store_true',
3639 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003640 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003641 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003642 parser.add_option('-f', '--fast', action='store_true',
3643 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003644 parser.add_option(
3645 '-j', '--maxjobs', action='store', type=int,
3646 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003647 parser.add_option(
3648 '-i', '--issue', type=int,
3649 help='Operate on this issue instead of the current branch\'s implicit '
3650 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003651 parser.add_option('-d',
3652 '--date-order',
3653 action='store_true',
3654 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003655 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003656 if args:
3657 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003658
iannuccie53c9352016-08-17 14:40:40 -07003659 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003660 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003661
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003662 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003663 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003664 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003665 if cl.GetIssue():
3666 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003667 elif options.field == 'id':
3668 issueid = cl.GetIssue()
3669 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003671 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003672 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003673 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003675 elif options.field == 'status':
3676 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003677 elif options.field == 'url':
3678 url = cl.GetIssueURL()
3679 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003680 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003681 return 0
3682
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003683 branches = RunGit([
3684 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3685 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003686 if not branches:
3687 print('No local branch found.')
3688 return 0
3689
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003690 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003691 Changelist(branchref=b, commit_date=ct)
3692 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3693 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003694 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003695 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003696 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003697 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003698
Edward Lemur85153282020-02-14 22:06:29 +00003699 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003700
3701 def FormatBranchName(branch, colorize=False):
3702 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3703 an asterisk when it is the current branch."""
3704
3705 asterisk = ""
3706 color = Fore.RESET
3707 if branch == current_branch:
3708 asterisk = "* "
3709 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003710 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003711
3712 if colorize:
3713 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003714 return asterisk + branch_name
3715
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003716 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003717
3718 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003719
3720 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003721 sorted_changes = sorted(changes,
3722 key=lambda c: c.GetCommitDate(),
3723 reverse=True)
3724 else:
3725 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3726 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003727 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003728 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003729 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003730 branch_statuses[c.GetBranch()] = status
3731 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003732 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003733 if url and (not status or status == 'error'):
3734 # The issue probably doesn't exist anymore.
3735 url += ' (broken)'
3736
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003737 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003738 # Turn off bold as well as colors.
3739 END = '\033[0m'
3740 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003741 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003742 color = ''
3743 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003744 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003745
Alan Cuttera3be9a52019-03-04 18:50:33 +00003746 branch_display = FormatBranchName(branch)
3747 padding = ' ' * (alignment - len(branch_display))
3748 if not options.no_branch_color:
3749 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003750
Alan Cuttera3be9a52019-03-04 18:50:33 +00003751 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3752 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003753
vapiera7fbd5a2016-06-16 09:17:49 -07003754 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003755 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003756 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003757 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003758 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003759 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003761 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003763 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003765 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003766 return 0
3767
3768
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003769def colorize_CMDstatus_doc():
3770 """To be called once in main() to add colors to git cl status help."""
3771 colors = [i for i in dir(Fore) if i[0].isupper()]
3772
3773 def colorize_line(line):
3774 for color in colors:
3775 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003776 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003777 indent = len(line) - len(line.lstrip(' ')) + 1
3778 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3779 return line
3780
3781 lines = CMDstatus.__doc__.splitlines()
3782 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3783
3784
phajdan.jre328cf92016-08-22 04:12:17 -07003785def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003786 if path == '-':
3787 json.dump(contents, sys.stdout)
3788 else:
3789 with open(path, 'w') as f:
3790 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003791
3792
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003793@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003794@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003795def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003796 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003797
3798 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003799 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003800 parser.add_option('-r', '--reverse', action='store_true',
3801 help='Lookup the branch(es) for the specified issues. If '
3802 'no issues are specified, all branches with mapped '
3803 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003804 parser.add_option('--json',
3805 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003806 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807
dnj@chromium.org406c4402015-03-03 17:22:28 +00003808 if options.reverse:
3809 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003810 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003811 # Reverse issue lookup.
3812 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003813
3814 git_config = {}
3815 for config in RunGit(['config', '--get-regexp',
3816 r'branch\..*issue']).splitlines():
3817 name, _space, val = config.partition(' ')
3818 git_config[name] = val
3819
dnj@chromium.org406c4402015-03-03 17:22:28 +00003820 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003821 issue = git_config.get(
3822 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003823 if issue:
3824 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003825 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003826 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003827 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003828 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003829 try:
3830 issue_num = int(issue)
3831 except ValueError:
3832 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003833 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003834 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003835 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003836 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003837 if options.json:
3838 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003839 return 0
3840
3841 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003842 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003843 if not issue.valid:
3844 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3845 'or no argument to list it.\n'
3846 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003847 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003848 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003849 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003850 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003851 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3852 if options.json:
3853 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003854 'gerrit_host': cl.GetGerritHost(),
3855 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003856 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003857 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003858 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003859 return 0
3860
3861
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003862@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003863def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003864 """Shows or posts review comments for any changelist."""
3865 parser.add_option('-a', '--add-comment', dest='comment',
3866 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003867 parser.add_option('-p', '--publish', action='store_true',
3868 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003869 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003870 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003871 parser.add_option('-m', '--machine-readable', dest='readable',
3872 action='store_false', default=True,
3873 help='output comments in a format compatible with '
3874 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003875 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003876 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003877 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003878
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003879 issue = None
3880 if options.issue:
3881 try:
3882 issue = int(options.issue)
3883 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003884 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003885
Edward Lemur934836a2019-09-09 20:16:54 +00003886 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003887
3888 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003889 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003890 return 0
3891
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003892 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3893 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003894 for comment in summary:
3895 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003896 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003897 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003898 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003899 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003900 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003901 elif comment.autogenerated:
3902 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003903 else:
3904 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003905 print('\n%s%s %s%s\n%s' % (
3906 color,
3907 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3908 comment.sender,
3909 Fore.RESET,
3910 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3911
smut@google.comc85ac942015-09-15 16:34:43 +00003912 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003913 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003914 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003915 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3916 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003917 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003918 return 0
3919
3920
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003921@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003922@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003923def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003924 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003925 parser.add_option('-d', '--display', action='store_true',
3926 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003927 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003928 help='New description to set for this issue (- for stdin, '
3929 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003930 parser.add_option('-f', '--force', action='store_true',
3931 help='Delete any unpublished Gerrit edits for this issue '
3932 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003933
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003934 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003935
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003936 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003937 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003938 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003939 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003940 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003941
Edward Lemur934836a2019-09-09 20:16:54 +00003942 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003943 if target_issue_arg:
3944 kwargs['issue'] = target_issue_arg.issue
3945 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003946
3947 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003948 if not cl.GetIssue():
3949 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003950
Edward Lemur678a6842019-10-03 22:25:05 +00003951 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003952 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003953
Edward Lemur6c6827c2020-02-06 21:15:18 +00003954 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003955
smut@google.com34fb6b12015-07-13 20:03:26 +00003956 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003957 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003958 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003959
3960 if options.new_description:
3961 text = options.new_description
3962 if text == '-':
3963 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003964 elif text == '+':
3965 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003966 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003967
3968 description.set_description(text)
3969 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003970 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003971 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003972 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003973 return 0
3974
3975
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003976@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003977def CMDlint(parser, args):
3978 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003979 parser.add_option('--filter', action='append', metavar='-x,+y',
3980 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003981 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003982
3983 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003984 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003985 try:
3986 import cpplint
3987 import cpplint_chromium
3988 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003990 return 1
3991
3992 # Change the current working directory before calling lint so that it
3993 # shows the correct base.
3994 previous_cwd = os.getcwd()
3995 os.chdir(settings.GetRoot())
3996 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003997 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003998 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003999 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004000 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004001 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004002
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004003 # Process cpplint arguments, if any.
4004 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4005 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004006 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004007
Lei Zhang379d1ad2020-07-15 19:40:06 +00004008 include_regex = re.compile(settings.GetLintRegex())
4009 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004010 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4011 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004012 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004013 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004014 continue
4015
4016 if ignore_regex.match(filename):
4017 print('Ignoring file %s' % filename)
4018 continue
4019
4020 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4021 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004022 finally:
4023 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004024 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004025 if cpplint._cpplint_state.error_count != 0:
4026 return 1
4027 return 0
4028
4029
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004030@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004031def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004032 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004033 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004034 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004035 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004036 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004037 parser.add_option('--all', action='store_true',
4038 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004039 parser.add_option('--parallel', action='store_true',
4040 help='Run all tests specified by input_api.RunTests in all '
4041 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004042 parser.add_option('--resultdb', action='store_true',
4043 help='Run presubmit checks in the ResultSink environment '
4044 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004045 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004046 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047
sbc@chromium.org71437c02015-04-09 19:29:40 +00004048 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050 return 1
4051
Edward Lemur934836a2019-09-09 20:16:54 +00004052 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053 if args:
4054 base_branch = args[0]
4055 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004056 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004057 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004058
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004059 if cl.GetIssue():
4060 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004061 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004062 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004063
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004064 cl.RunHook(
4065 committing=not options.upload,
4066 may_prompt=False,
4067 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004068 parallel=options.parallel,
4069 upstream=base_branch,
4070 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004071 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004072 resultdb=options.resultdb,
4073 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004074 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075
4076
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004077def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004078 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004079
4080 Works the same way as
4081 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4082 but can be called on demand on all platforms.
4083
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004084 The basic idea is to generate git hash of a state of the tree, original
4085 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004086 """
4087 lines = []
4088 tree_hash = RunGitSilent(['write-tree'])
4089 lines.append('tree %s' % tree_hash.strip())
4090 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4091 if code == 0:
4092 lines.append('parent %s' % parent.strip())
4093 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4094 lines.append('author %s' % author.strip())
4095 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4096 lines.append('committer %s' % committer.strip())
4097 lines.append('')
4098 # Note: Gerrit's commit-hook actually cleans message of some lines and
4099 # whitespace. This code is not doing this, but it clearly won't decrease
4100 # entropy.
4101 lines.append(message)
4102 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004103 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004104 return 'I%s' % change_hash.strip()
4105
4106
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004107def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004108 """Computes the remote branch ref to use for the CL.
4109
4110 Args:
4111 remote (str): The git remote for the CL.
4112 remote_branch (str): The git remote branch for the CL.
4113 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004114 """
4115 if not (remote and remote_branch):
4116 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004117
wittman@chromium.org455dc922015-01-26 20:15:50 +00004118 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004119 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004120 # refs, which are then translated into the remote full symbolic refs
4121 # below.
4122 if '/' not in target_branch:
4123 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4124 else:
4125 prefix_replacements = (
4126 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4127 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4128 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4129 )
4130 match = None
4131 for regex, replacement in prefix_replacements:
4132 match = re.search(regex, target_branch)
4133 if match:
4134 remote_branch = target_branch.replace(match.group(0), replacement)
4135 break
4136 if not match:
4137 # This is a branch path but not one we recognize; use as-is.
4138 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004139 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4140 # Handle the refs that need to land in different refs.
4141 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004142
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004143 # Migration to new default branch, only if available on remote.
4144 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4145 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4146 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4147 stderr=subprocess2.PIPE):
4148 # TODO(crbug.com/ID): Print location to local git migration script.
4149 print("WARNING: Using new branch name %s instead of %s" % (
4150 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4151 remote_branch = DEFAULT_NEW_BRANCH
4152
wittman@chromium.org455dc922015-01-26 20:15:50 +00004153 # Create the true path to the remote branch.
4154 # Does the following translation:
4155 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004156 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004157 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4158 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4159 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4160 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4161 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4162 'refs/heads/')
4163 elif remote_branch.startswith('refs/remotes/branch-heads'):
4164 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004165
wittman@chromium.org455dc922015-01-26 20:15:50 +00004166 return remote_branch
4167
4168
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004169def cleanup_list(l):
4170 """Fixes a list so that comma separated items are put as individual items.
4171
4172 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4173 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4174 """
4175 items = sum((i.split(',') for i in l), [])
4176 stripped_items = (i.strip() for i in items)
4177 return sorted(filter(None, stripped_items))
4178
4179
Aaron Gable4db38df2017-11-03 14:59:07 -07004180@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004181@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004182def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004183 """Uploads the current changelist to codereview.
4184
4185 Can skip dependency patchset uploads for a branch by running:
4186 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004187 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004188 git config --unset branch.branch_name.skip-deps-uploads
4189 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004190
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004191 If the name of the checked out branch starts with "bug-" or "fix-" followed
4192 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004193 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004194
4195 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004196 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004197 [git-cl] add support for hashtags
4198 Foo bar: implement foo
4199 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004200 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004201 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4202 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004203 parser.add_option('--bypass-watchlists', action='store_true',
4204 dest='bypass_watchlists',
4205 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004206 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004207 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004208 parser.add_option('--message', '-m', dest='message',
4209 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004210 parser.add_option('-b', '--bug',
4211 help='pre-populate the bug number(s) for this issue. '
4212 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004213 parser.add_option('--message-file', dest='message_file',
4214 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004215 parser.add_option('--title', '-t', dest='title',
4216 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004217 parser.add_option('-T', '--skip-title', action='store_true',
4218 dest='skip_title',
4219 help='Use the most recent commit message as the title of '
4220 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004221 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004222 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004223 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004224 parser.add_option('--tbrs',
4225 action='append', default=[],
4226 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004227 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004228 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004229 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004230 parser.add_option('--hashtag', dest='hashtags',
4231 action='append', default=[],
4232 help=('Gerrit hashtag for new CL; '
4233 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004234 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004235 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004236 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004237 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004238 metavar='TARGET',
4239 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004240 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004241 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004242 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004243 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004244 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004245 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004246 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004247 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4248 const='TBR', help='add a set of OWNERS to TBR')
4249 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4250 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004251 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004252 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004253 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004254 'implies --send-mail')
4255 parser.add_option('-d', '--cq-dry-run',
4256 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004257 help='Send the patchset to do a CQ dry run right after '
4258 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004259 parser.add_option(
4260 '-q',
4261 '--cq-quick-run',
4262 action='store_true',
4263 default=False,
4264 help='Send the patchset to do a CQ quick run right after '
4265 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4266 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004267 parser.add_option('--set-bot-commit', action='store_true',
4268 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004269 parser.add_option('--preserve-tryjobs', action='store_true',
4270 help='instruct the CQ to let tryjobs running even after '
4271 'new patchsets are uploaded instead of canceling '
4272 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004273 parser.add_option('--dependencies', action='store_true',
4274 help='Uploads CLs of all the local branches that depend on '
4275 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004276 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4277 help='Sends your change to the CQ after an approval. Only '
4278 'works on repos that have the Auto-Submit label '
4279 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004280 parser.add_option('--parallel', action='store_true',
4281 help='Run all tests specified by input_api.RunTests in all '
4282 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004283 parser.add_option('--no-autocc', action='store_true',
4284 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004285 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004286 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004287 parser.add_option('-R', '--retry-failed', action='store_true',
4288 help='Retry failed tryjobs from old patchset immediately '
4289 'after uploading new patchset. Cannot be used with '
4290 '--use-commit-queue or --cq-dry-run.')
4291 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4292 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004293 parser.add_option('--fixed', '-x',
4294 help='List of bugs that will be commented on and marked '
4295 'fixed (pre-populates "Fixed:" tag). Same format as '
4296 '-b option / "Bug:" tag. If fixing several issues, '
4297 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004298 parser.add_option('--edit-description', action='store_true', default=False,
4299 help='Modify description before upload. Cannot be used '
4300 'with --force. It is a noop when --no-squash is set '
4301 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004302 parser.add_option('--git-completion-helper', action="store_true",
4303 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004304 parser.add_option('--resultdb', action='store_true',
4305 help='Run presubmit checks in the ResultSink environment '
4306 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004307 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004308 parser.add_option('-o',
4309 '--push-options',
4310 action='append',
4311 default=[],
4312 help='Transmit the given string to the server when '
4313 'performing git push (pass-through). See git-push '
4314 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004315 parser.add_option('--no-add-changeid',
4316 action='store_true',
4317 dest='no_add_changeid',
4318 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004319
rmistry@google.com2dd99862015-06-22 12:22:18 +00004320 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004321 (options, args) = parser.parse_args(args)
4322
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004323 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004324 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4325 if opt.help != optparse.SUPPRESS_HELP))
4326 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004327
sbc@chromium.org71437c02015-04-09 19:29:40 +00004328 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004329 return 1
4330
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004331 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004332 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004333 options.cc = cleanup_list(options.cc)
4334
Josipe827b0f2020-01-30 00:07:20 +00004335 if options.edit_description and options.force:
4336 parser.error('Only one of --force and --edit-description allowed')
4337
tandriib80458a2016-06-23 12:20:07 -07004338 if options.message_file:
4339 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004340 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004341 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004342
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004343 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004344 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004345 options.use_commit_queue,
4346 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004347 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4348 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004349
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004350 if options.skip_title and options.title:
4351 parser.error('Only one of --title and --skip-title allowed.')
4352
Aaron Gableedbc4132017-09-11 13:22:28 -07004353 if options.use_commit_queue:
4354 options.send_mail = True
4355
Edward Lesmes0dd54822020-03-26 18:24:25 +00004356 if options.squash is None:
4357 # Load default for user, repo, squash=true, in this order.
4358 options.squash = settings.GetSquashGerritUploads()
4359
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004360 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004361 # Warm change details cache now to avoid RPCs later, reducing latency for
4362 # developers.
4363 if cl.GetIssue():
4364 cl._GetChangeDetail(
4365 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4366
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004367 if options.retry_failed and not cl.GetIssue():
4368 print('No previous patchsets, so --retry-failed has no effect.')
4369 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004370
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004371 # cl.GetMostRecentPatchset uses cached information, and can return the last
4372 # patchset before upload. Calling it here makes it clear that it's the
4373 # last patchset before upload. Note that GetMostRecentPatchset will fail
4374 # if no CL has been uploaded yet.
4375 if options.retry_failed:
4376 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004377
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004378 ret = cl.CMDUpload(options, args, orig_args)
4379
4380 if options.retry_failed:
4381 if ret != 0:
4382 print('Upload failed, so --retry-failed has no effect.')
4383 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004384 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004385 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004386 jobs = _filter_failed_for_retry(builds)
4387 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004388 print('No failed tryjobs, so --retry-failed has no effect.')
4389 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004390 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004391
4392 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004393
4394
Francois Dorayd42c6812017-05-30 15:10:20 -04004395@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004396@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004397def CMDsplit(parser, args):
4398 """Splits a branch into smaller branches and uploads CLs.
4399
4400 Creates a branch and uploads a CL for each group of files modified in the
4401 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004402 comment, the string '$directory', is replaced with the directory containing
4403 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004404 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004405 parser.add_option('-d', '--description', dest='description_file',
4406 help='A text file containing a CL description in which '
4407 '$directory will be replaced by each CL\'s directory.')
4408 parser.add_option('-c', '--comment', dest='comment_file',
4409 help='A text file containing a CL comment.')
4410 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004411 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004412 help='List the files and reviewers for each CL that would '
4413 'be created, but don\'t create branches or CLs.')
4414 parser.add_option('--cq-dry-run', action='store_true',
4415 help='If set, will do a cq dry run for each uploaded CL. '
4416 'Please be careful when doing this; more than ~10 CLs '
4417 'has the potential to overload our build '
4418 'infrastructure. Try to upload these not during high '
4419 'load times (usually 11-3 Mountain View time). Email '
4420 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004421 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4422 default=True,
4423 help='Sends your change to the CQ after an approval. Only '
4424 'works on repos that have the Auto-Submit label '
4425 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004426 options, _ = parser.parse_args(args)
4427
4428 if not options.description_file:
4429 parser.error('No --description flag specified.')
4430
4431 def WrappedCMDupload(args):
4432 return CMDupload(OptionParser(), args)
4433
Edward Lemur2c62b332020-03-12 22:12:33 +00004434 return split_cl.SplitCl(
4435 options.description_file, options.comment_file, Changelist,
4436 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4437 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004438
4439
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004440@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004441@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004442def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004443 """DEPRECATED: Used to commit the current changelist via git-svn."""
4444 message = ('git-cl no longer supports committing to SVN repositories via '
4445 'git-svn. You probably want to use `git cl land` instead.')
4446 print(message)
4447 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004448
4449
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004450@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004451@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004452def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004453 """Commits the current changelist via git.
4454
4455 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4456 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004457 """
4458 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4459 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004460 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004461 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004462 parser.add_option('--parallel', action='store_true',
4463 help='Run all tests specified by input_api.RunTests in all '
4464 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004465 parser.add_option('--resultdb', action='store_true',
4466 help='Run presubmit checks in the ResultSink environment '
4467 'and send results to the ResultDB database.')
4468 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004469 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004470
Edward Lemur934836a2019-09-09 20:16:54 +00004471 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004472
Robert Iannucci2e73d432018-03-14 01:10:47 -07004473 if not cl.GetIssue():
4474 DieWithError('You must upload the change first to Gerrit.\n'
4475 ' If you would rather have `git cl land` upload '
4476 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004477 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4478 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004479
4480
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004481@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004482@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004483def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004484 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485 parser.add_option('-b', dest='newbranch',
4486 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004487 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004488 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004489 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004490 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004491
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004492 group = optparse.OptionGroup(
4493 parser,
4494 'Options for continuing work on the current issue uploaded from a '
4495 'different clone (e.g. different machine). Must be used independently '
4496 'from the other options. No issue number should be specified, and the '
4497 'branch must have an issue number associated with it')
4498 group.add_option('--reapply', action='store_true', dest='reapply',
4499 help='Reset the branch and reapply the issue.\n'
4500 'CAUTION: This will undo any local changes in this '
4501 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004502
4503 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004504 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004505 parser.add_option_group(group)
4506
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004507 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004508
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004509 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004510 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004511 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004512 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004513 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004514
Edward Lemur934836a2019-09-09 20:16:54 +00004515 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004516 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004517 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004518
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004519 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004520 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004521 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004522
4523 RunGit(['reset', '--hard', upstream])
4524 if options.pull:
4525 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004526
Edward Lemur678a6842019-10-03 22:25:05 +00004527 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004528 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4529 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004530
4531 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004532 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004533
Edward Lemurf38bc172019-09-03 21:02:13 +00004534 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004535 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004536 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004537
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004538 # We don't want uncommitted changes mixed up with the patch.
4539 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004540 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004542 if options.newbranch:
4543 if options.force:
4544 RunGit(['branch', '-D', options.newbranch],
4545 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004546 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004547
Edward Lemur678a6842019-10-03 22:25:05 +00004548 cl = Changelist(
4549 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004550
Edward Lemur678a6842019-10-03 22:25:05 +00004551 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004552 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004553
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004554 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4555 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004556
4557
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004558def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559 """Fetches the tree status and returns either 'open', 'closed',
4560 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004561 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004562 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004563 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004564 if status.find('closed') != -1 or status == '0':
4565 return 'closed'
4566 elif status.find('open') != -1 or status == '1':
4567 return 'open'
4568 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 return 'unset'
4570
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004571
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004572def GetTreeStatusReason():
4573 """Fetches the tree status from a json url and returns the message
4574 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004575 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004576 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004577 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578 status = json.loads(connection.read())
4579 connection.close()
4580 return status['message']
4581
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004582
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004583@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004585 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004586 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004587 status = GetTreeStatus()
4588 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004589 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004590 return 2
4591
vapiera7fbd5a2016-06-16 09:17:49 -07004592 print('The tree is %s' % status)
4593 print()
4594 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004595 if status != 'open':
4596 return 1
4597 return 0
4598
4599
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004600@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004601def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004602 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4603 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004604 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004605 '-b', '--bot', action='append',
4606 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4607 'times to specify multiple builders. ex: '
4608 '"-b win_rel -b win_layout". See '
4609 'the try server waterfall for the builders name and the tests '
4610 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004611 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004612 '-B', '--bucket', default='',
4613 help=('Buildbucket bucket to send the try requests.'))
4614 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004615 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004616 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004617 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004618 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004619 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004620 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004621 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004622 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004623 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004624 '-q',
4625 '--quick-run',
4626 action='store_true',
4627 default=False,
4628 help='trigger in quick run mode '
4629 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4630 'uick_run.md) (chromium only).')
4631 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004632 '--category', default='git_cl_try', help='Specify custom build category.')
4633 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004634 '--project',
4635 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004636 'in recipe to determine to which repository or directory to '
4637 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004639 '-p', '--property', dest='properties', action='append', default=[],
4640 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004641 'key2=value2 etc. The value will be treated as '
4642 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004643 'NOTE: using this may make your tryjob not usable for CQ, '
4644 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004645 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004646 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4647 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004648 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004649 parser.add_option(
4650 '-R', '--retry-failed', action='store_true', default=False,
4651 help='Retry failed jobs from the latest set of tryjobs. '
4652 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004653 parser.add_option(
4654 '-i', '--issue', type=int,
4655 help='Operate on this issue instead of the current branch\'s implicit '
4656 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004657 options, args = parser.parse_args(args)
4658
machenbach@chromium.org45453142015-09-15 08:45:22 +00004659 # Make sure that all properties are prop=value pairs.
4660 bad_params = [x for x in options.properties if '=' not in x]
4661 if bad_params:
4662 parser.error('Got properties with missing "=": %s' % bad_params)
4663
maruel@chromium.org15192402012-09-06 12:38:29 +00004664 if args:
4665 parser.error('Unknown arguments: %s' % args)
4666
Edward Lemur934836a2019-09-09 20:16:54 +00004667 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004668 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004669 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004670
Edward Lemurf38bc172019-09-03 21:02:13 +00004671 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004672 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004673
tandriie113dfd2016-10-11 10:20:12 -07004674 error_message = cl.CannotTriggerTryJobReason()
4675 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004676 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004677
Edward Lemur45768512020-03-02 19:03:14 +00004678 if options.bot:
4679 if options.retry_failed:
4680 parser.error('--bot is not compatible with --retry-failed.')
4681 if not options.bucket:
4682 parser.error('A bucket (e.g. "chromium/try") is required.')
4683
4684 triggered = [b for b in options.bot if 'triggered' in b]
4685 if triggered:
4686 parser.error(
4687 'Cannot schedule builds on triggered bots: %s.\n'
4688 'This type of bot requires an initial job from a parent (usually a '
4689 'builder). Schedule a job on the parent instead.\n' % triggered)
4690
4691 if options.bucket.startswith('.master'):
4692 parser.error('Buildbot masters are not supported.')
4693
4694 project, bucket = _parse_bucket(options.bucket)
4695 if project is None or bucket is None:
4696 parser.error('Invalid bucket: %s.' % options.bucket)
4697 jobs = sorted((project, bucket, bot) for bot in options.bot)
4698 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004699 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004700 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004701 if options.verbose:
4702 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004703 jobs = _filter_failed_for_retry(builds)
4704 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004705 print('There are no failed jobs in the latest set of jobs '
4706 '(patchset #%d), doing nothing.' % patchset)
4707 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004708 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004709 if num_builders > 10:
4710 confirm_or_exit('There are %d builders with failed builds.'
4711 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004712 elif options.quick_run:
4713 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4714 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004715 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004716 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004717 print('git cl try with no bots now defaults to CQ dry run.')
4718 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4719 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004720
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004721 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004722 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004723 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004724 except BuildbucketResponseException as ex:
4725 print('ERROR: %s' % ex)
4726 return 1
4727 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004728
4729
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004730@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004731def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004732 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004733 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004734 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004735 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004736 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004737 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004738 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004739 '--color', action='store_true', default=setup_color.IS_TTY,
4740 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004741 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004742 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4743 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004744 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004745 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004746 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004747 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004748 parser.add_option(
4749 '-i', '--issue', type=int,
4750 help='Operate on this issue instead of the current branch\'s implicit '
4751 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004752 options, args = parser.parse_args(args)
4753 if args:
4754 parser.error('Unrecognized args: %s' % ' '.join(args))
4755
Edward Lemur934836a2019-09-09 20:16:54 +00004756 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004757 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004758 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004759
tandrii221ab252016-10-06 08:12:04 -07004760 patchset = options.patchset
4761 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004762 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004763 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004764 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004765 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004766 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004767 cl.GetIssue())
4768
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004769 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004770 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004771 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004772 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004773 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004774 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004775 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004776 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004777 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004778 return 0
4779
4780
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004781@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004782@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004783def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004784 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004785 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004786 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004787 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004788
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004789 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004790 if args:
4791 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004792 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004793 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004794 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004795 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004796
4797 # Clear configured merge-base, if there is one.
4798 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004799 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004800 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004801 return 0
4802
4803
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004804@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004805def CMDweb(parser, args):
4806 """Opens the current CL in the web browser."""
4807 _, args = parser.parse_args(args)
4808 if args:
4809 parser.error('Unrecognized args: %s' % ' '.join(args))
4810
4811 issue_url = Changelist().GetIssueURL()
4812 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004813 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004814 return 1
4815
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004816 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004817 # allows us to hide the "Created new window in existing browser session."
4818 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004819 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004820 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004821 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004822 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004823 os.open(os.devnull, os.O_RDWR)
4824 try:
4825 webbrowser.open(issue_url)
4826 finally:
4827 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004828 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004829 return 0
4830
4831
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004832@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004833def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004834 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004835 parser.add_option('-d', '--dry-run', action='store_true',
4836 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004837 parser.add_option(
4838 '-q',
4839 '--quick-run',
4840 action='store_true',
4841 help='trigger in quick run mode '
4842 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4843 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004844 parser.add_option('-c', '--clear', action='store_true',
4845 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004846 parser.add_option(
4847 '-i', '--issue', type=int,
4848 help='Operate on this issue instead of the current branch\'s implicit '
4849 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004850 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004851 if args:
4852 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004853 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4854 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004855
Edward Lemur934836a2019-09-09 20:16:54 +00004856 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004857 if not cl.GetIssue():
4858 parser.error('Must upload the issue first.')
4859
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004860 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004861 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004862 elif options.quick_run:
4863 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004864 elif options.dry_run:
4865 state = _CQState.DRY_RUN
4866 else:
4867 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004868 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004869 return 0
4870
4871
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004872@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004873def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004874 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004875 parser.add_option(
4876 '-i', '--issue', type=int,
4877 help='Operate on this issue instead of the current branch\'s implicit '
4878 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004879 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004880 if args:
4881 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004882 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004883 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004884 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004885 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004886 cl.CloseIssue()
4887 return 0
4888
4889
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004890@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004891def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004892 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004893 parser.add_option(
4894 '--stat',
4895 action='store_true',
4896 dest='stat',
4897 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004898 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004899 if args:
4900 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004901
Edward Lemur934836a2019-09-09 20:16:54 +00004902 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004903 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004904 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004905 if not issue:
4906 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004907
Aaron Gablea718c3e2017-08-28 17:47:28 -07004908 base = cl._GitGetBranchConfigValue('last-upload-hash')
4909 if not base:
4910 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4911 if not base:
4912 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4913 revision_info = detail['revisions'][detail['current_revision']]
4914 fetch_info = revision_info['fetch']['http']
4915 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4916 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004917
Aaron Gablea718c3e2017-08-28 17:47:28 -07004918 cmd = ['git', 'diff']
4919 if options.stat:
4920 cmd.append('--stat')
4921 cmd.append(base)
4922 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004923
4924 return 0
4925
4926
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004927@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004928def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004929 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004930 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004931 '--ignore-current',
4932 action='store_true',
4933 help='Ignore the CL\'s current reviewers and start from scratch.')
4934 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004935 '--ignore-self',
4936 action='store_true',
4937 help='Do not consider CL\'s author as an owners.')
4938 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004939 '--no-color',
4940 action='store_true',
4941 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004942 parser.add_option(
4943 '--batch',
4944 action='store_true',
4945 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004946 # TODO: Consider moving this to another command, since other
4947 # git-cl owners commands deal with owners for a given CL.
4948 parser.add_option(
4949 '--show-all',
4950 action='store_true',
4951 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004952 options, args = parser.parse_args(args)
4953
Edward Lemur934836a2019-09-09 20:16:54 +00004954 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004955 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004956
Yang Guo6e269a02019-06-26 11:17:02 +00004957 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004958 if len(args) == 0:
4959 print('No files specified for --show-all. Nothing to do.')
4960 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004961 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004962 for path in args:
4963 print('Owners for %s:' % path)
4964 print('\n'.join(
4965 ' - %s' % owner
4966 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004967 return 0
4968
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004969 if args:
4970 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004971 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004972 base_branch = args[0]
4973 else:
4974 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004975 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004976
Edward Lemur2c62b332020-03-12 22:12:33 +00004977 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004978
4979 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004980 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
4981 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07004982 return 0
4983
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004984 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004985 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01004986 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004987 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00004988 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004989 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004990 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004991
4992
Aiden Bennerc08566e2018-10-03 17:52:42 +00004993def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004994 """Generates a diff command."""
4995 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004996 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4997
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004998 if allow_prefix:
4999 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5000 # case that diff.noprefix is set in the user's git config.
5001 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5002 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005003 diff_cmd += ['--no-prefix']
5004
5005 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005006
5007 if args:
5008 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005009 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010 diff_cmd.append(arg)
5011 else:
5012 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005013
5014 return diff_cmd
5015
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005016
Jamie Madill5e96ad12020-01-13 16:08:35 +00005017def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5018 """Runs clang-format-diff and sets a return value if necessary."""
5019
5020 if not clang_diff_files:
5021 return 0
5022
5023 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5024 # formatted. This is used to block during the presubmit.
5025 return_value = 0
5026
5027 # Locate the clang-format binary in the checkout
5028 try:
5029 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5030 except clang_format.NotFoundError as e:
5031 DieWithError(e)
5032
5033 if opts.full or settings.GetFormatFullByDefault():
5034 cmd = [clang_format_tool]
5035 if not opts.dry_run and not opts.diff:
5036 cmd.append('-i')
5037 if opts.dry_run:
5038 for diff_file in clang_diff_files:
5039 with open(diff_file, 'r') as myfile:
5040 code = myfile.read().replace('\r\n', '\n')
5041 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5042 stdout = stdout.replace('\r\n', '\n')
5043 if opts.diff:
5044 sys.stdout.write(stdout)
5045 if code != stdout:
5046 return_value = 2
5047 else:
5048 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5049 if opts.diff:
5050 sys.stdout.write(stdout)
5051 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005052 try:
5053 script = clang_format.FindClangFormatScriptInChromiumTree(
5054 'clang-format-diff.py')
5055 except clang_format.NotFoundError as e:
5056 DieWithError(e)
5057
Edward Lesmes89624cd2020-04-06 17:51:56 +00005058 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005059 if not opts.dry_run and not opts.diff:
5060 cmd.append('-i')
5061
5062 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005063 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005064
Edward Lesmes89624cd2020-04-06 17:51:56 +00005065 env = os.environ.copy()
5066 env['PATH'] = (
5067 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5068 stdout = RunCommand(
5069 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005070 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005071 if opts.diff:
5072 sys.stdout.write(stdout)
5073 if opts.dry_run and len(stdout) > 0:
5074 return_value = 2
5075
5076 return return_value
5077
5078
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005079def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005080 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005081 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005082
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005083
enne@chromium.org555cfe42014-01-29 18:21:39 +00005084@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005085@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005086def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005087 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005088 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005089 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005090 parser.add_option('--full', action='store_true',
5091 help='Reformat the full content of all touched files')
5092 parser.add_option('--dry-run', action='store_true',
5093 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005094 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005095 '--no-clang-format',
5096 dest='clang_format',
5097 action='store_false',
5098 default=True,
5099 help='Disables formatting of various file types using clang-format.')
5100 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005101 '--python',
5102 action='store_true',
5103 default=None,
5104 help='Enables python formatting on all python files.')
5105 parser.add_option(
5106 '--no-python',
5107 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005108 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005109 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005110 'If neither --python or --no-python are set, python files that have a '
5111 '.style.yapf file in an ancestor directory will be formatted. '
5112 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005113 parser.add_option(
5114 '--js',
5115 action='store_true',
5116 help='Format javascript code with clang-format. '
5117 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005118 parser.add_option('--diff', action='store_true',
5119 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005120 parser.add_option('--presubmit', action='store_true',
5121 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005122 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005123
Garrett Beaty91a6f332020-01-06 16:57:24 +00005124 if opts.python is not None and opts.no_python:
5125 raise parser.error('Cannot set both --python and --no-python')
5126 if opts.no_python:
5127 opts.python = False
5128
Daniel Chengc55eecf2016-12-30 03:11:02 -08005129 # Normalize any remaining args against the current path, so paths relative to
5130 # the current directory are still resolved as expected.
5131 args = [os.path.join(os.getcwd(), arg) for arg in args]
5132
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005133 # git diff generates paths against the root of the repository. Change
5134 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005135 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005136 if rel_base_path:
5137 os.chdir(rel_base_path)
5138
digit@chromium.org29e47272013-05-17 17:01:46 +00005139 # Grab the merge-base commit, i.e. the upstream commit of the current
5140 # branch when it was created or the last time it was rebased. This is
5141 # to cover the case where the user may have called "git fetch origin",
5142 # moving the origin branch to a newer commit, but hasn't rebased yet.
5143 upstream_commit = None
5144 cl = Changelist()
5145 upstream_branch = cl.GetUpstreamBranch()
5146 if upstream_branch:
5147 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5148 upstream_commit = upstream_commit.strip()
5149
5150 if not upstream_commit:
5151 DieWithError('Could not find base commit for this branch. '
5152 'Are you in detached state?')
5153
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005154 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5155 diff_output = RunGit(changed_files_cmd)
5156 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005157 # Filter out files deleted by this CL
5158 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005159
Andreas Haas417d89c2020-02-06 10:24:27 +00005160 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005161 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005162
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005163 clang_diff_files = []
5164 if opts.clang_format:
5165 clang_diff_files = [
5166 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5167 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005168 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005169 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005170
Edward Lesmes50da7702020-03-30 19:23:43 +00005171 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005172
Jamie Madill5e96ad12020-01-13 16:08:35 +00005173 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5174 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005175
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005176 # Similar code to above, but using yapf on .py files rather than clang-format
5177 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005178 py_explicitly_disabled = opts.python is not None and not opts.python
5179 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005180 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5181 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005182
Aiden Bennerc08566e2018-10-03 17:52:42 +00005183 # Used for caching.
5184 yapf_configs = {}
5185 for f in python_diff_files:
5186 # Find the yapf style config for the current file, defaults to depot
5187 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005188 _FindYapfConfigFile(f, yapf_configs, top_dir)
5189
5190 # Turn on python formatting by default if a yapf config is specified.
5191 # This breaks in the case of this repo though since the specified
5192 # style file is also the global default.
5193 if opts.python is None:
5194 filtered_py_files = []
5195 for f in python_diff_files:
5196 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5197 filtered_py_files.append(f)
5198 else:
5199 filtered_py_files = python_diff_files
5200
5201 # Note: yapf still seems to fix indentation of the entire file
5202 # even if line ranges are specified.
5203 # See https://github.com/google/yapf/issues/499
5204 if not opts.full and filtered_py_files:
5205 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5206
Brian Sheedyb4307d52019-12-02 19:18:17 +00005207 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5208 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5209 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005210
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005211 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005212 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5213 # Default to pep8 if not .style.yapf is found.
5214 if not yapf_style:
5215 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005216
Peter Wend9399922020-06-17 17:33:49 +00005217 with open(f, 'r') as py_f:
5218 if 'python3' in py_f.readline():
5219 vpython_script = 'vpython3'
5220 else:
5221 vpython_script = 'vpython'
5222
5223 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005224
5225 has_formattable_lines = False
5226 if not opts.full:
5227 # Only run yapf over changed line ranges.
5228 for diff_start, diff_len in py_line_diffs[f]:
5229 diff_end = diff_start + diff_len - 1
5230 # Yapf errors out if diff_end < diff_start but this
5231 # is a valid line range diff for a removal.
5232 if diff_end >= diff_start:
5233 has_formattable_lines = True
5234 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5235 # If all line diffs were removals we have nothing to format.
5236 if not has_formattable_lines:
5237 continue
5238
5239 if opts.diff or opts.dry_run:
5240 cmd += ['--diff']
5241 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005242 stdout = RunCommand(cmd,
5243 error_ok=True,
5244 cwd=top_dir,
5245 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005246 if opts.diff:
5247 sys.stdout.write(stdout)
5248 elif len(stdout) > 0:
5249 return_value = 2
5250 else:
5251 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005252 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005253
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005254 # Format GN build files. Always run on full build files for canonical form.
5255 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005256 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005257 if opts.dry_run or opts.diff:
5258 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005259 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005260 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005261 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005262 cwd=top_dir)
5263 if opts.dry_run and gn_ret == 2:
5264 return_value = 2 # Not formatted.
5265 elif opts.diff and gn_ret == 2:
5266 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005267 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005268 elif gn_ret != 0:
5269 # For non-dry run cases (and non-2 return values for dry-run), a
5270 # nonzero error code indicates a failure, probably because the file
5271 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005272 DieWithError('gn format failed on ' + gn_diff_file +
5273 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005274
Ilya Shermane081cbe2017-08-15 17:51:04 -07005275 # Skip the metrics formatting from the global presubmit hook. These files have
5276 # a separate presubmit hook that issues an error if the files need formatting,
5277 # whereas the top-level presubmit script merely issues a warning. Formatting
5278 # these files is somewhat slow, so it's important not to duplicate the work.
5279 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005280 for diff_xml in GetDiffXMLs(diff_files):
5281 xml_dir = GetMetricsDir(diff_xml)
5282 if not xml_dir:
5283 continue
5284
Ilya Shermane081cbe2017-08-15 17:51:04 -07005285 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005286 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5287 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005288
5289 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5290 # command as histograms/pretty_print.py now needs a relative path argument
5291 # after splitting the histograms into multiple directories.
5292 # For example, in tools/metrics/ukm, pretty-print could be run using:
5293 # $ python pretty_print.py
5294 # But in tools/metrics/histogrmas, pretty-print should be run with an
5295 # additional relative path argument, like:
5296 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5297 # $ python pretty_print.py enums.xml
5298
5299 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5300 # version of histograms/pretty_print.py is released.
5301 filepath_required = os.path.exists(
5302 os.path.join(tool_dir, 'validate_prefix.py'))
5303
Weilun Shib92c4b72020-08-27 17:45:11 +00005304 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5305 or diff_xml.endswith('histogram_suffixes_list.xml')
5306 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005307 cmd.append(diff_xml)
5308
Ilya Shermane081cbe2017-08-15 17:51:04 -07005309 if opts.dry_run or opts.diff:
5310 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005311
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005312 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5313 # `shell` param and instead replace `'vpython'` with
5314 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005315 stdout = RunCommand(cmd,
5316 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005317 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005318 if opts.diff:
5319 sys.stdout.write(stdout)
5320 if opts.dry_run and stdout:
5321 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005322
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005323 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005324
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005325
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005326def GetDiffXMLs(diff_files):
5327 return [
5328 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5329 ]
5330
5331
5332def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005333 metrics_xml_dirs = [
5334 os.path.join('tools', 'metrics', 'actions'),
5335 os.path.join('tools', 'metrics', 'histograms'),
5336 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005337 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005338 os.path.join('tools', 'metrics', 'ukm'),
5339 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005340 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005341 if diff_xml.startswith(xml_dir):
5342 return xml_dir
5343 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005344
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005345
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005346@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005347@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005348def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005349 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005350 _, args = parser.parse_args(args)
5351
5352 if len(args) != 1:
5353 parser.print_help()
5354 return 1
5355
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005356 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005357 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005358 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005359
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005360 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005361
Edward Lemur52969c92020-02-06 18:15:28 +00005362 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005363 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005364 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005365
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005366 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005367 for key, issue in [x.split() for x in output.splitlines()]:
5368 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005369 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005370
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005371 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005372 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005373 return 1
5374 if len(branches) == 1:
5375 RunGit(['checkout', branches[0]])
5376 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005377 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005378 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005379 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005380 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005381 try:
5382 RunGit(['checkout', branches[int(which)]])
5383 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005384 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005385 return 1
5386
5387 return 0
5388
5389
maruel@chromium.org29404b52014-09-08 22:58:00 +00005390def CMDlol(parser, args):
5391 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005392 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005393 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5394 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5395 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005396 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005397 return 0
5398
5399
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005400class OptionParser(optparse.OptionParser):
5401 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005402
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005403 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005404 optparse.OptionParser.__init__(
5405 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005406 self.add_option(
5407 '-v', '--verbose', action='count', default=0,
5408 help='Use 2 times for more debugging info')
5409
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005410 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005411 try:
5412 return self._parse_args(args)
5413 finally:
5414 # Regardless of success or failure of args parsing, we want to report
5415 # metrics, but only after logging has been initialized (if parsing
5416 # succeeded).
5417 global settings
5418 settings = Settings()
5419
Edward Lesmes9c349062021-05-06 20:02:39 +00005420 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005421 # GetViewVCUrl ultimately calls logging method.
5422 project_url = settings.GetViewVCUrl().strip('/+')
5423 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5424 metrics.collector.add('project_urls', [project_url])
5425
5426 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005427 # Create an optparse.Values object that will store only the actual passed
5428 # options, without the defaults.
5429 actual_options = optparse.Values()
5430 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5431 # Create an optparse.Values object with the default options.
5432 options = optparse.Values(self.get_default_values().__dict__)
5433 # Update it with the options passed by the user.
5434 options._update_careful(actual_options.__dict__)
5435 # Store the options passed by the user in an _actual_options attribute.
5436 # We store only the keys, and not the values, since the values can contain
5437 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005438 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005439
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005440 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005441 logging.basicConfig(
5442 level=levels[min(options.verbose, len(levels) - 1)],
5443 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5444 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005445
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005446 return options, args
5447
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005448
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005449def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005450 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005451 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005452 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005453 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005454
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005455 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005456 dispatcher = subcommand.CommandDispatcher(__name__)
5457 try:
5458 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005459 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005460 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005461 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005462 if e.code != 500:
5463 raise
5464 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005465 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005466 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005467 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005468
5469
5470if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005471 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5472 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005473 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005474 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005475 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005476 sys.exit(main(sys.argv[1:]))