blob: 3bf80cb19a0ec1511a98e03bd95503d636130010 [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
Brian Sheedyb4307d52019-12-02 19:18:17 +0000669 with open(yapfignore_file) as f:
670 for line in f.readlines():
671 stripped_line = line.strip()
672 # Comments and blank lines should be ignored.
673 if stripped_line.startswith('#') or stripped_line == '':
674 continue
675 ignore_patterns.add(stripped_line)
676 return ignore_patterns
677
678
679def _FilterYapfIgnoredFiles(filepaths, patterns):
680 """Filters out any filepaths that match any of the given patterns.
681
682 Args:
683 filepaths: An iterable of strings containing filepaths to filter.
684 patterns: An iterable of strings containing fnmatch patterns to filter on.
685
686 Returns:
687 A list of strings containing all the elements of |filepaths| that did not
688 match any of the patterns in |patterns|.
689 """
690 # Not inlined so that tests can use the same implementation.
691 return [f for f in filepaths
692 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000693
694
Aaron Gable13101a62018-02-09 13:20:41 -0800695def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000696 """Prints statistics about the change to the user."""
697 # --no-ext-diff is broken in some versions of Git, so try to work around
698 # this by overriding the environment (but there is still a problem if the
699 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000700 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000701 if 'GIT_EXTERNAL_DIFF' in env:
702 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000703
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000704 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800705 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000706 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000707
708
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000709class BuildbucketResponseException(Exception):
710 pass
711
712
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000713class Settings(object):
714 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000715 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000716 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000717 self.tree_status_url = None
718 self.viewvc_url = None
719 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000720 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000721 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000722 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000723 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000724 self.format_full_by_default = 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
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000777 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000778 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000779 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000780 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
781 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000782 # Default is squash now (http://crbug.com/611892#c23).
783 self.squash_gerrit_uploads = self._GetConfig(
784 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000785 return self.squash_gerrit_uploads
786
Edward Lesmes4de54132020-05-05 19:41:33 +0000787 def GetSquashGerritUploadsOverride(self):
788 """Return True or False if codereview.settings should be overridden.
789
790 Returns None if no override has been defined.
791 """
792 # See also http://crbug.com/611892#c23
793 result = self._GetConfig('gerrit.override-squash-uploads').lower()
794 if result == 'true':
795 return True
796 if result == 'false':
797 return False
798 return None
799
tandrii@chromium.org28253532016-04-14 13:46:56 +0000800 def GetGerritSkipEnsureAuthenticated(self):
801 """Return True if EnsureAuthenticated should not be done for Gerrit
802 uploads."""
803 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000804 self.gerrit_skip_ensure_authenticated = self._GetConfig(
805 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000806 return self.gerrit_skip_ensure_authenticated
807
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000808 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000809 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000810 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000811 # Git requires single quotes for paths with spaces. We need to replace
812 # them with double quotes for Windows to treat such paths as a single
813 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000814 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000815 return self.git_editor or None
816
thestig@chromium.org44202a22014-03-11 19:22:18 +0000817 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000818 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000819
820 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000821 return self._GetConfig(
822 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000823
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000824 def GetFormatFullByDefault(self):
825 if self.format_full_by_default is None:
826 result = (
827 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
828 error_ok=True).strip())
829 self.format_full_by_default = (result == 'true')
830 return self.format_full_by_default
831
Edward Lemur26964072020-02-19 19:18:51 +0000832 def _GetConfig(self, key, default=''):
833 self._LazyUpdateIfNeeded()
834 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835
836
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000837class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000838 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000839 NONE = 'none'
840 DRY_RUN = 'dry_run'
841 COMMIT = 'commit'
842
843 ALL_STATES = [NONE, DRY_RUN, COMMIT]
844
845
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000847 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000848 self.issue = issue
849 self.patchset = patchset
850 self.hostname = hostname
851
852 @property
853 def valid(self):
854 return self.issue is not None
855
856
Edward Lemurf38bc172019-09-03 21:02:13 +0000857def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000858 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
859 fail_result = _ParsedIssueNumberArgument()
860
Edward Lemur678a6842019-10-03 22:25:05 +0000861 if isinstance(arg, int):
862 return _ParsedIssueNumberArgument(issue=arg)
863 if not isinstance(arg, basestring):
864 return fail_result
865
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000866 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000867 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000868 if not arg.startswith('http'):
869 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700870
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000871 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000872 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
873 if url.startswith(short_url):
874 url = gerrit_url + url[len(short_url):]
875 break
876
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000878 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000879 except ValueError:
880 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200881
Edward Lemur678a6842019-10-03 22:25:05 +0000882 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
883 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
884 # Short urls like https://domain/<issue_number> can be used, but don't allow
885 # specifying the patchset (you'd 404), but we allow that here.
886 if parsed_url.path == '/':
887 part = parsed_url.fragment
888 else:
889 part = parsed_url.path
890
891 match = re.match(
892 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
893 if not match:
894 return fail_result
895
896 issue = int(match.group('issue'))
897 patchset = match.group('patchset')
898 return _ParsedIssueNumberArgument(
899 issue=issue,
900 patchset=int(patchset) if patchset else None,
901 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000902
903
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000904def _create_description_from_log(args):
905 """Pulls out the commit log to use as a base for the CL description."""
906 log_args = []
907 if len(args) == 1 and not args[0].endswith('.'):
908 log_args = [args[0] + '..']
909 elif len(args) == 1 and args[0].endswith('...'):
910 log_args = [args[0][:-1]]
911 elif len(args) == 2:
912 log_args = [args[0] + '..' + args[1]]
913 else:
914 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000915 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000916
917
Aaron Gablea45ee112016-11-22 15:14:38 -0800918class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700919 def __init__(self, issue, url):
920 self.issue = issue
921 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800922 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700923
924 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800925 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700926 self.issue, self.url)
927
928
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100929_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000930 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100931 # TODO(tandrii): these two aren't known in Gerrit.
932 'approval', 'disapproval'])
933
934
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000935class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000936 """Changelist works with one changelist in local branch.
937
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000938 Notes:
939 * Not safe for concurrent multi-{thread,process} use.
940 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700941 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000942 """
943
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000944 def __init__(self,
945 branchref=None,
946 issue=None,
947 codereview_host=None,
948 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000949 """Create a new ChangeList instance.
950
Edward Lemurf38bc172019-09-03 21:02:13 +0000951 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000952 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000953 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000954 global settings
955 if not settings:
956 # Happens when git_cl.py is used as a utility library.
957 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000958
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000959 self.branchref = branchref
960 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000961 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000962 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000963 else:
964 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000965 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000966 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000967 self.lookedup_issue = False
968 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000970 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000972 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800973 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000974 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000975 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000976
Edward Lemur125d60a2019-09-13 18:25:41 +0000977 # Lazily cached values.
978 self._gerrit_host = None # e.g. chromium-review.googlesource.com
979 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +0000980 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +0000981 # Map from change number (issue) to its detail cache.
982 self._detail_cache = {}
983
984 if codereview_host is not None:
985 assert not codereview_host.startswith('https://'), codereview_host
986 self._gerrit_host = codereview_host
987 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988
Edward Lesmese1576912021-02-16 21:53:34 +0000989 @property
990 def owners_client(self):
991 if self._owners_client is None:
992 remote, remote_branch = self.GetRemoteBranch()
993 branch = GetTargetRef(remote, remote_branch, None)
994 self._owners_client = owners_client.GetCodeOwnersClient(
995 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +0000996 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +0000997 host=self.GetGerritHost(),
998 project=self.GetGerritProject(),
999 branch=branch)
1000 return self._owners_client
1001
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001002 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001003 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001004
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001005 The return value is a string suitable for passing to git cl with the --cc
1006 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001007 """
1008 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001009 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001010 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001011 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1012 return self.cc
1013
Daniel Cheng7227d212017-11-17 08:12:37 -08001014 def ExtendCC(self, more_cc):
1015 """Extends the list of users to cc on this CL based on the changed files."""
1016 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001018 def GetCommitDate(self):
1019 """Returns the commit date as provided in the constructor"""
1020 return self.commit_date
1021
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001022 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001023 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001025 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001026 if not branchref:
1027 return None
1028 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001029 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 return self.branch
1031
1032 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001033 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.GetBranch() # Poke the lazy loader.
1035 return self.branchref
1036
Edward Lemur85153282020-02-14 22:06:29 +00001037 def _GitGetBranchConfigValue(self, key, default=None):
1038 return scm.GIT.GetBranchConfig(
1039 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001040
Edward Lemur85153282020-02-14 22:06:29 +00001041 def _GitSetBranchConfigValue(self, key, value):
1042 action = 'set %s to %r' % (key, value)
1043 if not value:
1044 action = 'unset %s' % key
1045 assert self.GetBranch(), 'a branch is needed to ' + action
1046 return scm.GIT.SetBranchConfig(
1047 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001048
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001049 @staticmethod
1050 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001051 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001052 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001054 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1055 settings.GetRoot(), branch)
1056 if not remote or not upstream_branch:
1057 DieWithError(
1058 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001059 'Verify this branch is set up to track another \n'
1060 '(via the --track argument to "git checkout -b ..."). \n'
1061 'or pass complete "git diff"-style arguments if supported, like\n'
1062 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001063
1064 return remote, upstream_branch
1065
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001066 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001067 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001068 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001069 DieWithError('The upstream for the current branch (%s) does not exist '
1070 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001071 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001072 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001073
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001074 def GetUpstreamBranch(self):
1075 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001076 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001077 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001078 upstream_branch = upstream_branch.replace('refs/heads/',
1079 'refs/remotes/%s/' % remote)
1080 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1081 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 self.upstream_branch = upstream_branch
1083 return self.upstream_branch
1084
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001085 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001086 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001087 remote, branch = None, self.GetBranch()
1088 seen_branches = set()
1089 while branch not in seen_branches:
1090 seen_branches.add(branch)
1091 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001092 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001093 if remote != '.' or branch.startswith('refs/remotes'):
1094 break
1095 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001096 remotes = RunGit(['remote'], error_ok=True).split()
1097 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001098 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001099 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001100 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001101 logging.warning('Could not determine which remote this change is '
1102 'associated with, so defaulting to "%s".' %
1103 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001104 else:
Gavin Make6a62332020-12-04 21:57:10 +00001105 logging.warning('Could not determine which remote this change is '
1106 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 branch = 'HEAD'
1108 if branch.startswith('refs/remotes'):
1109 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001110 elif branch.startswith('refs/branch-heads/'):
1111 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 else:
1113 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001114 return self._remote
1115
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 def GetRemoteUrl(self):
1117 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1118
1119 Returns None if there is no remote.
1120 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001121 is_cached, value = self._cached_remote_url
1122 if is_cached:
1123 return value
1124
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001126 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001127
Edward Lemur298f2cf2019-02-22 21:40:39 +00001128 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001129 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001130 if host:
1131 self._cached_remote_url = (True, url)
1132 return url
1133
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001134 # If it cannot be parsed as an url, assume it is a local directory,
1135 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001136 logging.warning('"%s" doesn\'t appear to point to a git host. '
1137 'Interpreting it as a local directory.', url)
1138 if not os.path.isdir(url):
1139 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001140 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1141 'but it doesn\'t exist.',
1142 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001143 return None
1144
1145 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001146 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001147
Edward Lemur79d4f992019-11-11 23:49:02 +00001148 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001149 if not host:
1150 logging.error(
1151 'Remote "%(remote)s" for branch "%(branch)s" points to '
1152 '"%(cache_path)s", but it is misconfigured.\n'
1153 '"%(cache_path)s" must be a git repo and must have a remote named '
1154 '"%(remote)s" pointing to the git host.', {
1155 'remote': remote,
1156 'cache_path': cache_path,
1157 'branch': self.GetBranch()})
1158 return None
1159
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001160 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001161 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001163 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001164 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001165 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001166 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001167 if self.issue is not None:
1168 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001169 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001170 return self.issue
1171
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001172 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001174 issue = self.GetIssue()
1175 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001176 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001177 server = self.GetCodereviewServer()
1178 if short:
1179 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1180 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181
Edward Lemur6c6827c2020-02-06 21:15:18 +00001182 def FetchDescription(self, pretty=False):
1183 assert self.GetIssue(), 'issue is required to query Gerrit'
1184
Edward Lemur9aa1a962020-02-25 00:58:38 +00001185 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001186 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1187 current_rev = data['current_revision']
1188 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001189
1190 if not pretty:
1191 return self.description
1192
1193 # Set width to 72 columns + 2 space indent.
1194 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1195 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1196 lines = self.description.splitlines()
1197 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198
1199 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001200 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001201 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001202 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001203 if self.patchset is not None:
1204 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001205 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001206 return self.patchset
1207
Edward Lemur9aa1a962020-02-25 00:58:38 +00001208 def GetAuthor(self):
1209 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1210
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001211 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001212 """Set this branch's patchset. If patchset=0, clears the patchset."""
1213 assert self.GetBranch()
1214 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001215 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001216 else:
1217 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001218 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001219
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001220 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001221 """Set this branch's issue. If issue isn't given, clears the issue."""
1222 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001224 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001225 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001226 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001227 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001228 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001229 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001230 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 else:
tandrii5d48c322016-08-18 16:19:37 -07001232 # Reset all of these just to be clean.
1233 reset_suffixes = [
1234 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001235 ISSUE_CONFIG_KEY,
1236 PATCHSET_CONFIG_KEY,
1237 CODEREVIEW_SERVER_CONFIG_KEY,
1238 'gerritsquashhash',
1239 ]
tandrii5d48c322016-08-18 16:19:37 -07001240 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001241 try:
1242 self._GitSetBranchConfigValue(prop, None)
1243 except subprocess2.CalledProcessError:
1244 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001245 msg = RunGit(['log', '-1', '--format=%B']).strip()
1246 if msg and git_footers.get_footer_change_id(msg):
1247 print('WARNING: The change patched into this branch has a Change-Id. '
1248 'Removing it.')
1249 RunGit(['commit', '--amend', '-m',
1250 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001251 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001252 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001253 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254
Edward Lemur2c62b332020-03-12 22:12:33 +00001255 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001256 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001257 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001258 except subprocess2.CalledProcessError:
1259 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001260 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001261 'This branch probably doesn\'t exist anymore. To reset the\n'
1262 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001263 ' git branch --set-upstream-to origin/main %s\n'
1264 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001265 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001266
dsansomee2d6fd92016-09-08 00:10:47 -07001267 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268 assert self.GetIssue(), 'issue is required to update description'
1269
1270 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001271 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 if not force:
1273 confirm_or_exit(
1274 'The description cannot be modified while the issue has a pending '
1275 'unpublished edit. Either publish the edit in the Gerrit web UI '
1276 'or delete it.\n\n', action='delete the unpublished edit')
1277
1278 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001279 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001281 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001282 description, notify='NONE')
1283
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001284 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001285
Edward Lemur75526302020-02-27 22:31:05 +00001286 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001287 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001288 '--root', settings.GetRoot(),
1289 '--upstream', upstream,
1290 ]
1291
1292 args.extend(['--verbose'] * verbose)
1293
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001294 remote, remote_branch = self.GetRemoteBranch()
1295 target_ref = GetTargetRef(remote, remote_branch, None)
1296 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1297 args.extend(['--gerrit_project', self.GetGerritProject()])
1298 args.extend(['--gerrit_branch', target_ref])
1299
Edward Lemur99df04e2020-03-05 19:39:43 +00001300 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001301 issue = self.GetIssue()
1302 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001303 if author:
1304 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001305 if issue:
1306 args.extend(['--issue', str(issue)])
1307 if patchset:
1308 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001309
Edward Lemur75526302020-02-27 22:31:05 +00001310 return args
1311
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001312 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001313 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001314 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1315 args = self._GetCommonPresubmitArgs(verbose, upstream)
1316 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001317 if may_prompt:
1318 args.append('--may_prompt')
1319 if parallel:
1320 args.append('--parallel')
1321 if all_files:
1322 args.append('--all_files')
1323
1324 with gclient_utils.temporary_file() as description_file:
1325 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001326 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001327 args.extend(['--json_output', json_output])
1328 args.extend(['--description_file', description_file])
1329
1330 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001331 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001332 if resultdb and realm:
1333 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1334 elif resultdb:
1335 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1336 # it is not required to pass the realm flag
1337 print('Note: ResultDB reporting will NOT be performed because --realm'
1338 ' was not specified. To enable ResultDB, please run the command'
1339 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001340
1341 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001342 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001343
Edward Lemur227d5102020-02-25 23:45:35 +00001344 metrics.collector.add_repeated('sub_commands', {
1345 'command': 'presubmit',
1346 'execution_time': time_time() - start,
1347 'exit_code': exit_code,
1348 })
1349
1350 if exit_code:
1351 sys.exit(exit_code)
1352
1353 json_results = gclient_utils.FileRead(json_output)
1354 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001355
Edward Lemur75526302020-02-27 22:31:05 +00001356 def RunPostUploadHook(self, verbose, upstream, description):
1357 args = self._GetCommonPresubmitArgs(verbose, upstream)
1358 args.append('--post_upload')
1359
1360 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001361 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001362 args.extend(['--description_file', description_file])
1363 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1364 p.wait()
1365
Edward Lemur5a644f82020-03-18 16:44:57 +00001366 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1367 # Get description message for upload.
1368 if self.GetIssue():
1369 description = self.FetchDescription()
1370 elif options.message:
1371 description = options.message
1372 else:
1373 description = _create_description_from_log(git_diff_args)
1374 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001375 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001376
1377 # Extract bug number from branch name.
1378 bug = options.bug
1379 fixed = options.fixed
1380 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1381 self.GetBranch())
1382 if not bug and not fixed and match:
1383 if match.group('type') == 'bug':
1384 bug = match.group('bugnum')
1385 else:
1386 fixed = match.group('bugnum')
1387
1388 change_description = ChangeDescription(description, bug, fixed)
1389
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001390 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1391 if options.add_owners_to:
1392 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001393 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001394 files, [], options.tbrs + options.reviewers)
1395 missing_files = [
1396 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001397 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001398 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001399 owners = self.owners_client.SuggestOwners(
1400 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001401 if options.add_owners_to == 'TBR':
1402 assert isinstance(options.tbrs, list), options.tbrs
1403 options.tbrs.extend(owners)
1404 else:
1405 assert isinstance(options.reviewers, list), options.reviewers
1406 options.reviewers.extend(owners)
1407
Edward Lemur5a644f82020-03-18 16:44:57 +00001408 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001409 if options.reviewers or options.tbrs:
1410 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001411
1412 return change_description
1413
1414 def _GetTitleForUpload(self, options):
1415 # When not squashing, just return options.title.
1416 if not options.squash:
1417 return options.title
1418
1419 # On first upload, patchset title is always this string, while options.title
1420 # gets converted to first line of message.
1421 if not self.GetIssue():
1422 return 'Initial upload'
1423
1424 # When uploading subsequent patchsets, options.message is taken as the title
1425 # if options.title is not provided.
1426 if options.title:
1427 return options.title
1428 if options.message:
1429 return options.message.strip()
1430
1431 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001432 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001433 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001434 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001435 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1436 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001437
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001438 def CMDUpload(self, options, git_diff_args, orig_args):
1439 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001440 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001441 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001443 else:
1444 if self.GetBranch() is None:
1445 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1446
1447 # Default to diffing against common ancestor of upstream branch
1448 base_branch = self.GetCommonAncestorWithUpstream()
1449 git_diff_args = [base_branch, 'HEAD']
1450
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001451 # Fast best-effort checks to abort before running potentially expensive
1452 # hooks if uploading is likely to fail anyway. Passing these checks does
1453 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001454 self.EnsureAuthenticated(force=options.force)
1455 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001456
1457 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001458 watchlist = watchlists.Watchlists(settings.GetRoot())
1459 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001460 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001461 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001462
Edward Lemur5a644f82020-03-18 16:44:57 +00001463 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001464 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001465 hook_results = self.RunHook(
1466 committing=False,
1467 may_prompt=not options.force,
1468 verbose=options.verbose,
1469 parallel=options.parallel,
1470 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001471 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001472 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001473 resultdb=options.resultdb,
1474 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001475 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001476
Aaron Gable13101a62018-02-09 13:20:41 -08001477 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001478 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001479 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001480 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001481 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001482 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001483 # Run post upload hooks, if specified.
1484 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001485 self.RunPostUploadHook(
1486 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001487
1488 # Upload all dependencies if specified.
1489 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001490 print()
1491 print('--dependencies has been specified.')
1492 print('All dependent local branches will be re-uploaded.')
1493 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001494 # Remove the dependencies flag from args so that we do not end up in a
1495 # loop.
1496 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001497 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001498 return ret
1499
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001500 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001501 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001502
1503 Issue must have been already uploaded and known.
1504 """
1505 assert new_state in _CQState.ALL_STATES
1506 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001507 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001508 vote_map = {
1509 _CQState.NONE: 0,
1510 _CQState.DRY_RUN: 1,
1511 _CQState.COMMIT: 2,
1512 }
1513 labels = {'Commit-Queue': vote_map[new_state]}
1514 notify = False if new_state == _CQState.DRY_RUN else None
1515 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001516 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001517 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001518 return 0
1519 except KeyboardInterrupt:
1520 raise
1521 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001522 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001523 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001524 ' * Your project has no CQ,\n'
1525 ' * You don\'t have permission to change the CQ state,\n'
1526 ' * There\'s a bug in this code (see stack trace below).\n'
1527 'Consider specifying which bots to trigger manually or asking your '
1528 'project owners for permissions or contacting Chrome Infra at:\n'
1529 'https://www.chromium.org/infra\n\n' %
1530 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001531 # Still raise exception so that stack trace is printed.
1532 raise
1533
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001534 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535 # Lazy load of configs.
1536 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001537 if self._gerrit_host and '.' not in self._gerrit_host:
1538 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1539 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001540 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001541 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001542 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001543 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001544 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1545 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001546 return self._gerrit_host
1547
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001548 def _GetGitHost(self):
1549 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001550 remote_url = self.GetRemoteUrl()
1551 if not remote_url:
1552 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001553 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001554
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001555 def GetCodereviewServer(self):
1556 if not self._gerrit_server:
1557 # If we're on a branch then get the server potentially associated
1558 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001559 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001560 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001561 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001562 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001563 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001564 if not self._gerrit_server:
1565 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1566 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001567 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001568 parts[0] = parts[0] + '-review'
1569 self._gerrit_host = '.'.join(parts)
1570 self._gerrit_server = 'https://%s' % self._gerrit_host
1571 return self._gerrit_server
1572
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001573 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001574 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001575 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001576 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001577 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001578 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001579 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001580 if project.endswith('.git'):
1581 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001582 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1583 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1584 # gitiles/git-over-https protocol. E.g.,
1585 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1586 # as
1587 # https://chromium.googlesource.com/v8/v8
1588 if project.startswith('a/'):
1589 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001590 return project
1591
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001592 def _GerritChangeIdentifier(self):
1593 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1594
1595 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001596 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001597 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001598 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001599 if project:
1600 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1601 # Fall back on still unique, but less efficient change number.
1602 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001603
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001604 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001606 if settings.GetGerritSkipEnsureAuthenticated():
1607 # For projects with unusual authentication schemes.
1608 # See http://crbug.com/603378.
1609 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001610
1611 # Check presence of cookies only if using cookies-based auth method.
1612 cookie_auth = gerrit_util.Authenticator.get()
1613 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001614 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001615
Florian Mayerae510e82020-01-30 21:04:48 +00001616 remote_url = self.GetRemoteUrl()
1617 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001618 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001619 return
1620 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001621 logging.warning('Ignoring branch %(branch)s with non-https remote '
1622 '%(remote)s', {
1623 'branch': self.branch,
1624 'remote': self.GetRemoteUrl()
1625 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001626 return
1627
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001628 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001629 self.GetCodereviewServer()
1630 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001631 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001632
1633 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1634 git_auth = cookie_auth.get_auth_header(git_host)
1635 if gerrit_auth and git_auth:
1636 if gerrit_auth == git_auth:
1637 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001638 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001639 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001640 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001641 ' %s\n'
1642 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001643 ' Consider running the following command:\n'
1644 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001645 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001646 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001647 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001648 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001649 cookie_auth.get_new_password_message(git_host)))
1650 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001651 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001652 return
1653 else:
1654 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001655 ([] if gerrit_auth else [self._gerrit_host]) +
1656 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001657 DieWithError('Credentials for the following hosts are required:\n'
1658 ' %s\n'
1659 'These are read from %s (or legacy %s)\n'
1660 '%s' % (
1661 '\n '.join(missing),
1662 cookie_auth.get_gitcookies_path(),
1663 cookie_auth.get_netrc_path(),
1664 cookie_auth.get_new_password_message(git_host)))
1665
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001666 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001667 if not self.GetIssue():
1668 return
1669
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001670 status = self._GetChangeDetail()['status']
1671 if status in ('MERGED', 'ABANDONED'):
1672 DieWithError('Change %s has been %s, new uploads are not allowed' %
1673 (self.GetIssueURL(),
1674 'submitted' if status == 'MERGED' else 'abandoned'))
1675
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001676 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1677 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1678 # Apparently this check is not very important? Otherwise get_auth_email
1679 # could have been added to other implementations of Authenticator.
1680 cookies_auth = gerrit_util.Authenticator.get()
1681 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001682 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001683
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001684 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001685 if self.GetIssueOwner() == cookies_user:
1686 return
1687 logging.debug('change %s owner is %s, cookies user is %s',
1688 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001689 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001690 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001691 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001692 if details['email'] == self.GetIssueOwner():
1693 return
1694 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001695 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001696 'as %s.\n'
1697 'Uploading may fail due to lack of permissions.' %
1698 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1699 confirm_or_exit(action='upload')
1700
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001701 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001702 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001703 or CQ status, assuming adherence to a common workflow.
1704
1705 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001706 * 'error' - error from review tool (including deleted issues)
1707 * 'unsent' - no reviewers added
1708 * 'waiting' - waiting for review
1709 * 'reply' - waiting for uploader to reply to review
1710 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001711 * 'dry-run' - dry-running in the CQ
1712 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001713 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001714 """
1715 if not self.GetIssue():
1716 return None
1717
1718 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001719 data = self._GetChangeDetail([
1720 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001721 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001722 return 'error'
1723
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001724 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001725 return 'closed'
1726
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001727 cq_label = data['labels'].get('Commit-Queue', {})
1728 max_cq_vote = 0
1729 for vote in cq_label.get('all', []):
1730 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1731 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001732 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001733 if max_cq_vote == 1:
1734 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001735
Aaron Gable9ab38c62017-04-06 14:36:33 -07001736 if data['labels'].get('Code-Review', {}).get('approved'):
1737 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001738
1739 if not data.get('reviewers', {}).get('REVIEWER', []):
1740 return 'unsent'
1741
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001742 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001743 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001744 while messages:
1745 m = messages.pop()
1746 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001747 # Ignore replies from CQ.
1748 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001749 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001750 # Most recent message was by owner.
1751 return 'waiting'
1752 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001753 # Some reply from non-owner.
1754 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001755
1756 # Somehow there are no messages even though there are reviewers.
1757 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758
1759 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001760 if not self.GetIssue():
1761 return None
1762
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001763 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001764 patchset = data['revisions'][data['current_revision']]['_number']
1765 self.SetPatchset(patchset)
1766 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001767
Gavin Make61ccc52020-11-13 00:12:57 +00001768 def GetMostRecentDryRunPatchset(self):
1769 """Get patchsets equivalent to the most recent patchset and return
1770 the patchset with the latest dry run. If none have been dry run, return
1771 the latest patchset."""
1772 if not self.GetIssue():
1773 return None
1774
1775 data = self._GetChangeDetail(['ALL_REVISIONS'])
1776 patchset = data['revisions'][data['current_revision']]['_number']
1777 dry_run = set([int(m['_revision_number'])
1778 for m in data.get('messages', [])
1779 if m.get('tag', '').endswith('dry-run')])
1780
1781 for revision_info in sorted(data.get('revisions', {}).values(),
1782 key=lambda c: c['_number'], reverse=True):
1783 if revision_info['_number'] in dry_run:
1784 patchset = revision_info['_number']
1785 break
1786 if revision_info.get('kind', '') not in \
1787 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1788 break
1789 self.SetPatchset(patchset)
1790 return patchset
1791
Aaron Gable636b13f2017-07-14 10:42:48 -07001792 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001793 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001794 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001795 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001796
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001797 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001798 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001799 # CURRENT_REVISION is included to get the latest patchset so that
1800 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001801 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001802 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1803 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001804 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001805 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001806 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001807 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001808
1809 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001810 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001811 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001812 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001813 line_comments = file_comments.setdefault(path, [])
1814 line_comments.extend(
1815 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001816
1817 # Build dictionary of file comments for easy access and sorting later.
1818 # {author+date: {path: {patchset: {line: url+message}}}}
1819 comments = collections.defaultdict(
1820 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001821
1822 server = self.GetCodereviewServer()
1823 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1824 # /c/ is automatically added by short URL server.
1825 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1826 self.GetIssue())
1827 else:
1828 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1829
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001830 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001831 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001832 tag = comment.get('tag', '')
1833 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001834 continue
1835 key = (comment['author']['email'], comment['updated'])
1836 if comment.get('side', 'REVISION') == 'PARENT':
1837 patchset = 'Base'
1838 else:
1839 patchset = 'PS%d' % comment['patch_set']
1840 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001841 url = ('%s/%s/%s#%s%s' %
1842 (url_prefix, comment['patch_set'], path,
1843 'b' if comment.get('side') == 'PARENT' else '',
1844 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001845 comments[key][path][patchset][line] = (url, comment['message'])
1846
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001847 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001848 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001849 summary = self._BuildCommentSummary(msg, comments, readable)
1850 if summary:
1851 summaries.append(summary)
1852 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001853
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001854 @staticmethod
1855 def _BuildCommentSummary(msg, comments, readable):
1856 key = (msg['author']['email'], msg['date'])
1857 # Don't bother showing autogenerated messages that don't have associated
1858 # file or line comments. this will filter out most autogenerated
1859 # messages, but will keep robot comments like those from Tricium.
1860 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1861 if is_autogenerated and not comments.get(key):
1862 return None
1863 message = msg['message']
1864 # Gerrit spits out nanoseconds.
1865 assert len(msg['date'].split('.')[-1]) == 9
1866 date = datetime.datetime.strptime(msg['date'][:-3],
1867 '%Y-%m-%d %H:%M:%S.%f')
1868 if key in comments:
1869 message += '\n'
1870 for path, patchsets in sorted(comments.get(key, {}).items()):
1871 if readable:
1872 message += '\n%s' % path
1873 for patchset, lines in sorted(patchsets.items()):
1874 for line, (url, content) in sorted(lines.items()):
1875 if line:
1876 line_str = 'Line %d' % line
1877 path_str = '%s:%d:' % (path, line)
1878 else:
1879 line_str = 'File comment'
1880 path_str = '%s:0:' % path
1881 if readable:
1882 message += '\n %s, %s: %s' % (patchset, line_str, url)
1883 message += '\n %s\n' % content
1884 else:
1885 message += '\n%s ' % path_str
1886 message += '\n%s\n' % content
1887
1888 return _CommentSummary(
1889 date=date,
1890 message=message,
1891 sender=msg['author']['email'],
1892 autogenerated=is_autogenerated,
1893 # These could be inferred from the text messages and correlated with
1894 # Code-Review label maximum, however this is not reliable.
1895 # Leaving as is until the need arises.
1896 approval=False,
1897 disapproval=False,
1898 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001899
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001901 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001902 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001904 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001905 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001906 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001907 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001908
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001909 def _GetChangeDetail(self, options=None):
1910 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001911 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001912 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001913
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001914 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001915 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001916 options.append('CURRENT_COMMIT')
1917
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001918 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001919 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001920 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001921
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001922 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1923 # Assumption: data fetched before with extra options is suitable
1924 # for return for a smaller set of options.
1925 # For example, if we cached data for
1926 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1927 # and request is for options=[CURRENT_REVISION],
1928 # THEN we can return prior cached data.
1929 if options_set.issubset(cached_options_set):
1930 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001931
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001932 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001933 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001934 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001935 except gerrit_util.GerritError as e:
1936 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001937 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001938 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001939
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001940 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001941 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001942
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001943 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001944 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001945 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001946 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001947 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001948 except gerrit_util.GerritError as e:
1949 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001950 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001951 raise
agable32978d92016-11-01 12:55:02 -07001952 return data
1953
Karen Qian40c19422019-03-13 21:28:29 +00001954 def _IsCqConfigured(self):
1955 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001956 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001957
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001958 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001959 if git_common.is_dirty_git_tree('land'):
1960 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001961
tandriid60367b2016-06-22 05:25:12 -07001962 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001963 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001964 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001965 'which can test and land changes for you. '
1966 'Are you sure you wish to bypass it?\n',
1967 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001968 differs = True
tandriic4344b52016-08-29 06:04:54 -07001969 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001970 # Note: git diff outputs nothing if there is no diff.
1971 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001972 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001973 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001974 if detail['current_revision'] == last_upload:
1975 differs = False
1976 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001977 print('WARNING: Local branch contents differ from latest uploaded '
1978 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001979 if differs:
1980 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001981 confirm_or_exit(
1982 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1983 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001984 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001985 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001986 upstream = self.GetCommonAncestorWithUpstream()
1987 if self.GetIssue():
1988 description = self.FetchDescription()
1989 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001990 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001991 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001992 committing=True,
1993 may_prompt=not force,
1994 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001995 parallel=parallel,
1996 upstream=upstream,
1997 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001998 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001999 resultdb=resultdb,
2000 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002001
2002 self.SubmitIssue(wait_for_merge=True)
2003 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002004 links = self._GetChangeCommit().get('web_links', [])
2005 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002006 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002007 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002008 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002009 return 0
2010
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002011 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2012 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002013 assert parsed_issue_arg.valid
2014
Edward Lemur125d60a2019-09-13 18:25:41 +00002015 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002016
2017 if parsed_issue_arg.hostname:
2018 self._gerrit_host = parsed_issue_arg.hostname
2019 self._gerrit_server = 'https://%s' % self._gerrit_host
2020
tandriic2405f52016-10-10 08:13:15 -07002021 try:
2022 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002023 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002024 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002025
2026 if not parsed_issue_arg.patchset:
2027 # Use current revision by default.
2028 revision_info = detail['revisions'][detail['current_revision']]
2029 patchset = int(revision_info['_number'])
2030 else:
2031 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002032 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002033 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2034 break
2035 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002036 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002037 (parsed_issue_arg.patchset, self.GetIssue()))
2038
Edward Lemur125d60a2019-09-13 18:25:41 +00002039 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002040 if remote_url.endswith('.git'):
2041 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002042 remote_url = remote_url.rstrip('/')
2043
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002044 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002045 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002046
2047 if remote_url != fetch_info['url']:
2048 DieWithError('Trying to patch a change from %s but this repo appears '
2049 'to be %s.' % (fetch_info['url'], remote_url))
2050
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002051 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002052
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002053 # If we have created a new branch then do the "set issue" immediately in
2054 # case the cherry-pick fails, which happens when resolving conflicts.
2055 if newbranch:
2056 self.SetIssue(parsed_issue_arg.issue)
2057
Aaron Gable62619a32017-06-16 08:22:09 -07002058 if force:
2059 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2060 print('Checked out commit for change %i patchset %i locally' %
2061 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002062 elif nocommit:
2063 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2064 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002065 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002066 RunGit(['cherry-pick', 'FETCH_HEAD'])
2067 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002068 (parsed_issue_arg.issue, patchset))
2069 print('Note: this created a local commit which does not have '
2070 'the same hash as the one uploaded for review. This will make '
2071 'uploading changes based on top of this branch difficult.\n'
2072 'If you want to do that, use "git cl patch --force" instead.')
2073
Stefan Zagerd08043c2017-10-12 12:07:02 -07002074 if self.GetBranch():
2075 self.SetIssue(parsed_issue_arg.issue)
2076 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002077 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002078 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2079 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2080 else:
2081 print('WARNING: You are in detached HEAD state.\n'
2082 'The patch has been applied to your checkout, but you will not be '
2083 'able to upload a new patch set to the gerrit issue.\n'
2084 'Try using the \'-b\' option if you would like to work on a '
2085 'branch and/or upload a new patch set.')
2086
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002087 return 0
2088
tandrii16e0b4e2016-06-07 10:34:28 -07002089 def _GerritCommitMsgHookCheck(self, offer_removal):
2090 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2091 if not os.path.exists(hook):
2092 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002093 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2094 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002095 data = gclient_utils.FileRead(hook)
2096 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2097 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002098 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002099 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002100 'and may interfere with it in subtle ways.\n'
2101 'We recommend you remove the commit-msg hook.')
2102 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002103 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002104 gclient_utils.rm_file_or_tree(hook)
2105 print('Gerrit commit-msg hook removed.')
2106 else:
2107 print('OK, will keep Gerrit commit-msg hook in place.')
2108
Edward Lemur1b52d872019-05-09 21:12:12 +00002109 def _CleanUpOldTraces(self):
2110 """Keep only the last |MAX_TRACES| traces."""
2111 try:
2112 traces = sorted([
2113 os.path.join(TRACES_DIR, f)
2114 for f in os.listdir(TRACES_DIR)
2115 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2116 and not f.startswith('tmp'))
2117 ])
2118 traces_to_delete = traces[:-MAX_TRACES]
2119 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002120 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002121 except OSError:
2122 print('WARNING: Failed to remove old git traces from\n'
2123 ' %s'
2124 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002125
Edward Lemur5737f022019-05-17 01:24:00 +00002126 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002127 """Zip and write the git push traces stored in traces_dir."""
2128 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002129 traces_zip = trace_name + '-traces'
2130 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002131 # Create a temporary dir to store git config and gitcookies in. It will be
2132 # compressed and stored next to the traces.
2133 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002134 git_info_zip = trace_name + '-git-info'
2135
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002136 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002137
Edward Lemur1b52d872019-05-09 21:12:12 +00002138 git_push_metadata['trace_name'] = trace_name
2139 gclient_utils.FileWrite(
2140 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2141
2142 # Keep only the first 6 characters of the git hashes on the packet
2143 # trace. This greatly decreases size after compression.
2144 packet_traces = os.path.join(traces_dir, 'trace-packet')
2145 if os.path.isfile(packet_traces):
2146 contents = gclient_utils.FileRead(packet_traces)
2147 gclient_utils.FileWrite(
2148 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2149 shutil.make_archive(traces_zip, 'zip', traces_dir)
2150
2151 # Collect and compress the git config and gitcookies.
2152 git_config = RunGit(['config', '-l'])
2153 gclient_utils.FileWrite(
2154 os.path.join(git_info_dir, 'git-config'),
2155 git_config)
2156
2157 cookie_auth = gerrit_util.Authenticator.get()
2158 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2159 gitcookies_path = cookie_auth.get_gitcookies_path()
2160 if os.path.isfile(gitcookies_path):
2161 gitcookies = gclient_utils.FileRead(gitcookies_path)
2162 gclient_utils.FileWrite(
2163 os.path.join(git_info_dir, 'gitcookies'),
2164 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2165 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2166
Edward Lemur1b52d872019-05-09 21:12:12 +00002167 gclient_utils.rmtree(git_info_dir)
2168
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002169 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002170 """Run git push and collect the traces resulting from the execution."""
2171 # Create a temporary directory to store traces in. Traces will be compressed
2172 # and stored in a 'traces' dir inside depot_tools.
2173 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002174 trace_name = os.path.join(
2175 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002176
2177 env = os.environ.copy()
2178 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2179 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002180 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002181 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2182 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2183 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2184
2185 try:
2186 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002187 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002188 before_push = time_time()
2189 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002190 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002191 env=env,
2192 print_stdout=True,
2193 # Flush after every line: useful for seeing progress when running as
2194 # recipe.
2195 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002196 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002197 except subprocess2.CalledProcessError as e:
2198 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002199 raise GitPushError(
2200 'Failed to create a change. Please examine output above for the '
2201 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002202 'For emergencies, Googlers can escalate to '
2203 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002204 'Hint: run command below to diagnose common Git/Gerrit '
2205 'credential problems:\n'
2206 ' git cl creds-check\n'
2207 '\n'
2208 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2209 'component including the files below.\n'
2210 'Review the files before upload, since they might contain sensitive '
2211 'information.\n'
2212 'Set the Restrict-View-Google label so that they are not publicly '
2213 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002214 finally:
2215 execution_time = time_time() - before_push
2216 metrics.collector.add_repeated('sub_commands', {
2217 'command': 'git push',
2218 'execution_time': execution_time,
2219 'exit_code': push_returncode,
2220 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2221 })
2222
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 git_push_metadata['execution_time'] = execution_time
2224 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002225 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002226
Edward Lemur1b52d872019-05-09 21:12:12 +00002227 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002228 gclient_utils.rmtree(traces_dir)
2229
2230 return push_stdout
2231
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002232 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2233 change_desc):
2234 """Upload the current branch to Gerrit, retry if new remote HEAD is
2235 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002236 remote, remote_branch = self.GetRemoteBranch()
2237 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2238
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002239 try:
2240 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002241 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002242 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002243 # Repository might be in the middle of transition to main branch as
2244 # default, and uploads to old default might be blocked.
2245 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002246 DieWithError(str(e), change_desc)
2247
Josip Sokcevicb631a882021-01-06 18:18:10 +00002248 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2249 self.GetGerritProject())
2250 if project_head == branch:
2251 DieWithError(str(e), change_desc)
2252 branch = project_head
2253
2254 print("WARNING: Fetching remote state and retrying upload to default "
2255 "branch...")
2256 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002257 options.edit_description = False
2258 options.force = True
2259 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002260 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2261 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002262 except GitPushError as e:
2263 DieWithError(str(e), change_desc)
2264
2265 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002266 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002267 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002268 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002269 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002271 # User requested to change description
2272 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002273 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002274 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002275 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002276 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002277 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002278 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002279 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002280 if len(change_ids) == 1:
2281 change_id = change_ids[0]
2282 else:
2283 change_id = GenerateGerritChangeId(change_desc.description)
2284 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002286 if options.preserve_tryjobs:
2287 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002288
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002290 parent = self._ComputeParent(
2291 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002292 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002293 with gclient_utils.temporary_file() as desc_tempfile:
2294 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2295 ref_to_push = RunGit(
2296 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002297 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 if not git_footers.get_footer_change_id(change_desc.description):
2299 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002300 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002301 self._AddChangeIdToCommitMessage(
2302 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002304 # For no-squash mode, we assume the remote called "origin" is the one we
2305 # want. It is not worthwhile to support different workflows for
2306 # no-squash mode.
2307 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002308 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2309
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002310 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002311 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2312 ref_to_push)]).splitlines()
2313 if len(commits) > 1:
2314 print('WARNING: This will upload %d commits. Run the following command '
2315 'to see which commits will be uploaded: ' % len(commits))
2316 print('git log %s..%s' % (parent, ref_to_push))
2317 print('You can also use `git squash-branch` to squash these into a '
2318 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002319 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002320
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002321 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002322 cc = []
2323 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2324 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2325 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002326 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002327 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002328 if options.cc:
2329 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002330 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002331 if change_desc.get_cced():
2332 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002333 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002334 valid_accounts = set(reviewers + cc)
2335 # TODO(crbug/877717): relax this for all hosts.
2336 else:
2337 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002338 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002339 logging.info('accounts %s are recognized, %s invalid',
2340 sorted(valid_accounts),
2341 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002342
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002343 # Extra options that can be specified at push time. Doc:
2344 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002345 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002346
Aaron Gable844cf292017-06-28 11:32:59 -07002347 # By default, new changes are started in WIP mode, and subsequent patchsets
2348 # don't send email. At any time, passing --send-mail will mark the change
2349 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002350 if options.send_mail:
2351 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002352 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002353 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002354 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002355 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002356 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002357
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002358 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002359 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002360
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002361 # Set options.title in case user was prompted in _GetTitleForUpload and
2362 # _CMDUploadChange needs to be called again.
2363 options.title = self._GetTitleForUpload(options)
2364 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002365 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002366 refspec_opts.append(
2367 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002368
agablec6787972016-09-09 16:13:34 -07002369 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002370 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002371
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002372 for r in sorted(reviewers):
2373 if r in valid_accounts:
2374 refspec_opts.append('r=%s' % r)
2375 reviewers.remove(r)
2376 else:
2377 # TODO(tandrii): this should probably be a hard failure.
2378 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2379 % r)
2380 for c in sorted(cc):
2381 # refspec option will be rejected if cc doesn't correspond to an
2382 # account, even though REST call to add such arbitrary cc may succeed.
2383 if c in valid_accounts:
2384 refspec_opts.append('cc=%s' % c)
2385 cc.remove(c)
2386
rmistry9eadede2016-09-19 11:22:43 -07002387 if options.topic:
2388 # Documentation on Gerrit topics is here:
2389 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002390 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002391
Edward Lemur687ca902018-12-05 02:30:30 +00002392 if options.enable_auto_submit:
2393 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002394 if options.set_bot_commit:
2395 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002396 if options.use_commit_queue:
2397 refspec_opts.append('l=Commit-Queue+2')
2398 elif options.cq_dry_run:
2399 refspec_opts.append('l=Commit-Queue+1')
2400
2401 if change_desc.get_reviewers(tbr_only=True):
2402 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002403 self.GetGerritHost(),
2404 self.GetGerritProject())
Edward Lemur687ca902018-12-05 02:30:30 +00002405 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002406
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002407 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002408 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002409 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002410 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002411 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2412
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002413 refspec_suffix = ''
2414 if refspec_opts:
2415 refspec_suffix = '%' + ','.join(refspec_opts)
2416 assert ' ' not in refspec_suffix, (
2417 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2418 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2419
Edward Lemur1b52d872019-05-09 21:12:12 +00002420 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002421 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002422 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002423 'change_id': change_id,
2424 'description': change_desc.description,
2425 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002426 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2427 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002428
2429 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002430 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002431 change_numbers = [m.group(1)
2432 for m in map(regex.match, push_stdout.splitlines())
2433 if m]
2434 if len(change_numbers) != 1:
2435 DieWithError(
2436 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002437 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002438 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002439 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002440
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002441 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002442 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002443 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002444 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002445 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002446 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002447 reviewers, cc,
2448 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002449
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002450 return 0
2451
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002452 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2453 change_desc):
2454 """Computes parent of the generated commit to be uploaded to Gerrit.
2455
2456 Returns revision or a ref name.
2457 """
2458 if custom_cl_base:
2459 # Try to avoid creating additional unintended CLs when uploading, unless
2460 # user wants to take this risk.
2461 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2462 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2463 local_ref_of_target_remote])
2464 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002465 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002466 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2467 'If you proceed with upload, more than 1 CL may be created by '
2468 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2469 'If you are certain that specified base `%s` has already been '
2470 'uploaded to Gerrit as another CL, you may proceed.\n' %
2471 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2472 if not force:
2473 confirm_or_exit(
2474 'Do you take responsibility for cleaning up potential mess '
2475 'resulting from proceeding with upload?',
2476 action='upload')
2477 return custom_cl_base
2478
Aaron Gablef97e33d2017-03-30 15:44:27 -07002479 if remote != '.':
2480 return self.GetCommonAncestorWithUpstream()
2481
2482 # If our upstream branch is local, we base our squashed commit on its
2483 # squashed version.
2484 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2485
Aaron Gablef97e33d2017-03-30 15:44:27 -07002486 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002487 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002488 if upstream_branch_name == 'main':
2489 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002490
2491 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002492 # TODO(tandrii): consider checking parent change in Gerrit and using its
2493 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2494 # the tree hash of the parent branch. The upside is less likely bogus
2495 # requests to reupload parent change just because it's uploadhash is
2496 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002497 parent = scm.GIT.GetBranchConfig(
2498 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002499 # Verify that the upstream branch has been uploaded too, otherwise
2500 # Gerrit will create additional CLs when uploading.
2501 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2502 RunGitSilent(['rev-parse', parent + ':'])):
2503 DieWithError(
2504 '\nUpload upstream branch %s first.\n'
2505 'It is likely that this branch has been rebased since its last '
2506 'upload, so you just need to upload it again.\n'
2507 '(If you uploaded it with --no-squash, then branch dependencies '
2508 'are not supported, and you should reupload with --squash.)'
2509 % upstream_branch_name,
2510 change_desc)
2511 return parent
2512
Edward Lemura12175c2020-03-09 16:58:26 +00002513 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002514 """Re-commits using the current message, assumes the commit hook is in
2515 place.
2516 """
Edward Lemura12175c2020-03-09 16:58:26 +00002517 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002518 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002519 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002520 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002521 return new_log_desc
2522 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002523 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002524
tandriie113dfd2016-10-11 10:20:12 -07002525 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002526 try:
2527 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002528 except GerritChangeNotExists:
2529 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002530
2531 if data['status'] in ('ABANDONED', 'MERGED'):
2532 return 'CL %s is closed' % self.GetIssue()
2533
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002534 def GetGerritChange(self, patchset=None):
2535 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002536 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002537 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002538 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002539 data = self._GetChangeDetail(['ALL_REVISIONS'])
2540
2541 assert host and issue and patchset, 'CL must be uploaded first'
2542
2543 has_patchset = any(
2544 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002545 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002546 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002547 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002548 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002549
tandrii8c5a3532016-11-04 07:52:02 -07002550 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002551 'host': host,
2552 'change': issue,
2553 'project': data['project'],
2554 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002555 }
tandriie113dfd2016-10-11 10:20:12 -07002556
tandriide281ae2016-10-12 06:02:30 -07002557 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002558 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002559
Edward Lemur707d70b2018-02-07 00:50:14 +01002560 def GetReviewers(self):
2561 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002562 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002563
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002564
Lei Zhang8a0efc12020-08-05 19:58:45 +00002565def _get_bug_line_values(default_project_prefix, bugs):
2566 """Given default_project_prefix and comma separated list of bugs, yields bug
2567 line values.
tandriif9aefb72016-07-01 09:06:51 -07002568
2569 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002570 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002571 * string, which is left as is.
2572
2573 This function may produce more than one line, because bugdroid expects one
2574 project per line.
2575
Lei Zhang8a0efc12020-08-05 19:58:45 +00002576 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002577 ['v8:123', 'chromium:789']
2578 """
2579 default_bugs = []
2580 others = []
2581 for bug in bugs.split(','):
2582 bug = bug.strip()
2583 if bug:
2584 try:
2585 default_bugs.append(int(bug))
2586 except ValueError:
2587 others.append(bug)
2588
2589 if default_bugs:
2590 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002591 if default_project_prefix:
2592 if not default_project_prefix.endswith(':'):
2593 default_project_prefix += ':'
2594 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002595 else:
2596 yield default_bugs
2597 for other in sorted(others):
2598 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2599 yield other
2600
2601
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002602class ChangeDescription(object):
2603 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002604 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002605 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002606 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002607 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002608 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002609 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2610 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002611 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002612 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002613
Dan Beamd8b04ca2019-10-10 21:23:26 +00002614 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002615 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002616 if bug:
2617 regexp = re.compile(self.BUG_LINE)
2618 prefix = settings.GetBugPrefix()
2619 if not any((regexp.match(line) for line in self._description_lines)):
2620 values = list(_get_bug_line_values(prefix, bug))
2621 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002622 if fixed:
2623 regexp = re.compile(self.FIXED_LINE)
2624 prefix = settings.GetBugPrefix()
2625 if not any((regexp.match(line) for line in self._description_lines)):
2626 values = list(_get_bug_line_values(prefix, fixed))
2627 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002628
agable@chromium.org42c20792013-09-12 17:34:49 +00002629 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002630 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002631 return '\n'.join(self._description_lines)
2632
2633 def set_description(self, desc):
2634 if isinstance(desc, basestring):
2635 lines = desc.splitlines()
2636 else:
2637 lines = [line.rstrip() for line in desc]
2638 while lines and not lines[0]:
2639 lines.pop(0)
2640 while lines and not lines[-1]:
2641 lines.pop(-1)
2642 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002643
Edward Lemur5a644f82020-03-18 16:44:57 +00002644 def ensure_change_id(self, change_id):
2645 description = self.description
2646 footer_change_ids = git_footers.get_footer_change_id(description)
2647 # Make sure that the Change-Id in the description matches the given one.
2648 if footer_change_ids != [change_id]:
2649 if footer_change_ids:
2650 # Remove any existing Change-Id footers since they don't match the
2651 # expected change_id footer.
2652 description = git_footers.remove_footer(description, 'Change-Id')
2653 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2654 'if you want to set a new one.')
2655 # Add the expected Change-Id footer.
2656 description = git_footers.add_footer_change_id(description, change_id)
2657 self.set_description(description)
2658
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002659 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002660 """Rewrites the R=/TBR= line(s) as a single line each.
2661
2662 Args:
2663 reviewers (list(str)) - list of additional emails to use for reviewers.
2664 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002665 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002666 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002667 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002668
2669 reviewers = set(reviewers)
2670 tbrs = set(tbrs)
2671 LOOKUP = {
2672 'TBR': tbrs,
2673 'R': reviewers,
2674 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002675
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002676 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002677 regexp = re.compile(self.R_LINE)
2678 matches = [regexp.match(line) for line in self._description_lines]
2679 new_desc = [l for i, l in enumerate(self._description_lines)
2680 if not matches[i]]
2681 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002682
agable@chromium.org42c20792013-09-12 17:34:49 +00002683 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002684
2685 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 for match in matches:
2687 if not match:
2688 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002689 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2690
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002691 # If any folks ended up in both groups, remove them from tbrs.
2692 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002693
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002694 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2695 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002696
2697 # Put the new lines in the description where the old first R= line was.
2698 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2699 if 0 <= line_loc < len(self._description_lines):
2700 if new_tbr_line:
2701 self._description_lines.insert(line_loc, new_tbr_line)
2702 if new_r_line:
2703 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002704 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002705 if new_r_line:
2706 self.append_footer(new_r_line)
2707 if new_tbr_line:
2708 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002709
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002710 def set_preserve_tryjobs(self):
2711 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2712 footers = git_footers.parse_footers(self.description)
2713 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2714 if v.lower() == 'true':
2715 return
2716 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2717
Anthony Polito8b955342019-09-24 19:01:36 +00002718 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002719 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002720 self.set_description([
2721 '# Enter a description of the change.',
2722 '# This will be displayed on the codereview site.',
2723 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002724 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002725 '--------------------',
2726 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002727 bug_regexp = re.compile(self.BUG_LINE)
2728 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002729 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002730 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002731
Dan Beamd8b04ca2019-10-10 21:23:26 +00002732 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002733 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002734
Bruce Dawsonfc487042020-10-27 19:11:37 +00002735 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002736 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002737 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002738 if not content:
2739 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002740 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002741
Bruce Dawson2377b012018-01-11 16:46:49 -08002742 # Strip off comments and default inserted "Bug:" line.
2743 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002744 (line.startswith('#') or
2745 line.rstrip() == "Bug:" or
2746 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002747 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002748 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002749 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002750
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002751 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002752 """Adds a footer line to the description.
2753
2754 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2755 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2756 that Gerrit footers are always at the end.
2757 """
2758 parsed_footer_line = git_footers.parse_footer(line)
2759 if parsed_footer_line:
2760 # Line is a gerrit footer in the form: Footer-Key: any value.
2761 # Thus, must be appended observing Gerrit footer rules.
2762 self.set_description(
2763 git_footers.add_footer(self.description,
2764 key=parsed_footer_line[0],
2765 value=parsed_footer_line[1]))
2766 return
2767
2768 if not self._description_lines:
2769 self._description_lines.append(line)
2770 return
2771
2772 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2773 if gerrit_footers:
2774 # git_footers.split_footers ensures that there is an empty line before
2775 # actual (gerrit) footers, if any. We have to keep it that way.
2776 assert top_lines and top_lines[-1] == ''
2777 top_lines, separator = top_lines[:-1], top_lines[-1:]
2778 else:
2779 separator = [] # No need for separator if there are no gerrit_footers.
2780
2781 prev_line = top_lines[-1] if top_lines else ''
2782 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2783 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2784 top_lines.append('')
2785 top_lines.append(line)
2786 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002787
tandrii99a72f22016-08-17 14:33:24 -07002788 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002789 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002790 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002791 reviewers = [match.group(2).strip()
2792 for match in matches
2793 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002794 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002795
bradnelsond975b302016-10-23 12:20:23 -07002796 def get_cced(self):
2797 """Retrieves the list of reviewers."""
2798 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2799 cced = [match.group(2).strip() for match in matches if match]
2800 return cleanup_list(cced)
2801
Nodir Turakulov23b82142017-11-16 11:04:25 -08002802 def get_hash_tags(self):
2803 """Extracts and sanitizes a list of Gerrit hashtags."""
2804 subject = (self._description_lines or ('',))[0]
2805 subject = re.sub(
2806 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2807
2808 tags = []
2809 start = 0
2810 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2811 while True:
2812 m = bracket_exp.match(subject, start)
2813 if not m:
2814 break
2815 tags.append(self.sanitize_hash_tag(m.group(1)))
2816 start = m.end()
2817
2818 if not tags:
2819 # Try "Tag: " prefix.
2820 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2821 if m:
2822 tags.append(self.sanitize_hash_tag(m.group(1)))
2823 return tags
2824
2825 @classmethod
2826 def sanitize_hash_tag(cls, tag):
2827 """Returns a sanitized Gerrit hash tag.
2828
2829 A sanitized hashtag can be used as a git push refspec parameter value.
2830 """
2831 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2832
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002833
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002834def FindCodereviewSettingsFile(filename='codereview.settings'):
2835 """Finds the given file starting in the cwd and going up.
2836
2837 Only looks up to the top of the repository unless an
2838 'inherit-review-settings-ok' file exists in the root of the repository.
2839 """
2840 inherit_ok_file = 'inherit-review-settings-ok'
2841 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002842 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002843 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2844 root = '/'
2845 while True:
2846 if filename in os.listdir(cwd):
2847 if os.path.isfile(os.path.join(cwd, filename)):
2848 return open(os.path.join(cwd, filename))
2849 if cwd == root:
2850 break
2851 cwd = os.path.dirname(cwd)
2852
2853
2854def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002855 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002856 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002857
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002858 def SetProperty(name, setting, unset_error_ok=False):
2859 fullname = 'rietveld.' + name
2860 if setting in keyvals:
2861 RunGit(['config', fullname, keyvals[setting]])
2862 else:
2863 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2864
tandrii48df5812016-10-17 03:55:37 -07002865 if not keyvals.get('GERRIT_HOST', False):
2866 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002867 # Only server setting is required. Other settings can be absent.
2868 # In that case, we ignore errors raised during option deletion attempt.
2869 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2870 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2871 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002872 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002873 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2874 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002875 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2876 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002877 SetProperty(
2878 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002879
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002880 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002881 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002882
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002883 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002884 RunGit(['config', 'gerrit.squash-uploads',
2885 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002886
tandrii@chromium.org28253532016-04-14 13:46:56 +00002887 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002888 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002889 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2890
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002891 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002892 # should be of the form
2893 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2894 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002895 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2896 keyvals['ORIGIN_URL_CONFIG']])
2897
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002898
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002899def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002900 """Downloads a network object to a local file, like urllib.urlretrieve.
2901
2902 This is necessary because urllib is broken for SSL connections via a proxy.
2903 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002904 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002905 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002906
2907
ukai@chromium.org712d6102013-11-27 00:52:58 +00002908def hasSheBang(fname):
2909 """Checks fname is a #! script."""
2910 with open(fname) as f:
2911 return f.read(2).startswith('#!')
2912
2913
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002914def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002915 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002916
2917 Args:
2918 force: True to update hooks. False to install hooks if not present.
2919 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002920 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002921 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2922 if not os.access(dst, os.X_OK):
2923 if os.path.exists(dst):
2924 if not force:
2925 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002926 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002927 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002928 if not hasSheBang(dst):
2929 DieWithError('Not a script: %s\n'
2930 'You need to download from\n%s\n'
2931 'into .git/hooks/commit-msg and '
2932 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002933 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2934 except Exception:
2935 if os.path.exists(dst):
2936 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002937 DieWithError('\nFailed to download hooks.\n'
2938 'You need to download from\n%s\n'
2939 'into .git/hooks/commit-msg and '
2940 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002941
2942
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002943class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002944 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002945
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002946 _GOOGLESOURCE = 'googlesource.com'
2947
2948 def __init__(self):
2949 # Cached list of [host, identity, source], where source is either
2950 # .gitcookies or .netrc.
2951 self._all_hosts = None
2952
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002953 def ensure_configured_gitcookies(self):
2954 """Runs checks and suggests fixes to make git use .gitcookies from default
2955 path."""
2956 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2957 configured_path = RunGitSilent(
2958 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002959 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002960 if configured_path:
2961 self._ensure_default_gitcookies_path(configured_path, default)
2962 else:
2963 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002964
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002965 @staticmethod
2966 def _ensure_default_gitcookies_path(configured_path, default_path):
2967 assert configured_path
2968 if configured_path == default_path:
2969 print('git is already configured to use your .gitcookies from %s' %
2970 configured_path)
2971 return
2972
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002973 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002974 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2975 (configured_path, default_path))
2976
2977 if not os.path.exists(configured_path):
2978 print('However, your configured .gitcookies file is missing.')
2979 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2980 action='reconfigure')
2981 RunGit(['config', '--global', 'http.cookiefile', default_path])
2982 return
2983
2984 if os.path.exists(default_path):
2985 print('WARNING: default .gitcookies file already exists %s' %
2986 default_path)
2987 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2988 default_path)
2989
2990 confirm_or_exit('Move existing .gitcookies to default location?',
2991 action='move')
2992 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002993 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002994 print('Moved and reconfigured git to use .gitcookies from %s' %
2995 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002996
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002997 @staticmethod
2998 def _configure_gitcookies_path(default_path):
2999 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3000 if os.path.exists(netrc_path):
3001 print('You seem to be using outdated .netrc for git credentials: %s' %
3002 netrc_path)
3003 print('This tool will guide you through setting up recommended '
3004 '.gitcookies store for git credentials.\n'
3005 '\n'
3006 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3007 ' git config --global --unset http.cookiefile\n'
3008 ' mv %s %s.backup\n\n' % (default_path, default_path))
3009 confirm_or_exit(action='setup .gitcookies')
3010 RunGit(['config', '--global', 'http.cookiefile', default_path])
3011 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003012
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003013 def get_hosts_with_creds(self, include_netrc=False):
3014 if self._all_hosts is None:
3015 a = gerrit_util.CookiesAuthenticator()
3016 self._all_hosts = [
3017 (h, u, s)
3018 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003019 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3020 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003021 )
3022 if h.endswith(self._GOOGLESOURCE)
3023 ]
3024
3025 if include_netrc:
3026 return self._all_hosts
3027 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3028
3029 def print_current_creds(self, include_netrc=False):
3030 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3031 if not hosts:
3032 print('No Git/Gerrit credentials found')
3033 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003034 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003035 header = [('Host', 'User', 'Which file'),
3036 ['=' * l for l in lengths]]
3037 for row in (header + hosts):
3038 print('\t'.join((('%%+%ds' % l) % s)
3039 for l, s in zip(lengths, row)))
3040
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003041 @staticmethod
3042 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003043 """Parses identity "git-<username>.domain" into <username> and domain."""
3044 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003045 # distinguishable from sub-domains. But we do know typical domains:
3046 if identity.endswith('.chromium.org'):
3047 domain = 'chromium.org'
3048 username = identity[:-len('.chromium.org')]
3049 else:
3050 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003051 if username.startswith('git-'):
3052 username = username[len('git-'):]
3053 return username, domain
3054
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003055 def _canonical_git_googlesource_host(self, host):
3056 """Normalizes Gerrit hosts (with '-review') to Git host."""
3057 assert host.endswith(self._GOOGLESOURCE)
3058 # Prefix doesn't include '.' at the end.
3059 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3060 if prefix.endswith('-review'):
3061 prefix = prefix[:-len('-review')]
3062 return prefix + '.' + self._GOOGLESOURCE
3063
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003064 def _canonical_gerrit_googlesource_host(self, host):
3065 git_host = self._canonical_git_googlesource_host(host)
3066 prefix = git_host.split('.', 1)[0]
3067 return prefix + '-review.' + self._GOOGLESOURCE
3068
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003069 def _get_counterpart_host(self, host):
3070 assert host.endswith(self._GOOGLESOURCE)
3071 git = self._canonical_git_googlesource_host(host)
3072 gerrit = self._canonical_gerrit_googlesource_host(git)
3073 return git if gerrit == host else gerrit
3074
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003075 def has_generic_host(self):
3076 """Returns whether generic .googlesource.com has been configured.
3077
3078 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3079 """
3080 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3081 if host == '.' + self._GOOGLESOURCE:
3082 return True
3083 return False
3084
3085 def _get_git_gerrit_identity_pairs(self):
3086 """Returns map from canonic host to pair of identities (Git, Gerrit).
3087
3088 One of identities might be None, meaning not configured.
3089 """
3090 host_to_identity_pairs = {}
3091 for host, identity, _ in self.get_hosts_with_creds():
3092 canonical = self._canonical_git_googlesource_host(host)
3093 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3094 idx = 0 if canonical == host else 1
3095 pair[idx] = identity
3096 return host_to_identity_pairs
3097
3098 def get_partially_configured_hosts(self):
3099 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003100 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003101 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003102 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003103
3104 def get_conflicting_hosts(self):
3105 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003106 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003107 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003108 if None not in (i1, i2) and i1 != i2)
3109
3110 def get_duplicated_hosts(self):
3111 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003112 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003113
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003114
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003115 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003116 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003117 hosts = sorted(hosts)
3118 assert hosts
3119 if extra_column_func is None:
3120 extras = [''] * len(hosts)
3121 else:
3122 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003123 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3124 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003125 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003126 lines.append(tmpl % he)
3127 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003128
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003129 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003130 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003131 yield ('.googlesource.com wildcard record detected',
3132 ['Chrome Infrastructure team recommends to list full host names '
3133 'explicitly.'],
3134 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003135
3136 dups = self.get_duplicated_hosts()
3137 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003138 yield ('The following hosts were defined twice',
3139 self._format_hosts(dups),
3140 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003141
3142 partial = self.get_partially_configured_hosts()
3143 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003144 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3145 'These hosts are missing',
3146 self._format_hosts(partial, lambda host: 'but %s defined' %
3147 self._get_counterpart_host(host)),
3148 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003149
3150 conflicting = self.get_conflicting_hosts()
3151 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003152 yield ('The following Git hosts have differing credentials from their '
3153 'Gerrit counterparts',
3154 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3155 tuple(self._get_git_gerrit_identity_pairs()[host])),
3156 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003157
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003158 def find_and_report_problems(self):
3159 """Returns True if there was at least one problem, else False."""
3160 found = False
3161 bad_hosts = set()
3162 for title, sublines, hosts in self._find_problems():
3163 if not found:
3164 found = True
3165 print('\n\n.gitcookies problem report:\n')
3166 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003167 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003168 if sublines:
3169 print()
3170 print(' %s' % '\n '.join(sublines))
3171 print()
3172
3173 if bad_hosts:
3174 assert found
3175 print(' You can manually remove corresponding lines in your %s file and '
3176 'visit the following URLs with correct account to generate '
3177 'correct credential lines:\n' %
3178 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3179 print(' %s' % '\n '.join(sorted(set(
3180 gerrit_util.CookiesAuthenticator().get_new_password_url(
3181 self._canonical_git_googlesource_host(host))
3182 for host in bad_hosts
3183 ))))
3184 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003185
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003186
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003187@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003188def CMDcreds_check(parser, args):
3189 """Checks credentials and suggests changes."""
3190 _, _ = parser.parse_args(args)
3191
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003192 # Code below checks .gitcookies. Abort if using something else.
3193 authn = gerrit_util.Authenticator.get()
3194 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003195 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003196 'This command is not designed for bot environment. It checks '
3197 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003198 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3199 if isinstance(authn, gerrit_util.GceAuthenticator):
3200 message += (
3201 '\n'
3202 'If you need to run this on GCE or a cloudtop instance, '
3203 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3204 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003205
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003206 checker = _GitCookiesChecker()
3207 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003208
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003209 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003210 checker.print_current_creds(include_netrc=True)
3211
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003212 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003213 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003214 return 0
3215 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003216
3217
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003218@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003219def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003220 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003221 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003222 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003223 _, args = parser.parse_args(args)
3224 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003225 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003226 return RunGit(['config', 'branch.%s.base-url' % branch],
3227 error_ok=False).strip()
3228 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003229 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003230 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3231 error_ok=False).strip()
3232
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003233
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003234def color_for_status(status):
3235 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003236 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003237 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003238 'unsent': BOLD + Fore.YELLOW,
3239 'waiting': BOLD + Fore.RED,
3240 'reply': BOLD + Fore.YELLOW,
3241 'not lgtm': BOLD + Fore.RED,
3242 'lgtm': BOLD + Fore.GREEN,
3243 'commit': BOLD + Fore.MAGENTA,
3244 'closed': BOLD + Fore.CYAN,
3245 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003246 }.get(status, Fore.WHITE)
3247
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003248
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003249def get_cl_statuses(changes, fine_grained, max_processes=None):
3250 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003251
3252 If fine_grained is true, this will fetch CL statuses from the server.
3253 Otherwise, simply indicate if there's a matching url for the given branches.
3254
3255 If max_processes is specified, it is used as the maximum number of processes
3256 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3257 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003258
3259 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003260 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003261 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003262 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003263
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003264 if not fine_grained:
3265 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003266 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003267 for cl in changes:
3268 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003269 return
3270
3271 # First, sort out authentication issues.
3272 logging.debug('ensuring credentials exist')
3273 for cl in changes:
3274 cl.EnsureAuthenticated(force=False, refresh=True)
3275
3276 def fetch(cl):
3277 try:
3278 return (cl, cl.GetStatus())
3279 except:
3280 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003281 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003282 raise
3283
3284 threads_count = len(changes)
3285 if max_processes:
3286 threads_count = max(1, min(threads_count, max_processes))
3287 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3288
Edward Lemur61bf4172020-02-24 23:22:37 +00003289 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003290 fetched_cls = set()
3291 try:
3292 it = pool.imap_unordered(fetch, changes).__iter__()
3293 while True:
3294 try:
3295 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003296 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003297 break
3298 fetched_cls.add(cl)
3299 yield cl, status
3300 finally:
3301 pool.close()
3302
3303 # Add any branches that failed to fetch.
3304 for cl in set(changes) - fetched_cls:
3305 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003306
rmistry@google.com2dd99862015-06-22 12:22:18 +00003307
Jose Lopes3863fc52020-04-07 17:00:25 +00003308def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003309 """Uploads CLs of local branches that are dependents of the current branch.
3310
3311 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003312
3313 test1 -> test2.1 -> test3.1
3314 -> test3.2
3315 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003316
3317 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3318 run on the dependent branches in this order:
3319 test2.1, test3.1, test3.2, test2.2, test3.3
3320
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003321 Note: This function does not rebase your local dependent branches. Use it
3322 when you make a change to the parent branch that will not conflict
3323 with its dependent branches, and you would like their dependencies
3324 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003325 """
3326 if git_common.is_dirty_git_tree('upload-branch-deps'):
3327 return 1
3328
3329 root_branch = cl.GetBranch()
3330 if root_branch is None:
3331 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3332 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003333 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003334 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3335 'patchset dependencies without an uploaded CL.')
3336
3337 branches = RunGit(['for-each-ref',
3338 '--format=%(refname:short) %(upstream:short)',
3339 'refs/heads'])
3340 if not branches:
3341 print('No local branches found.')
3342 return 0
3343
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003344 # Create a dictionary of all local branches to the branches that are
3345 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003346 tracked_to_dependents = collections.defaultdict(list)
3347 for b in branches.splitlines():
3348 tokens = b.split()
3349 if len(tokens) == 2:
3350 branch_name, tracked = tokens
3351 tracked_to_dependents[tracked].append(branch_name)
3352
vapiera7fbd5a2016-06-16 09:17:49 -07003353 print()
3354 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003355 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003356
rmistry@google.com2dd99862015-06-22 12:22:18 +00003357 def traverse_dependents_preorder(branch, padding=''):
3358 dependents_to_process = tracked_to_dependents.get(branch, [])
3359 padding += ' '
3360 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003361 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003362 dependents.append(dependent)
3363 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003364
rmistry@google.com2dd99862015-06-22 12:22:18 +00003365 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003366 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003367
3368 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003369 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003370 return 0
3371
Jose Lopes3863fc52020-04-07 17:00:25 +00003372 if not force:
3373 confirm_or_exit('This command will checkout all dependent branches and run '
3374 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003375
rmistry@google.com2dd99862015-06-22 12:22:18 +00003376 # Record all dependents that failed to upload.
3377 failures = {}
3378 # Go through all dependents, checkout the branch and upload.
3379 try:
3380 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003381 print()
3382 print('--------------------------------------')
3383 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003384 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003385 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003386 try:
3387 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003388 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003389 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003390 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003391 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003392 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003393 finally:
3394 # Swap back to the original root branch.
3395 RunGit(['checkout', '-q', root_branch])
3396
vapiera7fbd5a2016-06-16 09:17:49 -07003397 print()
3398 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003399 for dependent_branch in dependents:
3400 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003401 print(' %s : %s' % (dependent_branch, upload_status))
3402 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003403
3404 return 0
3405
3406
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003407def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003408 """Given a proposed tag name, returns a tag name that is guaranteed to be
3409 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3410 or 'foo-3', and so on."""
3411
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003412 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003413 for suffix_num in itertools.count(1):
3414 if suffix_num == 1:
3415 to_check = proposed_tag
3416 else:
3417 to_check = '%s-%d' % (proposed_tag, suffix_num)
3418
3419 if to_check not in existing_tags:
3420 return to_check
3421
3422
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003423@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003424def CMDarchive(parser, args):
3425 """Archives and deletes branches associated with closed changelists."""
3426 parser.add_option(
3427 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003428 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003429 parser.add_option(
3430 '-f', '--force', action='store_true',
3431 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003432 parser.add_option(
3433 '-d', '--dry-run', action='store_true',
3434 help='Skip the branch tagging and removal steps.')
3435 parser.add_option(
3436 '-t', '--notags', action='store_true',
3437 help='Do not tag archived branches. '
3438 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003439 parser.add_option(
3440 '-p',
3441 '--pattern',
3442 default='git-cl-archived-{issue}-{branch}',
3443 help='Format string for archive tags. '
3444 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003445
kmarshall3bff56b2016-06-06 18:31:47 -07003446 options, args = parser.parse_args(args)
3447 if args:
3448 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003449
3450 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3451 if not branches:
3452 return 0
3453
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003454 tags = RunGit(['for-each-ref', '--format=%(refname)',
3455 'refs/tags']).splitlines() or []
3456 tags = [t.split('/')[-1] for t in tags]
3457
vapiera7fbd5a2016-06-16 09:17:49 -07003458 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003459 changes = [Changelist(branchref=b)
3460 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003461 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3462 statuses = get_cl_statuses(changes,
3463 fine_grained=True,
3464 max_processes=options.maxjobs)
3465 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003466 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3467 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003468 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003469 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003470 proposal.sort()
3471
3472 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003473 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003474 return 0
3475
Edward Lemur85153282020-02-14 22:06:29 +00003476 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003477
vapiera7fbd5a2016-06-16 09:17:49 -07003478 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003479 if options.notags:
3480 for next_item in proposal:
3481 print(' ' + next_item[0])
3482 else:
3483 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3484 for next_item in proposal:
3485 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003486
kmarshall9249e012016-08-23 12:02:16 -07003487 # Quit now on precondition failure or if instructed by the user, either
3488 # via an interactive prompt or by command line flags.
3489 if options.dry_run:
3490 print('\nNo changes were made (dry run).\n')
3491 return 0
3492 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003493 print('You are currently on a branch \'%s\' which is associated with a '
3494 'closed codereview issue, so archive cannot proceed. Please '
3495 'checkout another branch and run this command again.' %
3496 current_branch)
3497 return 1
kmarshall9249e012016-08-23 12:02:16 -07003498 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003499 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003500 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003501 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003502 return 1
3503
3504 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003505 if not options.notags:
3506 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003507
3508 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3509 # Clean up the tag if we failed to delete the branch.
3510 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003511
vapiera7fbd5a2016-06-16 09:17:49 -07003512 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003513
3514 return 0
3515
3516
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003517@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003518def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003519 """Show status of changelists.
3520
3521 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003522 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003523 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003524 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003525 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003526 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003527 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003528 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003529
3530 Also see 'git cl comments'.
3531 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003532 parser.add_option(
3533 '--no-branch-color',
3534 action='store_true',
3535 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003536 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003537 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003538 parser.add_option('-f', '--fast', action='store_true',
3539 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003540 parser.add_option(
3541 '-j', '--maxjobs', action='store', type=int,
3542 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003543 parser.add_option(
3544 '-i', '--issue', type=int,
3545 help='Operate on this issue instead of the current branch\'s implicit '
3546 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003547 parser.add_option('-d',
3548 '--date-order',
3549 action='store_true',
3550 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003551 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003552 if args:
3553 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003554
iannuccie53c9352016-08-17 14:40:40 -07003555 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003556 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003557
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003558 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003559 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003560 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003561 if cl.GetIssue():
3562 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003563 elif options.field == 'id':
3564 issueid = cl.GetIssue()
3565 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003567 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003568 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003569 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003570 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003571 elif options.field == 'status':
3572 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003573 elif options.field == 'url':
3574 url = cl.GetIssueURL()
3575 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003576 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003577 return 0
3578
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003579 branches = RunGit([
3580 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3581 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003582 if not branches:
3583 print('No local branch found.')
3584 return 0
3585
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003586 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003587 Changelist(branchref=b, commit_date=ct)
3588 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3589 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003590 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003591 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003592 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003593 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003594
Edward Lemur85153282020-02-14 22:06:29 +00003595 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003596
3597 def FormatBranchName(branch, colorize=False):
3598 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3599 an asterisk when it is the current branch."""
3600
3601 asterisk = ""
3602 color = Fore.RESET
3603 if branch == current_branch:
3604 asterisk = "* "
3605 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003606 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003607
3608 if colorize:
3609 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003610 return asterisk + branch_name
3611
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003612 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003613
3614 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003615 if options.date_order:
3616 sorted_changes = sorted(changes,
3617 key=lambda c: c.GetCommitDate(),
3618 reverse=True)
3619 else:
3620 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3621 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003622 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003623 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003624 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003625 branch_statuses[c.GetBranch()] = status
3626 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003627 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003628 if url and (not status or status == 'error'):
3629 # The issue probably doesn't exist anymore.
3630 url += ' (broken)'
3631
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003632 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003633 # Turn off bold as well as colors.
3634 END = '\033[0m'
3635 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003636 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003637 color = ''
3638 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003639 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003640
Alan Cuttera3be9a52019-03-04 18:50:33 +00003641 branch_display = FormatBranchName(branch)
3642 padding = ' ' * (alignment - len(branch_display))
3643 if not options.no_branch_color:
3644 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003645
Alan Cuttera3be9a52019-03-04 18:50:33 +00003646 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3647 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003648
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003650 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003651 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003652 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003653 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003654 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003655 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003656 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003657 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003658 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003659 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003660 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003661 return 0
3662
3663
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003664def colorize_CMDstatus_doc():
3665 """To be called once in main() to add colors to git cl status help."""
3666 colors = [i for i in dir(Fore) if i[0].isupper()]
3667
3668 def colorize_line(line):
3669 for color in colors:
3670 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003671 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003672 indent = len(line) - len(line.lstrip(' ')) + 1
3673 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3674 return line
3675
3676 lines = CMDstatus.__doc__.splitlines()
3677 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3678
3679
phajdan.jre328cf92016-08-22 04:12:17 -07003680def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003681 if path == '-':
3682 json.dump(contents, sys.stdout)
3683 else:
3684 with open(path, 'w') as f:
3685 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003686
3687
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003688@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003689@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003690def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003691 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003692
3693 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003694 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003695 parser.add_option('-r', '--reverse', action='store_true',
3696 help='Lookup the branch(es) for the specified issues. If '
3697 'no issues are specified, all branches with mapped '
3698 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003699 parser.add_option('--json',
3700 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003701 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003702
dnj@chromium.org406c4402015-03-03 17:22:28 +00003703 if options.reverse:
3704 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003705 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003706 # Reverse issue lookup.
3707 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003708
3709 git_config = {}
3710 for config in RunGit(['config', '--get-regexp',
3711 r'branch\..*issue']).splitlines():
3712 name, _space, val = config.partition(' ')
3713 git_config[name] = val
3714
dnj@chromium.org406c4402015-03-03 17:22:28 +00003715 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003716 issue = git_config.get(
3717 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003718 if issue:
3719 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003720 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003721 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003722 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003723 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003724 try:
3725 issue_num = int(issue)
3726 except ValueError:
3727 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003728 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003729 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003730 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003731 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003732 if options.json:
3733 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003734 return 0
3735
3736 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003737 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003738 if not issue.valid:
3739 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3740 'or no argument to list it.\n'
3741 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003742 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003743 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003744 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003745 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003746 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3747 if options.json:
3748 write_json(options.json, {
3749 'issue': cl.GetIssue(),
3750 'issue_url': cl.GetIssueURL(),
3751 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003752 return 0
3753
3754
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003755@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003756def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003757 """Shows or posts review comments for any changelist."""
3758 parser.add_option('-a', '--add-comment', dest='comment',
3759 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003760 parser.add_option('-p', '--publish', action='store_true',
3761 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003762 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003763 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003764 parser.add_option('-m', '--machine-readable', dest='readable',
3765 action='store_false', default=True,
3766 help='output comments in a format compatible with '
3767 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003768 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003769 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003770 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003771
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003772 issue = None
3773 if options.issue:
3774 try:
3775 issue = int(options.issue)
3776 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003777 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003778
Edward Lemur934836a2019-09-09 20:16:54 +00003779 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003780
3781 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003782 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003783 return 0
3784
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003785 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3786 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003787 for comment in summary:
3788 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003789 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003790 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003791 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003792 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003793 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003794 elif comment.autogenerated:
3795 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003796 else:
3797 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003798 print('\n%s%s %s%s\n%s' % (
3799 color,
3800 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3801 comment.sender,
3802 Fore.RESET,
3803 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3804
smut@google.comc85ac942015-09-15 16:34:43 +00003805 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003806 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003807 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003808 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3809 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003810 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003811 return 0
3812
3813
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003814@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003815@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003816def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003817 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003818 parser.add_option('-d', '--display', action='store_true',
3819 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003820 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003821 help='New description to set for this issue (- for stdin, '
3822 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003823 parser.add_option('-f', '--force', action='store_true',
3824 help='Delete any unpublished Gerrit edits for this issue '
3825 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003826
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003827 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003828
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003829 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003830 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003831 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003832 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003833 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003834
Edward Lemur934836a2019-09-09 20:16:54 +00003835 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003836 if target_issue_arg:
3837 kwargs['issue'] = target_issue_arg.issue
3838 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003839
3840 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003841 if not cl.GetIssue():
3842 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003843
Edward Lemur678a6842019-10-03 22:25:05 +00003844 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003845 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003846
Edward Lemur6c6827c2020-02-06 21:15:18 +00003847 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003848
smut@google.com34fb6b12015-07-13 20:03:26 +00003849 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003850 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003851 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003852
3853 if options.new_description:
3854 text = options.new_description
3855 if text == '-':
3856 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003857 elif text == '+':
3858 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003859 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003860
3861 description.set_description(text)
3862 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003863 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003864 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003865 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003866 return 0
3867
3868
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003869@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003870def CMDlint(parser, args):
3871 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003872 parser.add_option('--filter', action='append', metavar='-x,+y',
3873 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003874 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003875
3876 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003877 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003878 try:
3879 import cpplint
3880 import cpplint_chromium
3881 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003882 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003883 return 1
3884
3885 # Change the current working directory before calling lint so that it
3886 # shows the correct base.
3887 previous_cwd = os.getcwd()
3888 os.chdir(settings.GetRoot())
3889 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003890 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003891 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003892 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003894 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003895
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003896 # Process cpplint arguments, if any.
3897 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3898 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003899 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003900
Lei Zhang379d1ad2020-07-15 19:40:06 +00003901 include_regex = re.compile(settings.GetLintRegex())
3902 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003903 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3904 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003905 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003906 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003907 continue
3908
3909 if ignore_regex.match(filename):
3910 print('Ignoring file %s' % filename)
3911 continue
3912
3913 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3914 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003915 finally:
3916 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003917 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003918 if cpplint._cpplint_state.error_count != 0:
3919 return 1
3920 return 0
3921
3922
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003923@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003924def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003925 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003926 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003927 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003928 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003929 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003930 parser.add_option('--all', action='store_true',
3931 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003932 parser.add_option('--parallel', action='store_true',
3933 help='Run all tests specified by input_api.RunTests in all '
3934 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003935 parser.add_option('--resultdb', action='store_true',
3936 help='Run presubmit checks in the ResultSink environment '
3937 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003938 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003939 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003940
sbc@chromium.org71437c02015-04-09 19:29:40 +00003941 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003942 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003943 return 1
3944
Edward Lemur934836a2019-09-09 20:16:54 +00003945 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003946 if args:
3947 base_branch = args[0]
3948 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003949 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003950 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003951
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003952 if cl.GetIssue():
3953 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003954 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003955 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003956
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003957 cl.RunHook(
3958 committing=not options.upload,
3959 may_prompt=False,
3960 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003961 parallel=options.parallel,
3962 upstream=base_branch,
3963 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003964 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003965 resultdb=options.resultdb,
3966 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003967 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003968
3969
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003970def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003971 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003972
3973 Works the same way as
3974 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3975 but can be called on demand on all platforms.
3976
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003977 The basic idea is to generate git hash of a state of the tree, original
3978 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003979 """
3980 lines = []
3981 tree_hash = RunGitSilent(['write-tree'])
3982 lines.append('tree %s' % tree_hash.strip())
3983 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3984 if code == 0:
3985 lines.append('parent %s' % parent.strip())
3986 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3987 lines.append('author %s' % author.strip())
3988 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3989 lines.append('committer %s' % committer.strip())
3990 lines.append('')
3991 # Note: Gerrit's commit-hook actually cleans message of some lines and
3992 # whitespace. This code is not doing this, but it clearly won't decrease
3993 # entropy.
3994 lines.append(message)
3995 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003996 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003997 return 'I%s' % change_hash.strip()
3998
3999
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004000def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004001 """Computes the remote branch ref to use for the CL.
4002
4003 Args:
4004 remote (str): The git remote for the CL.
4005 remote_branch (str): The git remote branch for the CL.
4006 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004007 """
4008 if not (remote and remote_branch):
4009 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004010
wittman@chromium.org455dc922015-01-26 20:15:50 +00004011 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004012 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004013 # refs, which are then translated into the remote full symbolic refs
4014 # below.
4015 if '/' not in target_branch:
4016 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4017 else:
4018 prefix_replacements = (
4019 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4020 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4021 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4022 )
4023 match = None
4024 for regex, replacement in prefix_replacements:
4025 match = re.search(regex, target_branch)
4026 if match:
4027 remote_branch = target_branch.replace(match.group(0), replacement)
4028 break
4029 if not match:
4030 # This is a branch path but not one we recognize; use as-is.
4031 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004032 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4033 # Handle the refs that need to land in different refs.
4034 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004035
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004036 # Migration to new default branch, only if available on remote.
4037 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4038 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4039 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4040 stderr=subprocess2.PIPE):
4041 # TODO(crbug.com/ID): Print location to local git migration script.
4042 print("WARNING: Using new branch name %s instead of %s" % (
4043 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4044 remote_branch = DEFAULT_NEW_BRANCH
4045
wittman@chromium.org455dc922015-01-26 20:15:50 +00004046 # Create the true path to the remote branch.
4047 # Does the following translation:
4048 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004049 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004050 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4051 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4052 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4053 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4054 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4055 'refs/heads/')
4056 elif remote_branch.startswith('refs/remotes/branch-heads'):
4057 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004058
wittman@chromium.org455dc922015-01-26 20:15:50 +00004059 return remote_branch
4060
4061
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004062def cleanup_list(l):
4063 """Fixes a list so that comma separated items are put as individual items.
4064
4065 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4066 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4067 """
4068 items = sum((i.split(',') for i in l), [])
4069 stripped_items = (i.strip() for i in items)
4070 return sorted(filter(None, stripped_items))
4071
4072
Aaron Gable4db38df2017-11-03 14:59:07 -07004073@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004074@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004075def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004076 """Uploads the current changelist to codereview.
4077
4078 Can skip dependency patchset uploads for a branch by running:
4079 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004080 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004081 git config --unset branch.branch_name.skip-deps-uploads
4082 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004083
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004084 If the name of the checked out branch starts with "bug-" or "fix-" followed
4085 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004086 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004087
4088 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004089 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004090 [git-cl] add support for hashtags
4091 Foo bar: implement foo
4092 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004093 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004094 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4095 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004096 parser.add_option('--bypass-watchlists', action='store_true',
4097 dest='bypass_watchlists',
4098 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004099 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004100 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004101 parser.add_option('--message', '-m', dest='message',
4102 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004103 parser.add_option('-b', '--bug',
4104 help='pre-populate the bug number(s) for this issue. '
4105 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004106 parser.add_option('--message-file', dest='message_file',
4107 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004108 parser.add_option('--title', '-t', dest='title',
4109 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004110 parser.add_option('-T', '--skip-title', action='store_true',
4111 dest='skip_title',
4112 help='Use the most recent commit message as the title of '
4113 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004114 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004115 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004116 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004117 parser.add_option('--tbrs',
4118 action='append', default=[],
4119 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004120 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004121 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004122 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004123 parser.add_option('--hashtag', dest='hashtags',
4124 action='append', default=[],
4125 help=('Gerrit hashtag for new CL; '
4126 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004127 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004128 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004129 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004130 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004131 metavar='TARGET',
4132 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004133 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004134 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004135 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004136 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004137 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004138 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004139 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004140 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4141 const='TBR', help='add a set of OWNERS to TBR')
4142 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4143 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004144 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004145 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004146 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004147 'implies --send-mail')
4148 parser.add_option('-d', '--cq-dry-run',
4149 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004150 help='Send the patchset to do a CQ dry run right after '
4151 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004152 parser.add_option('--set-bot-commit', action='store_true',
4153 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004154 parser.add_option('--preserve-tryjobs', action='store_true',
4155 help='instruct the CQ to let tryjobs running even after '
4156 'new patchsets are uploaded instead of canceling '
4157 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004158 parser.add_option('--dependencies', action='store_true',
4159 help='Uploads CLs of all the local branches that depend on '
4160 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004161 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4162 help='Sends your change to the CQ after an approval. Only '
4163 'works on repos that have the Auto-Submit label '
4164 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004165 parser.add_option('--parallel', action='store_true',
4166 help='Run all tests specified by input_api.RunTests in all '
4167 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004168 parser.add_option('--no-autocc', action='store_true',
4169 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004170 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004171 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004172 parser.add_option('-R', '--retry-failed', action='store_true',
4173 help='Retry failed tryjobs from old patchset immediately '
4174 'after uploading new patchset. Cannot be used with '
4175 '--use-commit-queue or --cq-dry-run.')
4176 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4177 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004178 parser.add_option('--fixed', '-x',
4179 help='List of bugs that will be commented on and marked '
4180 'fixed (pre-populates "Fixed:" tag). Same format as '
4181 '-b option / "Bug:" tag. If fixing several issues, '
4182 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004183 parser.add_option('--edit-description', action='store_true', default=False,
4184 help='Modify description before upload. Cannot be used '
4185 'with --force. It is a noop when --no-squash is set '
4186 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004187 parser.add_option('--git-completion-helper', action="store_true",
4188 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004189 parser.add_option('--resultdb', action='store_true',
4190 help='Run presubmit checks in the ResultSink environment '
4191 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004192 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004193
rmistry@google.com2dd99862015-06-22 12:22:18 +00004194 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004195 (options, args) = parser.parse_args(args)
4196
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004197 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004198 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4199 if opt.help != optparse.SUPPRESS_HELP))
4200 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004201
sbc@chromium.org71437c02015-04-09 19:29:40 +00004202 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004203 return 1
4204
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004205 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004206 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004207 options.cc = cleanup_list(options.cc)
4208
Josipe827b0f2020-01-30 00:07:20 +00004209 if options.edit_description and options.force:
4210 parser.error('Only one of --force and --edit-description allowed')
4211
tandriib80458a2016-06-23 12:20:07 -07004212 if options.message_file:
4213 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004214 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004215 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004216
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004217 if ([options.cq_dry_run,
4218 options.use_commit_queue,
4219 options.retry_failed].count(True) > 1):
4220 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4221 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004222
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004223 if options.skip_title and options.title:
4224 parser.error('Only one of --title and --skip-title allowed.')
4225
Aaron Gableedbc4132017-09-11 13:22:28 -07004226 if options.use_commit_queue:
4227 options.send_mail = True
4228
Edward Lesmes0dd54822020-03-26 18:24:25 +00004229 if options.squash is None:
4230 # Load default for user, repo, squash=true, in this order.
4231 options.squash = settings.GetSquashGerritUploads()
4232
Edward Lemur934836a2019-09-09 20:16:54 +00004233 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004234 # Warm change details cache now to avoid RPCs later, reducing latency for
4235 # developers.
4236 if cl.GetIssue():
4237 cl._GetChangeDetail(
4238 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4239
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004240 if options.retry_failed and not cl.GetIssue():
4241 print('No previous patchsets, so --retry-failed has no effect.')
4242 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004243
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004244 # cl.GetMostRecentPatchset uses cached information, and can return the last
4245 # patchset before upload. Calling it here makes it clear that it's the
4246 # last patchset before upload. Note that GetMostRecentPatchset will fail
4247 # if no CL has been uploaded yet.
4248 if options.retry_failed:
4249 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004250
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004251 ret = cl.CMDUpload(options, args, orig_args)
4252
4253 if options.retry_failed:
4254 if ret != 0:
4255 print('Upload failed, so --retry-failed has no effect.')
4256 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004257 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004258 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004259 jobs = _filter_failed_for_retry(builds)
4260 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004261 print('No failed tryjobs, so --retry-failed has no effect.')
4262 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004263 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004264
4265 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004266
4267
Francois Dorayd42c6812017-05-30 15:10:20 -04004268@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004269@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004270def CMDsplit(parser, args):
4271 """Splits a branch into smaller branches and uploads CLs.
4272
4273 Creates a branch and uploads a CL for each group of files modified in the
4274 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004275 comment, the string '$directory', is replaced with the directory containing
4276 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004277 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004278 parser.add_option('-d', '--description', dest='description_file',
4279 help='A text file containing a CL description in which '
4280 '$directory will be replaced by each CL\'s directory.')
4281 parser.add_option('-c', '--comment', dest='comment_file',
4282 help='A text file containing a CL comment.')
4283 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004284 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004285 help='List the files and reviewers for each CL that would '
4286 'be created, but don\'t create branches or CLs.')
4287 parser.add_option('--cq-dry-run', action='store_true',
4288 help='If set, will do a cq dry run for each uploaded CL. '
4289 'Please be careful when doing this; more than ~10 CLs '
4290 'has the potential to overload our build '
4291 'infrastructure. Try to upload these not during high '
4292 'load times (usually 11-3 Mountain View time). Email '
4293 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004294 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4295 default=True,
4296 help='Sends your change to the CQ after an approval. Only '
4297 'works on repos that have the Auto-Submit label '
4298 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004299 options, _ = parser.parse_args(args)
4300
4301 if not options.description_file:
4302 parser.error('No --description flag specified.')
4303
4304 def WrappedCMDupload(args):
4305 return CMDupload(OptionParser(), args)
4306
Edward Lemur2c62b332020-03-12 22:12:33 +00004307 return split_cl.SplitCl(
4308 options.description_file, options.comment_file, Changelist,
4309 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4310 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004311
4312
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004313@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004314@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004315def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004316 """DEPRECATED: Used to commit the current changelist via git-svn."""
4317 message = ('git-cl no longer supports committing to SVN repositories via '
4318 'git-svn. You probably want to use `git cl land` instead.')
4319 print(message)
4320 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004321
4322
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004323@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004324@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004325def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004326 """Commits the current changelist via git.
4327
4328 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4329 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004330 """
4331 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4332 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004333 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004334 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004335 parser.add_option('--parallel', action='store_true',
4336 help='Run all tests specified by input_api.RunTests in all '
4337 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004338 parser.add_option('--resultdb', action='store_true',
4339 help='Run presubmit checks in the ResultSink environment '
4340 'and send results to the ResultDB database.')
4341 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004342 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004343
Edward Lemur934836a2019-09-09 20:16:54 +00004344 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004345
Robert Iannucci2e73d432018-03-14 01:10:47 -07004346 if not cl.GetIssue():
4347 DieWithError('You must upload the change first to Gerrit.\n'
4348 ' If you would rather have `git cl land` upload '
4349 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004350 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4351 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352
4353
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004354@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004355@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004356def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004357 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004358 parser.add_option('-b', dest='newbranch',
4359 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004360 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004361 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004362 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004363 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004364
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004365 group = optparse.OptionGroup(
4366 parser,
4367 'Options for continuing work on the current issue uploaded from a '
4368 'different clone (e.g. different machine). Must be used independently '
4369 'from the other options. No issue number should be specified, and the '
4370 'branch must have an issue number associated with it')
4371 group.add_option('--reapply', action='store_true', dest='reapply',
4372 help='Reset the branch and reapply the issue.\n'
4373 'CAUTION: This will undo any local changes in this '
4374 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004375
4376 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004377 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004378 parser.add_option_group(group)
4379
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004380 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004381
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004382 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004383 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004384 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004385 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004386 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004387
Edward Lemur934836a2019-09-09 20:16:54 +00004388 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004389 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004390 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004391
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004392 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004393 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004394 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004395
4396 RunGit(['reset', '--hard', upstream])
4397 if options.pull:
4398 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004399
Edward Lemur678a6842019-10-03 22:25:05 +00004400 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004401 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4402 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004403
4404 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004405 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004406
Edward Lemurf38bc172019-09-03 21:02:13 +00004407 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004408 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004409 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004410
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004411 # We don't want uncommitted changes mixed up with the patch.
4412 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004413 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004414
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004415 if options.newbranch:
4416 if options.force:
4417 RunGit(['branch', '-D', options.newbranch],
4418 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004419 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004420
Edward Lemur678a6842019-10-03 22:25:05 +00004421 cl = Changelist(
4422 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004423
Edward Lemur678a6842019-10-03 22:25:05 +00004424 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004425 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004426
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004427 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4428 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004429
4430
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004431def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004432 """Fetches the tree status and returns either 'open', 'closed',
4433 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004434 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004436 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 if status.find('closed') != -1 or status == '0':
4438 return 'closed'
4439 elif status.find('open') != -1 or status == '1':
4440 return 'open'
4441 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004442 return 'unset'
4443
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004444
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004445def GetTreeStatusReason():
4446 """Fetches the tree status from a json url and returns the message
4447 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004448 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004449 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004450 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451 status = json.loads(connection.read())
4452 connection.close()
4453 return status['message']
4454
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004455
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004456@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004457def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004458 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004459 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460 status = GetTreeStatus()
4461 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004462 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004463 return 2
4464
vapiera7fbd5a2016-06-16 09:17:49 -07004465 print('The tree is %s' % status)
4466 print()
4467 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468 if status != 'open':
4469 return 1
4470 return 0
4471
4472
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004473@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004474def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004475 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4476 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004477 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004478 '-b', '--bot', action='append',
4479 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4480 'times to specify multiple builders. ex: '
4481 '"-b win_rel -b win_layout". See '
4482 'the try server waterfall for the builders name and the tests '
4483 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004484 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004485 '-B', '--bucket', default='',
4486 help=('Buildbucket bucket to send the try requests.'))
4487 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004488 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004489 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004490 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004491 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004492 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004493 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004494 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004495 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004496 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004497 '--category', default='git_cl_try', help='Specify custom build category.')
4498 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004499 '--project',
4500 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004501 'in recipe to determine to which repository or directory to '
4502 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004503 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004504 '-p', '--property', dest='properties', action='append', default=[],
4505 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004506 'key2=value2 etc. The value will be treated as '
4507 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004508 'NOTE: using this may make your tryjob not usable for CQ, '
4509 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004510 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004511 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4512 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004513 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004514 parser.add_option(
4515 '-R', '--retry-failed', action='store_true', default=False,
4516 help='Retry failed jobs from the latest set of tryjobs. '
4517 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004518 parser.add_option(
4519 '-i', '--issue', type=int,
4520 help='Operate on this issue instead of the current branch\'s implicit '
4521 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004522 options, args = parser.parse_args(args)
4523
machenbach@chromium.org45453142015-09-15 08:45:22 +00004524 # Make sure that all properties are prop=value pairs.
4525 bad_params = [x for x in options.properties if '=' not in x]
4526 if bad_params:
4527 parser.error('Got properties with missing "=": %s' % bad_params)
4528
maruel@chromium.org15192402012-09-06 12:38:29 +00004529 if args:
4530 parser.error('Unknown arguments: %s' % args)
4531
Edward Lemur934836a2019-09-09 20:16:54 +00004532 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004533 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004534 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004535
Edward Lemurf38bc172019-09-03 21:02:13 +00004536 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004537 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004538
tandriie113dfd2016-10-11 10:20:12 -07004539 error_message = cl.CannotTriggerTryJobReason()
4540 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004541 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004542
Edward Lemur45768512020-03-02 19:03:14 +00004543 if options.bot:
4544 if options.retry_failed:
4545 parser.error('--bot is not compatible with --retry-failed.')
4546 if not options.bucket:
4547 parser.error('A bucket (e.g. "chromium/try") is required.')
4548
4549 triggered = [b for b in options.bot if 'triggered' in b]
4550 if triggered:
4551 parser.error(
4552 'Cannot schedule builds on triggered bots: %s.\n'
4553 'This type of bot requires an initial job from a parent (usually a '
4554 'builder). Schedule a job on the parent instead.\n' % triggered)
4555
4556 if options.bucket.startswith('.master'):
4557 parser.error('Buildbot masters are not supported.')
4558
4559 project, bucket = _parse_bucket(options.bucket)
4560 if project is None or bucket is None:
4561 parser.error('Invalid bucket: %s.' % options.bucket)
4562 jobs = sorted((project, bucket, bot) for bot in options.bot)
4563 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004564 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004565 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004566 if options.verbose:
4567 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004568 jobs = _filter_failed_for_retry(builds)
4569 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004570 print('There are no failed jobs in the latest set of jobs '
4571 '(patchset #%d), doing nothing.' % patchset)
4572 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004573 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004574 if num_builders > 10:
4575 confirm_or_exit('There are %d builders with failed builds.'
4576 % num_builders, action='continue')
4577 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004578 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004579 print('git cl try with no bots now defaults to CQ dry run.')
4580 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4581 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004582
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004583 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004584 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004585 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004586 except BuildbucketResponseException as ex:
4587 print('ERROR: %s' % ex)
4588 return 1
4589 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004590
4591
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004592@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004593def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004594 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004595 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004596 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004597 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004598 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004599 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004600 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004601 '--color', action='store_true', default=setup_color.IS_TTY,
4602 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004603 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004604 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4605 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004606 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004607 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004608 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004609 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004610 parser.add_option(
4611 '-i', '--issue', type=int,
4612 help='Operate on this issue instead of the current branch\'s implicit '
4613 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004614 options, args = parser.parse_args(args)
4615 if args:
4616 parser.error('Unrecognized args: %s' % ' '.join(args))
4617
Edward Lemur934836a2019-09-09 20:16:54 +00004618 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004619 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004620 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004621
tandrii221ab252016-10-06 08:12:04 -07004622 patchset = options.patchset
4623 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004624 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004625 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004626 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004627 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004628 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004629 cl.GetIssue())
4630
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004631 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004632 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004633 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004634 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004635 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004636 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004637 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004638 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004639 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004640 return 0
4641
4642
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004643@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004644@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004645def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004646 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004647 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004648 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004649 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004650
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004651 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004652 if args:
4653 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004654 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004655 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004656 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004657 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004658
4659 # Clear configured merge-base, if there is one.
4660 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004661 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004662 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004663 return 0
4664
4665
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004666@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004667def CMDweb(parser, args):
4668 """Opens the current CL in the web browser."""
4669 _, args = parser.parse_args(args)
4670 if args:
4671 parser.error('Unrecognized args: %s' % ' '.join(args))
4672
4673 issue_url = Changelist().GetIssueURL()
4674 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004675 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004676 return 1
4677
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004678 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004679 # allows us to hide the "Created new window in existing browser session."
4680 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004681 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004682 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004683 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004684 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004685 os.open(os.devnull, os.O_RDWR)
4686 try:
4687 webbrowser.open(issue_url)
4688 finally:
4689 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004690 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004691 return 0
4692
4693
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004694@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004695def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004696 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004697 parser.add_option('-d', '--dry-run', action='store_true',
4698 help='trigger in dry run mode')
4699 parser.add_option('-c', '--clear', action='store_true',
4700 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004701 parser.add_option(
4702 '-i', '--issue', type=int,
4703 help='Operate on this issue instead of the current branch\'s implicit '
4704 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004705 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004706 if args:
4707 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004708 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004709 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004710
Edward Lemur934836a2019-09-09 20:16:54 +00004711 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004712 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004713 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004714 elif options.dry_run:
4715 state = _CQState.DRY_RUN
4716 else:
4717 state = _CQState.COMMIT
4718 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004719 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004720 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004721 return 0
4722
4723
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004724@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004725def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004726 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004727 parser.add_option(
4728 '-i', '--issue', type=int,
4729 help='Operate on this issue instead of the current branch\'s implicit '
4730 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004731 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004732 if args:
4733 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004734 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004735 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004736 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004737 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004738 cl.CloseIssue()
4739 return 0
4740
4741
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004742@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004743def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004744 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004745 parser.add_option(
4746 '--stat',
4747 action='store_true',
4748 dest='stat',
4749 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004750 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004751 if args:
4752 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004753
Edward Lemur934836a2019-09-09 20:16:54 +00004754 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004755 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004756 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004757 if not issue:
4758 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004759
Aaron Gablea718c3e2017-08-28 17:47:28 -07004760 base = cl._GitGetBranchConfigValue('last-upload-hash')
4761 if not base:
4762 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4763 if not base:
4764 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4765 revision_info = detail['revisions'][detail['current_revision']]
4766 fetch_info = revision_info['fetch']['http']
4767 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4768 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004769
Aaron Gablea718c3e2017-08-28 17:47:28 -07004770 cmd = ['git', 'diff']
4771 if options.stat:
4772 cmd.append('--stat')
4773 cmd.append(base)
4774 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004775
4776 return 0
4777
4778
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004779@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004780def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004781 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004782 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004783 '--ignore-current',
4784 action='store_true',
4785 help='Ignore the CL\'s current reviewers and start from scratch.')
4786 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004787 '--ignore-self',
4788 action='store_true',
4789 help='Do not consider CL\'s author as an owners.')
4790 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004791 '--no-color',
4792 action='store_true',
4793 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004794 parser.add_option(
4795 '--batch',
4796 action='store_true',
4797 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004798 # TODO: Consider moving this to another command, since other
4799 # git-cl owners commands deal with owners for a given CL.
4800 parser.add_option(
4801 '--show-all',
4802 action='store_true',
4803 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004804 options, args = parser.parse_args(args)
4805
Edward Lemur934836a2019-09-09 20:16:54 +00004806 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004807 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004808
Yang Guo6e269a02019-06-26 11:17:02 +00004809 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004810 if len(args) == 0:
4811 print('No files specified for --show-all. Nothing to do.')
4812 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004813 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004814 for path in args:
4815 print('Owners for %s:' % path)
4816 print('\n'.join(
4817 ' - %s' % owner
4818 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004819 return 0
4820
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004821 if args:
4822 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004823 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004824 base_branch = args[0]
4825 else:
4826 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004827 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004828
Edward Lemur2c62b332020-03-12 22:12:33 +00004829 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004830
4831 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004832 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
4833 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07004834 return 0
4835
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004836 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004837 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01004838 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004839 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00004840 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004841 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004842 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004843
4844
Aiden Bennerc08566e2018-10-03 17:52:42 +00004845def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004846 """Generates a diff command."""
4847 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004848 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4849
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004850 if allow_prefix:
4851 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4852 # case that diff.noprefix is set in the user's git config.
4853 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4854 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004855 diff_cmd += ['--no-prefix']
4856
4857 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004858
4859 if args:
4860 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004861 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004862 diff_cmd.append(arg)
4863 else:
4864 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004865
4866 return diff_cmd
4867
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004868
Jamie Madill5e96ad12020-01-13 16:08:35 +00004869def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4870 """Runs clang-format-diff and sets a return value if necessary."""
4871
4872 if not clang_diff_files:
4873 return 0
4874
4875 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4876 # formatted. This is used to block during the presubmit.
4877 return_value = 0
4878
4879 # Locate the clang-format binary in the checkout
4880 try:
4881 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4882 except clang_format.NotFoundError as e:
4883 DieWithError(e)
4884
4885 if opts.full or settings.GetFormatFullByDefault():
4886 cmd = [clang_format_tool]
4887 if not opts.dry_run and not opts.diff:
4888 cmd.append('-i')
4889 if opts.dry_run:
4890 for diff_file in clang_diff_files:
4891 with open(diff_file, 'r') as myfile:
4892 code = myfile.read().replace('\r\n', '\n')
4893 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4894 stdout = stdout.replace('\r\n', '\n')
4895 if opts.diff:
4896 sys.stdout.write(stdout)
4897 if code != stdout:
4898 return_value = 2
4899 else:
4900 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4901 if opts.diff:
4902 sys.stdout.write(stdout)
4903 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004904 try:
4905 script = clang_format.FindClangFormatScriptInChromiumTree(
4906 'clang-format-diff.py')
4907 except clang_format.NotFoundError as e:
4908 DieWithError(e)
4909
Edward Lesmes89624cd2020-04-06 17:51:56 +00004910 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004911 if not opts.dry_run and not opts.diff:
4912 cmd.append('-i')
4913
4914 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004915 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004916
Edward Lesmes89624cd2020-04-06 17:51:56 +00004917 env = os.environ.copy()
4918 env['PATH'] = (
4919 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4920 stdout = RunCommand(
4921 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004922 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004923 if opts.diff:
4924 sys.stdout.write(stdout)
4925 if opts.dry_run and len(stdout) > 0:
4926 return_value = 2
4927
4928 return return_value
4929
4930
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004931def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004932 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004933 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004934
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004935
enne@chromium.org555cfe42014-01-29 18:21:39 +00004936@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004937@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004938def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004939 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004940 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004941 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004942 parser.add_option('--full', action='store_true',
4943 help='Reformat the full content of all touched files')
4944 parser.add_option('--dry-run', action='store_true',
4945 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004946 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004947 '--no-clang-format',
4948 dest='clang_format',
4949 action='store_false',
4950 default=True,
4951 help='Disables formatting of various file types using clang-format.')
4952 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004953 '--python',
4954 action='store_true',
4955 default=None,
4956 help='Enables python formatting on all python files.')
4957 parser.add_option(
4958 '--no-python',
4959 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004960 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004961 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004962 'If neither --python or --no-python are set, python files that have a '
4963 '.style.yapf file in an ancestor directory will be formatted. '
4964 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004965 parser.add_option(
4966 '--js',
4967 action='store_true',
4968 help='Format javascript code with clang-format. '
4969 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004970 parser.add_option('--diff', action='store_true',
4971 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004972 parser.add_option('--presubmit', action='store_true',
4973 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004974 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004975
Garrett Beaty91a6f332020-01-06 16:57:24 +00004976 if opts.python is not None and opts.no_python:
4977 raise parser.error('Cannot set both --python and --no-python')
4978 if opts.no_python:
4979 opts.python = False
4980
Daniel Chengc55eecf2016-12-30 03:11:02 -08004981 # Normalize any remaining args against the current path, so paths relative to
4982 # the current directory are still resolved as expected.
4983 args = [os.path.join(os.getcwd(), arg) for arg in args]
4984
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004985 # git diff generates paths against the root of the repository. Change
4986 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004987 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004988 if rel_base_path:
4989 os.chdir(rel_base_path)
4990
digit@chromium.org29e47272013-05-17 17:01:46 +00004991 # Grab the merge-base commit, i.e. the upstream commit of the current
4992 # branch when it was created or the last time it was rebased. This is
4993 # to cover the case where the user may have called "git fetch origin",
4994 # moving the origin branch to a newer commit, but hasn't rebased yet.
4995 upstream_commit = None
4996 cl = Changelist()
4997 upstream_branch = cl.GetUpstreamBranch()
4998 if upstream_branch:
4999 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5000 upstream_commit = upstream_commit.strip()
5001
5002 if not upstream_commit:
5003 DieWithError('Could not find base commit for this branch. '
5004 'Are you in detached state?')
5005
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005006 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5007 diff_output = RunGit(changed_files_cmd)
5008 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005009 # Filter out files deleted by this CL
5010 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005011
Andreas Haas417d89c2020-02-06 10:24:27 +00005012 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005013 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005014
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005015 clang_diff_files = []
5016 if opts.clang_format:
5017 clang_diff_files = [
5018 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5019 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005020 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005021 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005022
Edward Lesmes50da7702020-03-30 19:23:43 +00005023 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005024
Jamie Madill5e96ad12020-01-13 16:08:35 +00005025 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5026 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005027
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005028 # Similar code to above, but using yapf on .py files rather than clang-format
5029 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005030 py_explicitly_disabled = opts.python is not None and not opts.python
5031 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005032 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5033 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005034
Aiden Bennerc08566e2018-10-03 17:52:42 +00005035 # Used for caching.
5036 yapf_configs = {}
5037 for f in python_diff_files:
5038 # Find the yapf style config for the current file, defaults to depot
5039 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005040 _FindYapfConfigFile(f, yapf_configs, top_dir)
5041
5042 # Turn on python formatting by default if a yapf config is specified.
5043 # This breaks in the case of this repo though since the specified
5044 # style file is also the global default.
5045 if opts.python is None:
5046 filtered_py_files = []
5047 for f in python_diff_files:
5048 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5049 filtered_py_files.append(f)
5050 else:
5051 filtered_py_files = python_diff_files
5052
5053 # Note: yapf still seems to fix indentation of the entire file
5054 # even if line ranges are specified.
5055 # See https://github.com/google/yapf/issues/499
5056 if not opts.full and filtered_py_files:
5057 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5058
Brian Sheedyb4307d52019-12-02 19:18:17 +00005059 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5060 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5061 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005062
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005063 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005064 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5065 # Default to pep8 if not .style.yapf is found.
5066 if not yapf_style:
5067 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005068
Peter Wend9399922020-06-17 17:33:49 +00005069 with open(f, 'r') as py_f:
5070 if 'python3' in py_f.readline():
5071 vpython_script = 'vpython3'
5072 else:
5073 vpython_script = 'vpython'
5074
5075 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005076
5077 has_formattable_lines = False
5078 if not opts.full:
5079 # Only run yapf over changed line ranges.
5080 for diff_start, diff_len in py_line_diffs[f]:
5081 diff_end = diff_start + diff_len - 1
5082 # Yapf errors out if diff_end < diff_start but this
5083 # is a valid line range diff for a removal.
5084 if diff_end >= diff_start:
5085 has_formattable_lines = True
5086 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5087 # If all line diffs were removals we have nothing to format.
5088 if not has_formattable_lines:
5089 continue
5090
5091 if opts.diff or opts.dry_run:
5092 cmd += ['--diff']
5093 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005094 stdout = RunCommand(cmd,
5095 error_ok=True,
5096 cwd=top_dir,
5097 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005098 if opts.diff:
5099 sys.stdout.write(stdout)
5100 elif len(stdout) > 0:
5101 return_value = 2
5102 else:
5103 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005104 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005105
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005106 # Format GN build files. Always run on full build files for canonical form.
5107 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005108 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005109 if opts.dry_run or opts.diff:
5110 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005111 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005112 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005113 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005114 cwd=top_dir)
5115 if opts.dry_run and gn_ret == 2:
5116 return_value = 2 # Not formatted.
5117 elif opts.diff and gn_ret == 2:
5118 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005119 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005120 elif gn_ret != 0:
5121 # For non-dry run cases (and non-2 return values for dry-run), a
5122 # nonzero error code indicates a failure, probably because the file
5123 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005124 DieWithError('gn format failed on ' + gn_diff_file +
5125 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005126
Ilya Shermane081cbe2017-08-15 17:51:04 -07005127 # Skip the metrics formatting from the global presubmit hook. These files have
5128 # a separate presubmit hook that issues an error if the files need formatting,
5129 # whereas the top-level presubmit script merely issues a warning. Formatting
5130 # these files is somewhat slow, so it's important not to duplicate the work.
5131 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005132 for diff_xml in GetDiffXMLs(diff_files):
5133 xml_dir = GetMetricsDir(diff_xml)
5134 if not xml_dir:
5135 continue
5136
Ilya Shermane081cbe2017-08-15 17:51:04 -07005137 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005138 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5139 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005140
5141 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5142 # command as histograms/pretty_print.py now needs a relative path argument
5143 # after splitting the histograms into multiple directories.
5144 # For example, in tools/metrics/ukm, pretty-print could be run using:
5145 # $ python pretty_print.py
5146 # But in tools/metrics/histogrmas, pretty-print should be run with an
5147 # additional relative path argument, like:
5148 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5149 # $ python pretty_print.py enums.xml
5150
5151 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5152 # version of histograms/pretty_print.py is released.
5153 filepath_required = os.path.exists(
5154 os.path.join(tool_dir, 'validate_prefix.py'))
5155
Weilun Shib92c4b72020-08-27 17:45:11 +00005156 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5157 or diff_xml.endswith('histogram_suffixes_list.xml')
5158 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005159 cmd.append(diff_xml)
5160
Ilya Shermane081cbe2017-08-15 17:51:04 -07005161 if opts.dry_run or opts.diff:
5162 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005163
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005164 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5165 # `shell` param and instead replace `'vpython'` with
5166 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005167 stdout = RunCommand(cmd,
5168 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005169 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005170 if opts.diff:
5171 sys.stdout.write(stdout)
5172 if opts.dry_run and stdout:
5173 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005174
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005175 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005176
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005177
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005178def GetDiffXMLs(diff_files):
5179 return [
5180 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5181 ]
5182
5183
5184def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005185 metrics_xml_dirs = [
5186 os.path.join('tools', 'metrics', 'actions'),
5187 os.path.join('tools', 'metrics', 'histograms'),
5188 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005189 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005190 os.path.join('tools', 'metrics', 'ukm'),
5191 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005192 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005193 if diff_xml.startswith(xml_dir):
5194 return xml_dir
5195 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005196
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005197
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005198@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005199@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005200def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005201 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005202 _, args = parser.parse_args(args)
5203
5204 if len(args) != 1:
5205 parser.print_help()
5206 return 1
5207
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005208 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005209 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005210 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005211
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005212 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005213
Edward Lemur52969c92020-02-06 18:15:28 +00005214 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005215 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005216 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005217
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005218 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005219 for key, issue in [x.split() for x in output.splitlines()]:
5220 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005221 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005222
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005223 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005224 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005225 return 1
5226 if len(branches) == 1:
5227 RunGit(['checkout', branches[0]])
5228 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005229 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005230 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005231 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005232 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005233 try:
5234 RunGit(['checkout', branches[int(which)]])
5235 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005236 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005237 return 1
5238
5239 return 0
5240
5241
maruel@chromium.org29404b52014-09-08 22:58:00 +00005242def CMDlol(parser, args):
5243 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005244 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005245 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5246 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5247 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005248 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005249 return 0
5250
5251
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005252class OptionParser(optparse.OptionParser):
5253 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005254
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005255 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005256 optparse.OptionParser.__init__(
5257 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005258 self.add_option(
5259 '-v', '--verbose', action='count', default=0,
5260 help='Use 2 times for more debugging info')
5261
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005262 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005263 try:
5264 return self._parse_args(args)
5265 finally:
5266 # Regardless of success or failure of args parsing, we want to report
5267 # metrics, but only after logging has been initialized (if parsing
5268 # succeeded).
5269 global settings
5270 settings = Settings()
5271
5272 if not metrics.DISABLE_METRICS_COLLECTION:
5273 # GetViewVCUrl ultimately calls logging method.
5274 project_url = settings.GetViewVCUrl().strip('/+')
5275 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5276 metrics.collector.add('project_urls', [project_url])
5277
5278 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005279 # Create an optparse.Values object that will store only the actual passed
5280 # options, without the defaults.
5281 actual_options = optparse.Values()
5282 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5283 # Create an optparse.Values object with the default options.
5284 options = optparse.Values(self.get_default_values().__dict__)
5285 # Update it with the options passed by the user.
5286 options._update_careful(actual_options.__dict__)
5287 # Store the options passed by the user in an _actual_options attribute.
5288 # We store only the keys, and not the values, since the values can contain
5289 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005290 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005291
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005292 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005293 logging.basicConfig(
5294 level=levels[min(options.verbose, len(levels) - 1)],
5295 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5296 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005297
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005298 return options, args
5299
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005300
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005301def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005302 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005303 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005304 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005305 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005306
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005307 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005308 dispatcher = subcommand.CommandDispatcher(__name__)
5309 try:
5310 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005311 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005312 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005313 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005314 if e.code != 500:
5315 raise
5316 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005317 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005318 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005319 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005320
5321
5322if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005323 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5324 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005325 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005326 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005327 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005328 sys.exit(main(sys.argv[1:]))