blob: e6d203010502bc11161b609e1a827c7af4de7600 [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(),
996 host=self.GetGerritHost(),
997 project=self.GetGerritProject(),
998 branch=branch)
999 return self._owners_client
1000
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001001 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001002 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001003
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001004 The return value is a string suitable for passing to git cl with the --cc
1005 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001006 """
1007 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001008 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001009 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001010 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1011 return self.cc
1012
Daniel Cheng7227d212017-11-17 08:12:37 -08001013 def ExtendCC(self, more_cc):
1014 """Extends the list of users to cc on this CL based on the changed files."""
1015 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001016
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001017 def GetCommitDate(self):
1018 """Returns the commit date as provided in the constructor"""
1019 return self.commit_date
1020
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001021 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001022 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001024 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001025 if not branchref:
1026 return None
1027 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001028 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 return self.branch
1030
1031 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001032 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033 self.GetBranch() # Poke the lazy loader.
1034 return self.branchref
1035
Edward Lemur85153282020-02-14 22:06:29 +00001036 def _GitGetBranchConfigValue(self, key, default=None):
1037 return scm.GIT.GetBranchConfig(
1038 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001039
Edward Lemur85153282020-02-14 22:06:29 +00001040 def _GitSetBranchConfigValue(self, key, value):
1041 action = 'set %s to %r' % (key, value)
1042 if not value:
1043 action = 'unset %s' % key
1044 assert self.GetBranch(), 'a branch is needed to ' + action
1045 return scm.GIT.SetBranchConfig(
1046 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001047
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001048 @staticmethod
1049 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001050 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001051 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001053 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1054 settings.GetRoot(), branch)
1055 if not remote or not upstream_branch:
1056 DieWithError(
1057 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001058 'Verify this branch is set up to track another \n'
1059 '(via the --track argument to "git checkout -b ..."). \n'
1060 'or pass complete "git diff"-style arguments if supported, like\n'
1061 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001062
1063 return remote, upstream_branch
1064
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001065 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001066 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001067 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001068 DieWithError('The upstream for the current branch (%s) does not exist '
1069 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001070 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001071 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001072
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001073 def GetUpstreamBranch(self):
1074 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001075 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001076 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001077 upstream_branch = upstream_branch.replace('refs/heads/',
1078 'refs/remotes/%s/' % remote)
1079 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1080 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001081 self.upstream_branch = upstream_branch
1082 return self.upstream_branch
1083
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001084 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001085 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001086 remote, branch = None, self.GetBranch()
1087 seen_branches = set()
1088 while branch not in seen_branches:
1089 seen_branches.add(branch)
1090 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001091 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001092 if remote != '.' or branch.startswith('refs/remotes'):
1093 break
1094 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001095 remotes = RunGit(['remote'], error_ok=True).split()
1096 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001097 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001098 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001099 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001100 logging.warning('Could not determine which remote this change is '
1101 'associated with, so defaulting to "%s".' %
1102 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001103 else:
Gavin Make6a62332020-12-04 21:57:10 +00001104 logging.warning('Could not determine which remote this change is '
1105 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001106 branch = 'HEAD'
1107 if branch.startswith('refs/remotes'):
1108 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001109 elif branch.startswith('refs/branch-heads/'):
1110 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001111 else:
1112 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001113 return self._remote
1114
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001115 def GetRemoteUrl(self):
1116 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1117
1118 Returns None if there is no remote.
1119 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001120 is_cached, value = self._cached_remote_url
1121 if is_cached:
1122 return value
1123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001125 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001126
Edward Lemur298f2cf2019-02-22 21:40:39 +00001127 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001128 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001129 if host:
1130 self._cached_remote_url = (True, url)
1131 return url
1132
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001133 # If it cannot be parsed as an url, assume it is a local directory,
1134 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001135 logging.warning('"%s" doesn\'t appear to point to a git host. '
1136 'Interpreting it as a local directory.', url)
1137 if not os.path.isdir(url):
1138 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001139 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1140 'but it doesn\'t exist.',
1141 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001142 return None
1143
1144 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001145 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001146
Edward Lemur79d4f992019-11-11 23:49:02 +00001147 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001148 if not host:
1149 logging.error(
1150 'Remote "%(remote)s" for branch "%(branch)s" points to '
1151 '"%(cache_path)s", but it is misconfigured.\n'
1152 '"%(cache_path)s" must be a git repo and must have a remote named '
1153 '"%(remote)s" pointing to the git host.', {
1154 'remote': remote,
1155 'cache_path': cache_path,
1156 'branch': self.GetBranch()})
1157 return None
1158
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001159 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001160 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001162 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001163 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001164 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001165 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001166 if self.issue is not None:
1167 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001168 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001169 return self.issue
1170
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001171 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001172 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001173 issue = self.GetIssue()
1174 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001175 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001176 server = self.GetCodereviewServer()
1177 if short:
1178 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1179 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001180
Edward Lemur6c6827c2020-02-06 21:15:18 +00001181 def FetchDescription(self, pretty=False):
1182 assert self.GetIssue(), 'issue is required to query Gerrit'
1183
Edward Lemur9aa1a962020-02-25 00:58:38 +00001184 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001185 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1186 current_rev = data['current_revision']
1187 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001188
1189 if not pretty:
1190 return self.description
1191
1192 # Set width to 72 columns + 2 space indent.
1193 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1194 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1195 lines = self.description.splitlines()
1196 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197
1198 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001199 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001200 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001201 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001202 if self.patchset is not None:
1203 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001204 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 return self.patchset
1206
Edward Lemur9aa1a962020-02-25 00:58:38 +00001207 def GetAuthor(self):
1208 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001211 """Set this branch's patchset. If patchset=0, clears the patchset."""
1212 assert self.GetBranch()
1213 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001214 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001215 else:
1216 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001217 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001219 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001220 """Set this branch's issue. If issue isn't given, clears the issue."""
1221 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001223 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001224 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001225 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001226 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001227 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001228 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001229 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230 else:
tandrii5d48c322016-08-18 16:19:37 -07001231 # Reset all of these just to be clean.
1232 reset_suffixes = [
1233 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001234 ISSUE_CONFIG_KEY,
1235 PATCHSET_CONFIG_KEY,
1236 CODEREVIEW_SERVER_CONFIG_KEY,
1237 'gerritsquashhash',
1238 ]
tandrii5d48c322016-08-18 16:19:37 -07001239 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001240 try:
1241 self._GitSetBranchConfigValue(prop, None)
1242 except subprocess2.CalledProcessError:
1243 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001244 msg = RunGit(['log', '-1', '--format=%B']).strip()
1245 if msg and git_footers.get_footer_change_id(msg):
1246 print('WARNING: The change patched into this branch has a Change-Id. '
1247 'Removing it.')
1248 RunGit(['commit', '--amend', '-m',
1249 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001250 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001251 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001252 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253
Edward Lemur2c62b332020-03-12 22:12:33 +00001254 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001255 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001256 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001257 except subprocess2.CalledProcessError:
1258 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001259 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001260 'This branch probably doesn\'t exist anymore. To reset the\n'
1261 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001262 ' git branch --set-upstream-to origin/main %s\n'
1263 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001264 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001265
dsansomee2d6fd92016-09-08 00:10:47 -07001266 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001267 assert self.GetIssue(), 'issue is required to update description'
1268
1269 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001270 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001271 if not force:
1272 confirm_or_exit(
1273 'The description cannot be modified while the issue has a pending '
1274 'unpublished edit. Either publish the edit in the Gerrit web UI '
1275 'or delete it.\n\n', action='delete the unpublished edit')
1276
1277 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001278 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001279 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001280 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001281 description, notify='NONE')
1282
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001283 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001284
Edward Lemur75526302020-02-27 22:31:05 +00001285 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001286 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001287 '--root', settings.GetRoot(),
1288 '--upstream', upstream,
1289 ]
1290
1291 args.extend(['--verbose'] * verbose)
1292
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001293 remote, remote_branch = self.GetRemoteBranch()
1294 target_ref = GetTargetRef(remote, remote_branch, None)
1295 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1296 args.extend(['--gerrit_project', self.GetGerritProject()])
1297 args.extend(['--gerrit_branch', target_ref])
1298
Edward Lemur99df04e2020-03-05 19:39:43 +00001299 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001300 issue = self.GetIssue()
1301 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001302 if author:
1303 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001304 if issue:
1305 args.extend(['--issue', str(issue)])
1306 if patchset:
1307 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001308
Edward Lemur75526302020-02-27 22:31:05 +00001309 return args
1310
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001311 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001312 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001313 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1314 args = self._GetCommonPresubmitArgs(verbose, upstream)
1315 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001316 if may_prompt:
1317 args.append('--may_prompt')
1318 if parallel:
1319 args.append('--parallel')
1320 if all_files:
1321 args.append('--all_files')
1322
1323 with gclient_utils.temporary_file() as description_file:
1324 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001325 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001326 args.extend(['--json_output', json_output])
1327 args.extend(['--description_file', description_file])
1328
1329 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001330 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001331 if resultdb and realm:
1332 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1333 elif resultdb:
1334 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1335 # it is not required to pass the realm flag
1336 print('Note: ResultDB reporting will NOT be performed because --realm'
1337 ' was not specified. To enable ResultDB, please run the command'
1338 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001339
1340 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001341 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001342
Edward Lemur227d5102020-02-25 23:45:35 +00001343 metrics.collector.add_repeated('sub_commands', {
1344 'command': 'presubmit',
1345 'execution_time': time_time() - start,
1346 'exit_code': exit_code,
1347 })
1348
1349 if exit_code:
1350 sys.exit(exit_code)
1351
1352 json_results = gclient_utils.FileRead(json_output)
1353 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001354
Edward Lemur75526302020-02-27 22:31:05 +00001355 def RunPostUploadHook(self, verbose, upstream, description):
1356 args = self._GetCommonPresubmitArgs(verbose, upstream)
1357 args.append('--post_upload')
1358
1359 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001360 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001361 args.extend(['--description_file', description_file])
1362 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1363 p.wait()
1364
Edward Lemur5a644f82020-03-18 16:44:57 +00001365 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1366 # Get description message for upload.
1367 if self.GetIssue():
1368 description = self.FetchDescription()
1369 elif options.message:
1370 description = options.message
1371 else:
1372 description = _create_description_from_log(git_diff_args)
1373 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001374 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001375
1376 # Extract bug number from branch name.
1377 bug = options.bug
1378 fixed = options.fixed
1379 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1380 self.GetBranch())
1381 if not bug and not fixed and match:
1382 if match.group('type') == 'bug':
1383 bug = match.group('bugnum')
1384 else:
1385 fixed = match.group('bugnum')
1386
1387 change_description = ChangeDescription(description, bug, fixed)
1388
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001389 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1390 if options.add_owners_to:
1391 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001392 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001393 files, [], options.tbrs + options.reviewers)
1394 missing_files = [
1395 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001396 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001397 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001398 owners = self.owners_client.SuggestOwners(
1399 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001400 if options.add_owners_to == 'TBR':
1401 assert isinstance(options.tbrs, list), options.tbrs
1402 options.tbrs.extend(owners)
1403 else:
1404 assert isinstance(options.reviewers, list), options.reviewers
1405 options.reviewers.extend(owners)
1406
Edward Lemur5a644f82020-03-18 16:44:57 +00001407 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001408 if options.reviewers or options.tbrs:
1409 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001410
1411 return change_description
1412
1413 def _GetTitleForUpload(self, options):
1414 # When not squashing, just return options.title.
1415 if not options.squash:
1416 return options.title
1417
1418 # On first upload, patchset title is always this string, while options.title
1419 # gets converted to first line of message.
1420 if not self.GetIssue():
1421 return 'Initial upload'
1422
1423 # When uploading subsequent patchsets, options.message is taken as the title
1424 # if options.title is not provided.
1425 if options.title:
1426 return options.title
1427 if options.message:
1428 return options.message.strip()
1429
1430 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001431 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001432 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001433 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001434 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1435 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001436
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001437 def CMDUpload(self, options, git_diff_args, orig_args):
1438 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001439 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001440 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001441 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001442 else:
1443 if self.GetBranch() is None:
1444 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1445
1446 # Default to diffing against common ancestor of upstream branch
1447 base_branch = self.GetCommonAncestorWithUpstream()
1448 git_diff_args = [base_branch, 'HEAD']
1449
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001450 # Fast best-effort checks to abort before running potentially expensive
1451 # hooks if uploading is likely to fail anyway. Passing these checks does
1452 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001453 self.EnsureAuthenticated(force=options.force)
1454 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001455
1456 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001457 watchlist = watchlists.Watchlists(settings.GetRoot())
1458 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001459 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001460 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001461
Edward Lemur5a644f82020-03-18 16:44:57 +00001462 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001463 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001464 hook_results = self.RunHook(
1465 committing=False,
1466 may_prompt=not options.force,
1467 verbose=options.verbose,
1468 parallel=options.parallel,
1469 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001470 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001471 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001472 resultdb=options.resultdb,
1473 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001474 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001475
Aaron Gable13101a62018-02-09 13:20:41 -08001476 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001477 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001478 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001479 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001480 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001481 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001482 # Run post upload hooks, if specified.
1483 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001484 self.RunPostUploadHook(
1485 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001486
1487 # Upload all dependencies if specified.
1488 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001489 print()
1490 print('--dependencies has been specified.')
1491 print('All dependent local branches will be re-uploaded.')
1492 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001493 # Remove the dependencies flag from args so that we do not end up in a
1494 # loop.
1495 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001496 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001497 return ret
1498
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001499 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001500 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001501
1502 Issue must have been already uploaded and known.
1503 """
1504 assert new_state in _CQState.ALL_STATES
1505 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001506 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001507 vote_map = {
1508 _CQState.NONE: 0,
1509 _CQState.DRY_RUN: 1,
1510 _CQState.COMMIT: 2,
1511 }
1512 labels = {'Commit-Queue': vote_map[new_state]}
1513 notify = False if new_state == _CQState.DRY_RUN else None
1514 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001515 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001516 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001517 return 0
1518 except KeyboardInterrupt:
1519 raise
1520 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001521 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001522 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001523 ' * Your project has no CQ,\n'
1524 ' * You don\'t have permission to change the CQ state,\n'
1525 ' * There\'s a bug in this code (see stack trace below).\n'
1526 'Consider specifying which bots to trigger manually or asking your '
1527 'project owners for permissions or contacting Chrome Infra at:\n'
1528 'https://www.chromium.org/infra\n\n' %
1529 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001530 # Still raise exception so that stack trace is printed.
1531 raise
1532
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001533 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001534 # Lazy load of configs.
1535 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001536 if self._gerrit_host and '.' not in self._gerrit_host:
1537 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1538 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001539 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001540 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001541 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001542 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001543 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1544 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545 return self._gerrit_host
1546
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001547 def _GetGitHost(self):
1548 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001549 remote_url = self.GetRemoteUrl()
1550 if not remote_url:
1551 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001552 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001553
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001554 def GetCodereviewServer(self):
1555 if not self._gerrit_server:
1556 # If we're on a branch then get the server potentially associated
1557 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001558 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001559 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001560 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001561 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001562 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001563 if not self._gerrit_server:
1564 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1565 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001566 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001567 parts[0] = parts[0] + '-review'
1568 self._gerrit_host = '.'.join(parts)
1569 self._gerrit_server = 'https://%s' % self._gerrit_host
1570 return self._gerrit_server
1571
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001572 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001573 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001574 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001575 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001576 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001577 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001578 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001579 if project.endswith('.git'):
1580 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001581 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1582 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1583 # gitiles/git-over-https protocol. E.g.,
1584 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1585 # as
1586 # https://chromium.googlesource.com/v8/v8
1587 if project.startswith('a/'):
1588 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001589 return project
1590
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001591 def _GerritChangeIdentifier(self):
1592 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1593
1594 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001595 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001596 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001597 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001598 if project:
1599 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1600 # Fall back on still unique, but less efficient change number.
1601 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001602
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001603 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001604 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001605 if settings.GetGerritSkipEnsureAuthenticated():
1606 # For projects with unusual authentication schemes.
1607 # See http://crbug.com/603378.
1608 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001609
1610 # Check presence of cookies only if using cookies-based auth method.
1611 cookie_auth = gerrit_util.Authenticator.get()
1612 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001613 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001614
Florian Mayerae510e82020-01-30 21:04:48 +00001615 remote_url = self.GetRemoteUrl()
1616 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001617 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001618 return
1619 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001620 logging.warning('Ignoring branch %(branch)s with non-https remote '
1621 '%(remote)s', {
1622 'branch': self.branch,
1623 'remote': self.GetRemoteUrl()
1624 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001625 return
1626
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001627 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001628 self.GetCodereviewServer()
1629 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001630 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001631
1632 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1633 git_auth = cookie_auth.get_auth_header(git_host)
1634 if gerrit_auth and git_auth:
1635 if gerrit_auth == git_auth:
1636 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001637 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001638 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001639 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001640 ' %s\n'
1641 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001642 ' Consider running the following command:\n'
1643 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001644 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001645 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001646 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001647 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001648 cookie_auth.get_new_password_message(git_host)))
1649 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001650 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001651 return
1652 else:
1653 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001654 ([] if gerrit_auth else [self._gerrit_host]) +
1655 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001656 DieWithError('Credentials for the following hosts are required:\n'
1657 ' %s\n'
1658 'These are read from %s (or legacy %s)\n'
1659 '%s' % (
1660 '\n '.join(missing),
1661 cookie_auth.get_gitcookies_path(),
1662 cookie_auth.get_netrc_path(),
1663 cookie_auth.get_new_password_message(git_host)))
1664
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001665 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001666 if not self.GetIssue():
1667 return
1668
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001669 status = self._GetChangeDetail()['status']
1670 if status in ('MERGED', 'ABANDONED'):
1671 DieWithError('Change %s has been %s, new uploads are not allowed' %
1672 (self.GetIssueURL(),
1673 'submitted' if status == 'MERGED' else 'abandoned'))
1674
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001675 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1676 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1677 # Apparently this check is not very important? Otherwise get_auth_email
1678 # could have been added to other implementations of Authenticator.
1679 cookies_auth = gerrit_util.Authenticator.get()
1680 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001681 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001682
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001683 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001684 if self.GetIssueOwner() == cookies_user:
1685 return
1686 logging.debug('change %s owner is %s, cookies user is %s',
1687 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001688 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001689 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001690 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001691 if details['email'] == self.GetIssueOwner():
1692 return
1693 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001694 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001695 'as %s.\n'
1696 'Uploading may fail due to lack of permissions.' %
1697 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1698 confirm_or_exit(action='upload')
1699
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001700 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001701 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001702 or CQ status, assuming adherence to a common workflow.
1703
1704 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001705 * 'error' - error from review tool (including deleted issues)
1706 * 'unsent' - no reviewers added
1707 * 'waiting' - waiting for review
1708 * 'reply' - waiting for uploader to reply to review
1709 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001710 * 'dry-run' - dry-running in the CQ
1711 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001712 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001713 """
1714 if not self.GetIssue():
1715 return None
1716
1717 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001718 data = self._GetChangeDetail([
1719 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001720 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001721 return 'error'
1722
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001723 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001724 return 'closed'
1725
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001726 cq_label = data['labels'].get('Commit-Queue', {})
1727 max_cq_vote = 0
1728 for vote in cq_label.get('all', []):
1729 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1730 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001731 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001732 if max_cq_vote == 1:
1733 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001734
Aaron Gable9ab38c62017-04-06 14:36:33 -07001735 if data['labels'].get('Code-Review', {}).get('approved'):
1736 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001737
1738 if not data.get('reviewers', {}).get('REVIEWER', []):
1739 return 'unsent'
1740
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001741 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001742 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001743 while messages:
1744 m = messages.pop()
1745 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001746 # Ignore replies from CQ.
1747 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001748 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001749 # Most recent message was by owner.
1750 return 'waiting'
1751 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001752 # Some reply from non-owner.
1753 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001754
1755 # Somehow there are no messages even though there are reviewers.
1756 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001757
1758 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001759 if not self.GetIssue():
1760 return None
1761
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001762 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001763 patchset = data['revisions'][data['current_revision']]['_number']
1764 self.SetPatchset(patchset)
1765 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001766
Gavin Make61ccc52020-11-13 00:12:57 +00001767 def GetMostRecentDryRunPatchset(self):
1768 """Get patchsets equivalent to the most recent patchset and return
1769 the patchset with the latest dry run. If none have been dry run, return
1770 the latest patchset."""
1771 if not self.GetIssue():
1772 return None
1773
1774 data = self._GetChangeDetail(['ALL_REVISIONS'])
1775 patchset = data['revisions'][data['current_revision']]['_number']
1776 dry_run = set([int(m['_revision_number'])
1777 for m in data.get('messages', [])
1778 if m.get('tag', '').endswith('dry-run')])
1779
1780 for revision_info in sorted(data.get('revisions', {}).values(),
1781 key=lambda c: c['_number'], reverse=True):
1782 if revision_info['_number'] in dry_run:
1783 patchset = revision_info['_number']
1784 break
1785 if revision_info.get('kind', '') not in \
1786 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1787 break
1788 self.SetPatchset(patchset)
1789 return patchset
1790
Aaron Gable636b13f2017-07-14 10:42:48 -07001791 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001792 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001793 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001794 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001795
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001796 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001797 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001798 # CURRENT_REVISION is included to get the latest patchset so that
1799 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001800 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001801 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1802 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001803 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001804 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001805 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001806 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001807
1808 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001809 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001810 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001811 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001812 line_comments = file_comments.setdefault(path, [])
1813 line_comments.extend(
1814 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001815
1816 # Build dictionary of file comments for easy access and sorting later.
1817 # {author+date: {path: {patchset: {line: url+message}}}}
1818 comments = collections.defaultdict(
1819 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001820
1821 server = self.GetCodereviewServer()
1822 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1823 # /c/ is automatically added by short URL server.
1824 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1825 self.GetIssue())
1826 else:
1827 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1828
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001829 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001831 tag = comment.get('tag', '')
1832 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001833 continue
1834 key = (comment['author']['email'], comment['updated'])
1835 if comment.get('side', 'REVISION') == 'PARENT':
1836 patchset = 'Base'
1837 else:
1838 patchset = 'PS%d' % comment['patch_set']
1839 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001840 url = ('%s/%s/%s#%s%s' %
1841 (url_prefix, comment['patch_set'], path,
1842 'b' if comment.get('side') == 'PARENT' else '',
1843 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001844 comments[key][path][patchset][line] = (url, comment['message'])
1845
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001846 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001847 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001848 summary = self._BuildCommentSummary(msg, comments, readable)
1849 if summary:
1850 summaries.append(summary)
1851 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001852
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001853 @staticmethod
1854 def _BuildCommentSummary(msg, comments, readable):
1855 key = (msg['author']['email'], msg['date'])
1856 # Don't bother showing autogenerated messages that don't have associated
1857 # file or line comments. this will filter out most autogenerated
1858 # messages, but will keep robot comments like those from Tricium.
1859 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1860 if is_autogenerated and not comments.get(key):
1861 return None
1862 message = msg['message']
1863 # Gerrit spits out nanoseconds.
1864 assert len(msg['date'].split('.')[-1]) == 9
1865 date = datetime.datetime.strptime(msg['date'][:-3],
1866 '%Y-%m-%d %H:%M:%S.%f')
1867 if key in comments:
1868 message += '\n'
1869 for path, patchsets in sorted(comments.get(key, {}).items()):
1870 if readable:
1871 message += '\n%s' % path
1872 for patchset, lines in sorted(patchsets.items()):
1873 for line, (url, content) in sorted(lines.items()):
1874 if line:
1875 line_str = 'Line %d' % line
1876 path_str = '%s:%d:' % (path, line)
1877 else:
1878 line_str = 'File comment'
1879 path_str = '%s:0:' % path
1880 if readable:
1881 message += '\n %s, %s: %s' % (patchset, line_str, url)
1882 message += '\n %s\n' % content
1883 else:
1884 message += '\n%s ' % path_str
1885 message += '\n%s\n' % content
1886
1887 return _CommentSummary(
1888 date=date,
1889 message=message,
1890 sender=msg['author']['email'],
1891 autogenerated=is_autogenerated,
1892 # These could be inferred from the text messages and correlated with
1893 # Code-Review label maximum, however this is not reliable.
1894 # Leaving as is until the need arises.
1895 approval=False,
1896 disapproval=False,
1897 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001898
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001899 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001900 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001901 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001902
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001903 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001904 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001905 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001906 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001907
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001908 def _GetChangeDetail(self, options=None):
1909 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001910 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001911 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001912
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001913 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001914 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001915 options.append('CURRENT_COMMIT')
1916
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001917 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001918 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001919 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001920
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001921 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1922 # Assumption: data fetched before with extra options is suitable
1923 # for return for a smaller set of options.
1924 # For example, if we cached data for
1925 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1926 # and request is for options=[CURRENT_REVISION],
1927 # THEN we can return prior cached data.
1928 if options_set.issubset(cached_options_set):
1929 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001930
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001931 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001932 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001933 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001934 except gerrit_util.GerritError as e:
1935 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001936 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001937 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001938
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001939 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001940 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001941
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001942 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001943 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001944 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001945 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001946 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001947 except gerrit_util.GerritError as e:
1948 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001949 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001950 raise
agable32978d92016-11-01 12:55:02 -07001951 return data
1952
Karen Qian40c19422019-03-13 21:28:29 +00001953 def _IsCqConfigured(self):
1954 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001955 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001956
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001957 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001958 if git_common.is_dirty_git_tree('land'):
1959 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001960
tandriid60367b2016-06-22 05:25:12 -07001961 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001962 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001963 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001964 'which can test and land changes for you. '
1965 'Are you sure you wish to bypass it?\n',
1966 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001967 differs = True
tandriic4344b52016-08-29 06:04:54 -07001968 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001969 # Note: git diff outputs nothing if there is no diff.
1970 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001971 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001972 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001973 if detail['current_revision'] == last_upload:
1974 differs = False
1975 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001976 print('WARNING: Local branch contents differ from latest uploaded '
1977 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001978 if differs:
1979 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001980 confirm_or_exit(
1981 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1982 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001983 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001984 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001985 upstream = self.GetCommonAncestorWithUpstream()
1986 if self.GetIssue():
1987 description = self.FetchDescription()
1988 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001989 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001990 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001991 committing=True,
1992 may_prompt=not force,
1993 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001994 parallel=parallel,
1995 upstream=upstream,
1996 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001997 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001998 resultdb=resultdb,
1999 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002000
2001 self.SubmitIssue(wait_for_merge=True)
2002 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002003 links = self._GetChangeCommit().get('web_links', [])
2004 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002005 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002006 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002007 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002008 return 0
2009
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002010 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2011 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002012 assert parsed_issue_arg.valid
2013
Edward Lemur125d60a2019-09-13 18:25:41 +00002014 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002015
2016 if parsed_issue_arg.hostname:
2017 self._gerrit_host = parsed_issue_arg.hostname
2018 self._gerrit_server = 'https://%s' % self._gerrit_host
2019
tandriic2405f52016-10-10 08:13:15 -07002020 try:
2021 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002022 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002023 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002024
2025 if not parsed_issue_arg.patchset:
2026 # Use current revision by default.
2027 revision_info = detail['revisions'][detail['current_revision']]
2028 patchset = int(revision_info['_number'])
2029 else:
2030 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002031 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002032 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2033 break
2034 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002035 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002036 (parsed_issue_arg.patchset, self.GetIssue()))
2037
Edward Lemur125d60a2019-09-13 18:25:41 +00002038 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002039 if remote_url.endswith('.git'):
2040 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002041 remote_url = remote_url.rstrip('/')
2042
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002043 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002044 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002045
2046 if remote_url != fetch_info['url']:
2047 DieWithError('Trying to patch a change from %s but this repo appears '
2048 'to be %s.' % (fetch_info['url'], remote_url))
2049
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002050 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002051
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002052 # If we have created a new branch then do the "set issue" immediately in
2053 # case the cherry-pick fails, which happens when resolving conflicts.
2054 if newbranch:
2055 self.SetIssue(parsed_issue_arg.issue)
2056
Aaron Gable62619a32017-06-16 08:22:09 -07002057 if force:
2058 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2059 print('Checked out commit for change %i patchset %i locally' %
2060 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002061 elif nocommit:
2062 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2063 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002064 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002065 RunGit(['cherry-pick', 'FETCH_HEAD'])
2066 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002067 (parsed_issue_arg.issue, patchset))
2068 print('Note: this created a local commit which does not have '
2069 'the same hash as the one uploaded for review. This will make '
2070 'uploading changes based on top of this branch difficult.\n'
2071 'If you want to do that, use "git cl patch --force" instead.')
2072
Stefan Zagerd08043c2017-10-12 12:07:02 -07002073 if self.GetBranch():
2074 self.SetIssue(parsed_issue_arg.issue)
2075 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002076 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002077 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2078 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2079 else:
2080 print('WARNING: You are in detached HEAD state.\n'
2081 'The patch has been applied to your checkout, but you will not be '
2082 'able to upload a new patch set to the gerrit issue.\n'
2083 'Try using the \'-b\' option if you would like to work on a '
2084 'branch and/or upload a new patch set.')
2085
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002086 return 0
2087
tandrii16e0b4e2016-06-07 10:34:28 -07002088 def _GerritCommitMsgHookCheck(self, offer_removal):
2089 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2090 if not os.path.exists(hook):
2091 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002092 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2093 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002094 data = gclient_utils.FileRead(hook)
2095 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2096 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002097 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002098 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002099 'and may interfere with it in subtle ways.\n'
2100 'We recommend you remove the commit-msg hook.')
2101 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002102 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002103 gclient_utils.rm_file_or_tree(hook)
2104 print('Gerrit commit-msg hook removed.')
2105 else:
2106 print('OK, will keep Gerrit commit-msg hook in place.')
2107
Edward Lemur1b52d872019-05-09 21:12:12 +00002108 def _CleanUpOldTraces(self):
2109 """Keep only the last |MAX_TRACES| traces."""
2110 try:
2111 traces = sorted([
2112 os.path.join(TRACES_DIR, f)
2113 for f in os.listdir(TRACES_DIR)
2114 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2115 and not f.startswith('tmp'))
2116 ])
2117 traces_to_delete = traces[:-MAX_TRACES]
2118 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002119 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002120 except OSError:
2121 print('WARNING: Failed to remove old git traces from\n'
2122 ' %s'
2123 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002124
Edward Lemur5737f022019-05-17 01:24:00 +00002125 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002126 """Zip and write the git push traces stored in traces_dir."""
2127 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002128 traces_zip = trace_name + '-traces'
2129 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002130 # Create a temporary dir to store git config and gitcookies in. It will be
2131 # compressed and stored next to the traces.
2132 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002133 git_info_zip = trace_name + '-git-info'
2134
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002135 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002136
Edward Lemur1b52d872019-05-09 21:12:12 +00002137 git_push_metadata['trace_name'] = trace_name
2138 gclient_utils.FileWrite(
2139 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2140
2141 # Keep only the first 6 characters of the git hashes on the packet
2142 # trace. This greatly decreases size after compression.
2143 packet_traces = os.path.join(traces_dir, 'trace-packet')
2144 if os.path.isfile(packet_traces):
2145 contents = gclient_utils.FileRead(packet_traces)
2146 gclient_utils.FileWrite(
2147 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2148 shutil.make_archive(traces_zip, 'zip', traces_dir)
2149
2150 # Collect and compress the git config and gitcookies.
2151 git_config = RunGit(['config', '-l'])
2152 gclient_utils.FileWrite(
2153 os.path.join(git_info_dir, 'git-config'),
2154 git_config)
2155
2156 cookie_auth = gerrit_util.Authenticator.get()
2157 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2158 gitcookies_path = cookie_auth.get_gitcookies_path()
2159 if os.path.isfile(gitcookies_path):
2160 gitcookies = gclient_utils.FileRead(gitcookies_path)
2161 gclient_utils.FileWrite(
2162 os.path.join(git_info_dir, 'gitcookies'),
2163 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2164 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2165
Edward Lemur1b52d872019-05-09 21:12:12 +00002166 gclient_utils.rmtree(git_info_dir)
2167
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002168 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002169 """Run git push and collect the traces resulting from the execution."""
2170 # Create a temporary directory to store traces in. Traces will be compressed
2171 # and stored in a 'traces' dir inside depot_tools.
2172 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002173 trace_name = os.path.join(
2174 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002175
2176 env = os.environ.copy()
2177 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2178 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002179 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002180 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2181 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2182 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2183
2184 try:
2185 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002186 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002187 before_push = time_time()
2188 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002189 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002190 env=env,
2191 print_stdout=True,
2192 # Flush after every line: useful for seeing progress when running as
2193 # recipe.
2194 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002195 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002196 except subprocess2.CalledProcessError as e:
2197 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002198 raise GitPushError(
2199 'Failed to create a change. Please examine output above for the '
2200 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002201 'For emergencies, Googlers can escalate to '
2202 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002203 'Hint: run command below to diagnose common Git/Gerrit '
2204 'credential problems:\n'
2205 ' git cl creds-check\n'
2206 '\n'
2207 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2208 'component including the files below.\n'
2209 'Review the files before upload, since they might contain sensitive '
2210 'information.\n'
2211 'Set the Restrict-View-Google label so that they are not publicly '
2212 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002213 finally:
2214 execution_time = time_time() - before_push
2215 metrics.collector.add_repeated('sub_commands', {
2216 'command': 'git push',
2217 'execution_time': execution_time,
2218 'exit_code': push_returncode,
2219 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2220 })
2221
Edward Lemur1b52d872019-05-09 21:12:12 +00002222 git_push_metadata['execution_time'] = execution_time
2223 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002224 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002225
Edward Lemur1b52d872019-05-09 21:12:12 +00002226 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002227 gclient_utils.rmtree(traces_dir)
2228
2229 return push_stdout
2230
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002231 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2232 change_desc):
2233 """Upload the current branch to Gerrit, retry if new remote HEAD is
2234 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002235 remote, remote_branch = self.GetRemoteBranch()
2236 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2237
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002238 try:
2239 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002240 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002241 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002242 # Repository might be in the middle of transition to main branch as
2243 # default, and uploads to old default might be blocked.
2244 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002245 DieWithError(str(e), change_desc)
2246
Josip Sokcevicb631a882021-01-06 18:18:10 +00002247 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2248 self.GetGerritProject())
2249 if project_head == branch:
2250 DieWithError(str(e), change_desc)
2251 branch = project_head
2252
2253 print("WARNING: Fetching remote state and retrying upload to default "
2254 "branch...")
2255 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002256 options.edit_description = False
2257 options.force = True
2258 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002259 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2260 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002261 except GitPushError as e:
2262 DieWithError(str(e), change_desc)
2263
2264 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002265 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002266 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002267 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002268 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002270 # User requested to change description
2271 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002272 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002273 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002274 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002275 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002276 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002277 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002278 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002279 if len(change_ids) == 1:
2280 change_id = change_ids[0]
2281 else:
2282 change_id = GenerateGerritChangeId(change_desc.description)
2283 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002285 if options.preserve_tryjobs:
2286 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002287
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002288 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002289 parent = self._ComputeParent(
2290 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002291 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002292 with gclient_utils.temporary_file() as desc_tempfile:
2293 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2294 ref_to_push = RunGit(
2295 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002296 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297 if not git_footers.get_footer_change_id(change_desc.description):
2298 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002299 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002300 self._AddChangeIdToCommitMessage(
2301 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002303 # For no-squash mode, we assume the remote called "origin" is the one we
2304 # want. It is not worthwhile to support different workflows for
2305 # no-squash mode.
2306 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2308
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002309 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2311 ref_to_push)]).splitlines()
2312 if len(commits) > 1:
2313 print('WARNING: This will upload %d commits. Run the following command '
2314 'to see which commits will be uploaded: ' % len(commits))
2315 print('git log %s..%s' % (parent, ref_to_push))
2316 print('You can also use `git squash-branch` to squash these into a '
2317 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002318 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002319
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002320 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002321 cc = []
2322 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2323 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2324 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002325 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002326 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002327 if options.cc:
2328 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002329 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002330 if change_desc.get_cced():
2331 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002332 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002333 valid_accounts = set(reviewers + cc)
2334 # TODO(crbug/877717): relax this for all hosts.
2335 else:
2336 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002337 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002338 logging.info('accounts %s are recognized, %s invalid',
2339 sorted(valid_accounts),
2340 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002341
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002342 # Extra options that can be specified at push time. Doc:
2343 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002344 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002345
Aaron Gable844cf292017-06-28 11:32:59 -07002346 # By default, new changes are started in WIP mode, and subsequent patchsets
2347 # don't send email. At any time, passing --send-mail will mark the change
2348 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002349 if options.send_mail:
2350 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002351 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002352 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002353 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002354 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002355 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002356
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002357 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002358 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002359
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002360 # Set options.title in case user was prompted in _GetTitleForUpload and
2361 # _CMDUploadChange needs to be called again.
2362 options.title = self._GetTitleForUpload(options)
2363 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002364 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002365 refspec_opts.append(
2366 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002367
agablec6787972016-09-09 16:13:34 -07002368 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002369 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002370
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002371 for r in sorted(reviewers):
2372 if r in valid_accounts:
2373 refspec_opts.append('r=%s' % r)
2374 reviewers.remove(r)
2375 else:
2376 # TODO(tandrii): this should probably be a hard failure.
2377 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2378 % r)
2379 for c in sorted(cc):
2380 # refspec option will be rejected if cc doesn't correspond to an
2381 # account, even though REST call to add such arbitrary cc may succeed.
2382 if c in valid_accounts:
2383 refspec_opts.append('cc=%s' % c)
2384 cc.remove(c)
2385
rmistry9eadede2016-09-19 11:22:43 -07002386 if options.topic:
2387 # Documentation on Gerrit topics is here:
2388 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002389 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002390
Edward Lemur687ca902018-12-05 02:30:30 +00002391 if options.enable_auto_submit:
2392 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002393 if options.set_bot_commit:
2394 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002395 if options.use_commit_queue:
2396 refspec_opts.append('l=Commit-Queue+2')
2397 elif options.cq_dry_run:
2398 refspec_opts.append('l=Commit-Queue+1')
2399
2400 if change_desc.get_reviewers(tbr_only=True):
2401 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002402 self.GetGerritHost(),
2403 self.GetGerritProject())
Edward Lemur687ca902018-12-05 02:30:30 +00002404 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002405
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002406 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002407 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002408 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002409 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002410 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2411
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002412 refspec_suffix = ''
2413 if refspec_opts:
2414 refspec_suffix = '%' + ','.join(refspec_opts)
2415 assert ' ' not in refspec_suffix, (
2416 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2417 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2418
Edward Lemur1b52d872019-05-09 21:12:12 +00002419 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002420 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002421 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002422 'change_id': change_id,
2423 'description': change_desc.description,
2424 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002425 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2426 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002427
2428 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002429 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430 change_numbers = [m.group(1)
2431 for m in map(regex.match, push_stdout.splitlines())
2432 if m]
2433 if len(change_numbers) != 1:
2434 DieWithError(
2435 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002436 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002437 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002438 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002439
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002440 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002441 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002442 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002443 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002444 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002445 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002446 reviewers, cc,
2447 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002448
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 return 0
2450
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002451 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2452 change_desc):
2453 """Computes parent of the generated commit to be uploaded to Gerrit.
2454
2455 Returns revision or a ref name.
2456 """
2457 if custom_cl_base:
2458 # Try to avoid creating additional unintended CLs when uploading, unless
2459 # user wants to take this risk.
2460 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2461 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2462 local_ref_of_target_remote])
2463 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002464 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002465 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2466 'If you proceed with upload, more than 1 CL may be created by '
2467 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2468 'If you are certain that specified base `%s` has already been '
2469 'uploaded to Gerrit as another CL, you may proceed.\n' %
2470 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2471 if not force:
2472 confirm_or_exit(
2473 'Do you take responsibility for cleaning up potential mess '
2474 'resulting from proceeding with upload?',
2475 action='upload')
2476 return custom_cl_base
2477
Aaron Gablef97e33d2017-03-30 15:44:27 -07002478 if remote != '.':
2479 return self.GetCommonAncestorWithUpstream()
2480
2481 # If our upstream branch is local, we base our squashed commit on its
2482 # squashed version.
2483 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2484
Aaron Gablef97e33d2017-03-30 15:44:27 -07002485 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002486 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002487 if upstream_branch_name == 'main':
2488 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002489
2490 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002491 # TODO(tandrii): consider checking parent change in Gerrit and using its
2492 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2493 # the tree hash of the parent branch. The upside is less likely bogus
2494 # requests to reupload parent change just because it's uploadhash is
2495 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002496 parent = scm.GIT.GetBranchConfig(
2497 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002498 # Verify that the upstream branch has been uploaded too, otherwise
2499 # Gerrit will create additional CLs when uploading.
2500 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2501 RunGitSilent(['rev-parse', parent + ':'])):
2502 DieWithError(
2503 '\nUpload upstream branch %s first.\n'
2504 'It is likely that this branch has been rebased since its last '
2505 'upload, so you just need to upload it again.\n'
2506 '(If you uploaded it with --no-squash, then branch dependencies '
2507 'are not supported, and you should reupload with --squash.)'
2508 % upstream_branch_name,
2509 change_desc)
2510 return parent
2511
Edward Lemura12175c2020-03-09 16:58:26 +00002512 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002513 """Re-commits using the current message, assumes the commit hook is in
2514 place.
2515 """
Edward Lemura12175c2020-03-09 16:58:26 +00002516 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002517 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002518 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002519 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002520 return new_log_desc
2521 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002522 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002523
tandriie113dfd2016-10-11 10:20:12 -07002524 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002525 try:
2526 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002527 except GerritChangeNotExists:
2528 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002529
2530 if data['status'] in ('ABANDONED', 'MERGED'):
2531 return 'CL %s is closed' % self.GetIssue()
2532
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002533 def GetGerritChange(self, patchset=None):
2534 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002535 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002536 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002537 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002538 data = self._GetChangeDetail(['ALL_REVISIONS'])
2539
2540 assert host and issue and patchset, 'CL must be uploaded first'
2541
2542 has_patchset = any(
2543 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002544 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002545 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002546 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002547 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002548
tandrii8c5a3532016-11-04 07:52:02 -07002549 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002550 'host': host,
2551 'change': issue,
2552 'project': data['project'],
2553 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002554 }
tandriie113dfd2016-10-11 10:20:12 -07002555
tandriide281ae2016-10-12 06:02:30 -07002556 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002557 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002558
Edward Lemur707d70b2018-02-07 00:50:14 +01002559 def GetReviewers(self):
2560 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002561 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002562
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002563
Lei Zhang8a0efc12020-08-05 19:58:45 +00002564def _get_bug_line_values(default_project_prefix, bugs):
2565 """Given default_project_prefix and comma separated list of bugs, yields bug
2566 line values.
tandriif9aefb72016-07-01 09:06:51 -07002567
2568 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002569 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002570 * string, which is left as is.
2571
2572 This function may produce more than one line, because bugdroid expects one
2573 project per line.
2574
Lei Zhang8a0efc12020-08-05 19:58:45 +00002575 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002576 ['v8:123', 'chromium:789']
2577 """
2578 default_bugs = []
2579 others = []
2580 for bug in bugs.split(','):
2581 bug = bug.strip()
2582 if bug:
2583 try:
2584 default_bugs.append(int(bug))
2585 except ValueError:
2586 others.append(bug)
2587
2588 if default_bugs:
2589 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002590 if default_project_prefix:
2591 if not default_project_prefix.endswith(':'):
2592 default_project_prefix += ':'
2593 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002594 else:
2595 yield default_bugs
2596 for other in sorted(others):
2597 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2598 yield other
2599
2600
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002601class ChangeDescription(object):
2602 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002603 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002604 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002605 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002606 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002607 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002608 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2609 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002610 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002611 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002612
Dan Beamd8b04ca2019-10-10 21:23:26 +00002613 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002614 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002615 if bug:
2616 regexp = re.compile(self.BUG_LINE)
2617 prefix = settings.GetBugPrefix()
2618 if not any((regexp.match(line) for line in self._description_lines)):
2619 values = list(_get_bug_line_values(prefix, bug))
2620 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002621 if fixed:
2622 regexp = re.compile(self.FIXED_LINE)
2623 prefix = settings.GetBugPrefix()
2624 if not any((regexp.match(line) for line in self._description_lines)):
2625 values = list(_get_bug_line_values(prefix, fixed))
2626 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002627
agable@chromium.org42c20792013-09-12 17:34:49 +00002628 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002629 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002630 return '\n'.join(self._description_lines)
2631
2632 def set_description(self, desc):
2633 if isinstance(desc, basestring):
2634 lines = desc.splitlines()
2635 else:
2636 lines = [line.rstrip() for line in desc]
2637 while lines and not lines[0]:
2638 lines.pop(0)
2639 while lines and not lines[-1]:
2640 lines.pop(-1)
2641 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002642
Edward Lemur5a644f82020-03-18 16:44:57 +00002643 def ensure_change_id(self, change_id):
2644 description = self.description
2645 footer_change_ids = git_footers.get_footer_change_id(description)
2646 # Make sure that the Change-Id in the description matches the given one.
2647 if footer_change_ids != [change_id]:
2648 if footer_change_ids:
2649 # Remove any existing Change-Id footers since they don't match the
2650 # expected change_id footer.
2651 description = git_footers.remove_footer(description, 'Change-Id')
2652 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2653 'if you want to set a new one.')
2654 # Add the expected Change-Id footer.
2655 description = git_footers.add_footer_change_id(description, change_id)
2656 self.set_description(description)
2657
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002658 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002659 """Rewrites the R=/TBR= line(s) as a single line each.
2660
2661 Args:
2662 reviewers (list(str)) - list of additional emails to use for reviewers.
2663 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002664 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002665 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002666 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002667
2668 reviewers = set(reviewers)
2669 tbrs = set(tbrs)
2670 LOOKUP = {
2671 'TBR': tbrs,
2672 'R': reviewers,
2673 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002674
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002675 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002676 regexp = re.compile(self.R_LINE)
2677 matches = [regexp.match(line) for line in self._description_lines]
2678 new_desc = [l for i, l in enumerate(self._description_lines)
2679 if not matches[i]]
2680 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002681
agable@chromium.org42c20792013-09-12 17:34:49 +00002682 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002683
2684 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002685 for match in matches:
2686 if not match:
2687 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002688 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2689
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002690 # If any folks ended up in both groups, remove them from tbrs.
2691 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002692
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002693 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2694 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002695
2696 # Put the new lines in the description where the old first R= line was.
2697 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2698 if 0 <= line_loc < len(self._description_lines):
2699 if new_tbr_line:
2700 self._description_lines.insert(line_loc, new_tbr_line)
2701 if new_r_line:
2702 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002703 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002704 if new_r_line:
2705 self.append_footer(new_r_line)
2706 if new_tbr_line:
2707 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002708
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002709 def set_preserve_tryjobs(self):
2710 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2711 footers = git_footers.parse_footers(self.description)
2712 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2713 if v.lower() == 'true':
2714 return
2715 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2716
Anthony Polito8b955342019-09-24 19:01:36 +00002717 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002718 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002719 self.set_description([
2720 '# Enter a description of the change.',
2721 '# This will be displayed on the codereview site.',
2722 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002723 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002724 '--------------------',
2725 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002726 bug_regexp = re.compile(self.BUG_LINE)
2727 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002728 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002729 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002730
Dan Beamd8b04ca2019-10-10 21:23:26 +00002731 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002732 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002733
Bruce Dawsonfc487042020-10-27 19:11:37 +00002734 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002735 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002736 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002737 if not content:
2738 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002739 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002740
Bruce Dawson2377b012018-01-11 16:46:49 -08002741 # Strip off comments and default inserted "Bug:" line.
2742 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002743 (line.startswith('#') or
2744 line.rstrip() == "Bug:" or
2745 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002746 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002747 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002748 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002749
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002750 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002751 """Adds a footer line to the description.
2752
2753 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2754 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2755 that Gerrit footers are always at the end.
2756 """
2757 parsed_footer_line = git_footers.parse_footer(line)
2758 if parsed_footer_line:
2759 # Line is a gerrit footer in the form: Footer-Key: any value.
2760 # Thus, must be appended observing Gerrit footer rules.
2761 self.set_description(
2762 git_footers.add_footer(self.description,
2763 key=parsed_footer_line[0],
2764 value=parsed_footer_line[1]))
2765 return
2766
2767 if not self._description_lines:
2768 self._description_lines.append(line)
2769 return
2770
2771 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2772 if gerrit_footers:
2773 # git_footers.split_footers ensures that there is an empty line before
2774 # actual (gerrit) footers, if any. We have to keep it that way.
2775 assert top_lines and top_lines[-1] == ''
2776 top_lines, separator = top_lines[:-1], top_lines[-1:]
2777 else:
2778 separator = [] # No need for separator if there are no gerrit_footers.
2779
2780 prev_line = top_lines[-1] if top_lines else ''
2781 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2782 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2783 top_lines.append('')
2784 top_lines.append(line)
2785 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002786
tandrii99a72f22016-08-17 14:33:24 -07002787 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002788 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002789 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002790 reviewers = [match.group(2).strip()
2791 for match in matches
2792 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002793 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002794
bradnelsond975b302016-10-23 12:20:23 -07002795 def get_cced(self):
2796 """Retrieves the list of reviewers."""
2797 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2798 cced = [match.group(2).strip() for match in matches if match]
2799 return cleanup_list(cced)
2800
Nodir Turakulov23b82142017-11-16 11:04:25 -08002801 def get_hash_tags(self):
2802 """Extracts and sanitizes a list of Gerrit hashtags."""
2803 subject = (self._description_lines or ('',))[0]
2804 subject = re.sub(
2805 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2806
2807 tags = []
2808 start = 0
2809 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2810 while True:
2811 m = bracket_exp.match(subject, start)
2812 if not m:
2813 break
2814 tags.append(self.sanitize_hash_tag(m.group(1)))
2815 start = m.end()
2816
2817 if not tags:
2818 # Try "Tag: " prefix.
2819 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2820 if m:
2821 tags.append(self.sanitize_hash_tag(m.group(1)))
2822 return tags
2823
2824 @classmethod
2825 def sanitize_hash_tag(cls, tag):
2826 """Returns a sanitized Gerrit hash tag.
2827
2828 A sanitized hashtag can be used as a git push refspec parameter value.
2829 """
2830 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2831
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002832
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002833def FindCodereviewSettingsFile(filename='codereview.settings'):
2834 """Finds the given file starting in the cwd and going up.
2835
2836 Only looks up to the top of the repository unless an
2837 'inherit-review-settings-ok' file exists in the root of the repository.
2838 """
2839 inherit_ok_file = 'inherit-review-settings-ok'
2840 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002841 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002842 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2843 root = '/'
2844 while True:
2845 if filename in os.listdir(cwd):
2846 if os.path.isfile(os.path.join(cwd, filename)):
2847 return open(os.path.join(cwd, filename))
2848 if cwd == root:
2849 break
2850 cwd = os.path.dirname(cwd)
2851
2852
2853def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002854 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002855 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002856
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002857 def SetProperty(name, setting, unset_error_ok=False):
2858 fullname = 'rietveld.' + name
2859 if setting in keyvals:
2860 RunGit(['config', fullname, keyvals[setting]])
2861 else:
2862 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2863
tandrii48df5812016-10-17 03:55:37 -07002864 if not keyvals.get('GERRIT_HOST', False):
2865 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002866 # Only server setting is required. Other settings can be absent.
2867 # In that case, we ignore errors raised during option deletion attempt.
2868 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2869 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2870 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002871 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002872 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2873 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002874 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2875 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002876 SetProperty(
2877 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002878
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002879 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002880 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002881
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002882 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002883 RunGit(['config', 'gerrit.squash-uploads',
2884 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002885
tandrii@chromium.org28253532016-04-14 13:46:56 +00002886 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002887 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002888 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2889
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002890 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002891 # should be of the form
2892 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2893 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002894 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2895 keyvals['ORIGIN_URL_CONFIG']])
2896
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002897
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002898def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002899 """Downloads a network object to a local file, like urllib.urlretrieve.
2900
2901 This is necessary because urllib is broken for SSL connections via a proxy.
2902 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002903 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002904 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002905
2906
ukai@chromium.org712d6102013-11-27 00:52:58 +00002907def hasSheBang(fname):
2908 """Checks fname is a #! script."""
2909 with open(fname) as f:
2910 return f.read(2).startswith('#!')
2911
2912
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002913def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002914 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002915
2916 Args:
2917 force: True to update hooks. False to install hooks if not present.
2918 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002919 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002920 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2921 if not os.access(dst, os.X_OK):
2922 if os.path.exists(dst):
2923 if not force:
2924 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002925 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002926 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002927 if not hasSheBang(dst):
2928 DieWithError('Not a script: %s\n'
2929 'You need to download from\n%s\n'
2930 'into .git/hooks/commit-msg and '
2931 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002932 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2933 except Exception:
2934 if os.path.exists(dst):
2935 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002936 DieWithError('\nFailed to download hooks.\n'
2937 'You need to download from\n%s\n'
2938 'into .git/hooks/commit-msg and '
2939 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002940
2941
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002942class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002943 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002944
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002945 _GOOGLESOURCE = 'googlesource.com'
2946
2947 def __init__(self):
2948 # Cached list of [host, identity, source], where source is either
2949 # .gitcookies or .netrc.
2950 self._all_hosts = None
2951
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002952 def ensure_configured_gitcookies(self):
2953 """Runs checks and suggests fixes to make git use .gitcookies from default
2954 path."""
2955 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2956 configured_path = RunGitSilent(
2957 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002958 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002959 if configured_path:
2960 self._ensure_default_gitcookies_path(configured_path, default)
2961 else:
2962 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002963
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002964 @staticmethod
2965 def _ensure_default_gitcookies_path(configured_path, default_path):
2966 assert configured_path
2967 if configured_path == default_path:
2968 print('git is already configured to use your .gitcookies from %s' %
2969 configured_path)
2970 return
2971
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002972 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002973 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2974 (configured_path, default_path))
2975
2976 if not os.path.exists(configured_path):
2977 print('However, your configured .gitcookies file is missing.')
2978 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2979 action='reconfigure')
2980 RunGit(['config', '--global', 'http.cookiefile', default_path])
2981 return
2982
2983 if os.path.exists(default_path):
2984 print('WARNING: default .gitcookies file already exists %s' %
2985 default_path)
2986 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2987 default_path)
2988
2989 confirm_or_exit('Move existing .gitcookies to default location?',
2990 action='move')
2991 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002992 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002993 print('Moved and reconfigured git to use .gitcookies from %s' %
2994 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002995
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002996 @staticmethod
2997 def _configure_gitcookies_path(default_path):
2998 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2999 if os.path.exists(netrc_path):
3000 print('You seem to be using outdated .netrc for git credentials: %s' %
3001 netrc_path)
3002 print('This tool will guide you through setting up recommended '
3003 '.gitcookies store for git credentials.\n'
3004 '\n'
3005 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3006 ' git config --global --unset http.cookiefile\n'
3007 ' mv %s %s.backup\n\n' % (default_path, default_path))
3008 confirm_or_exit(action='setup .gitcookies')
3009 RunGit(['config', '--global', 'http.cookiefile', default_path])
3010 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003011
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003012 def get_hosts_with_creds(self, include_netrc=False):
3013 if self._all_hosts is None:
3014 a = gerrit_util.CookiesAuthenticator()
3015 self._all_hosts = [
3016 (h, u, s)
3017 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003018 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3019 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003020 )
3021 if h.endswith(self._GOOGLESOURCE)
3022 ]
3023
3024 if include_netrc:
3025 return self._all_hosts
3026 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3027
3028 def print_current_creds(self, include_netrc=False):
3029 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3030 if not hosts:
3031 print('No Git/Gerrit credentials found')
3032 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003033 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003034 header = [('Host', 'User', 'Which file'),
3035 ['=' * l for l in lengths]]
3036 for row in (header + hosts):
3037 print('\t'.join((('%%+%ds' % l) % s)
3038 for l, s in zip(lengths, row)))
3039
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003040 @staticmethod
3041 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003042 """Parses identity "git-<username>.domain" into <username> and domain."""
3043 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003044 # distinguishable from sub-domains. But we do know typical domains:
3045 if identity.endswith('.chromium.org'):
3046 domain = 'chromium.org'
3047 username = identity[:-len('.chromium.org')]
3048 else:
3049 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003050 if username.startswith('git-'):
3051 username = username[len('git-'):]
3052 return username, domain
3053
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003054 def _canonical_git_googlesource_host(self, host):
3055 """Normalizes Gerrit hosts (with '-review') to Git host."""
3056 assert host.endswith(self._GOOGLESOURCE)
3057 # Prefix doesn't include '.' at the end.
3058 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3059 if prefix.endswith('-review'):
3060 prefix = prefix[:-len('-review')]
3061 return prefix + '.' + self._GOOGLESOURCE
3062
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003063 def _canonical_gerrit_googlesource_host(self, host):
3064 git_host = self._canonical_git_googlesource_host(host)
3065 prefix = git_host.split('.', 1)[0]
3066 return prefix + '-review.' + self._GOOGLESOURCE
3067
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003068 def _get_counterpart_host(self, host):
3069 assert host.endswith(self._GOOGLESOURCE)
3070 git = self._canonical_git_googlesource_host(host)
3071 gerrit = self._canonical_gerrit_googlesource_host(git)
3072 return git if gerrit == host else gerrit
3073
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003074 def has_generic_host(self):
3075 """Returns whether generic .googlesource.com has been configured.
3076
3077 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3078 """
3079 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3080 if host == '.' + self._GOOGLESOURCE:
3081 return True
3082 return False
3083
3084 def _get_git_gerrit_identity_pairs(self):
3085 """Returns map from canonic host to pair of identities (Git, Gerrit).
3086
3087 One of identities might be None, meaning not configured.
3088 """
3089 host_to_identity_pairs = {}
3090 for host, identity, _ in self.get_hosts_with_creds():
3091 canonical = self._canonical_git_googlesource_host(host)
3092 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3093 idx = 0 if canonical == host else 1
3094 pair[idx] = identity
3095 return host_to_identity_pairs
3096
3097 def get_partially_configured_hosts(self):
3098 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003099 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003100 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003101 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003102
3103 def get_conflicting_hosts(self):
3104 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003105 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003106 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003107 if None not in (i1, i2) and i1 != i2)
3108
3109 def get_duplicated_hosts(self):
3110 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003111 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003112
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003113
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003114 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003115 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003116 hosts = sorted(hosts)
3117 assert hosts
3118 if extra_column_func is None:
3119 extras = [''] * len(hosts)
3120 else:
3121 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003122 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3123 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003124 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003125 lines.append(tmpl % he)
3126 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003127
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003128 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003129 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003130 yield ('.googlesource.com wildcard record detected',
3131 ['Chrome Infrastructure team recommends to list full host names '
3132 'explicitly.'],
3133 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003134
3135 dups = self.get_duplicated_hosts()
3136 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003137 yield ('The following hosts were defined twice',
3138 self._format_hosts(dups),
3139 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003140
3141 partial = self.get_partially_configured_hosts()
3142 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003143 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3144 'These hosts are missing',
3145 self._format_hosts(partial, lambda host: 'but %s defined' %
3146 self._get_counterpart_host(host)),
3147 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003148
3149 conflicting = self.get_conflicting_hosts()
3150 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003151 yield ('The following Git hosts have differing credentials from their '
3152 'Gerrit counterparts',
3153 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3154 tuple(self._get_git_gerrit_identity_pairs()[host])),
3155 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003156
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003157 def find_and_report_problems(self):
3158 """Returns True if there was at least one problem, else False."""
3159 found = False
3160 bad_hosts = set()
3161 for title, sublines, hosts in self._find_problems():
3162 if not found:
3163 found = True
3164 print('\n\n.gitcookies problem report:\n')
3165 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003166 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003167 if sublines:
3168 print()
3169 print(' %s' % '\n '.join(sublines))
3170 print()
3171
3172 if bad_hosts:
3173 assert found
3174 print(' You can manually remove corresponding lines in your %s file and '
3175 'visit the following URLs with correct account to generate '
3176 'correct credential lines:\n' %
3177 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3178 print(' %s' % '\n '.join(sorted(set(
3179 gerrit_util.CookiesAuthenticator().get_new_password_url(
3180 self._canonical_git_googlesource_host(host))
3181 for host in bad_hosts
3182 ))))
3183 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003184
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003185
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003186@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003187def CMDcreds_check(parser, args):
3188 """Checks credentials and suggests changes."""
3189 _, _ = parser.parse_args(args)
3190
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003191 # Code below checks .gitcookies. Abort if using something else.
3192 authn = gerrit_util.Authenticator.get()
3193 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003194 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003195 'This command is not designed for bot environment. It checks '
3196 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003197 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3198 if isinstance(authn, gerrit_util.GceAuthenticator):
3199 message += (
3200 '\n'
3201 'If you need to run this on GCE or a cloudtop instance, '
3202 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3203 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003204
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003205 checker = _GitCookiesChecker()
3206 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003207
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003208 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003209 checker.print_current_creds(include_netrc=True)
3210
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003211 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003212 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003213 return 0
3214 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003215
3216
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003217@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003218def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003219 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003220 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003221 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003222 _, args = parser.parse_args(args)
3223 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003224 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003225 return RunGit(['config', 'branch.%s.base-url' % branch],
3226 error_ok=False).strip()
3227 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003228 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003229 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3230 error_ok=False).strip()
3231
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003232
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003233def color_for_status(status):
3234 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003235 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003236 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003237 'unsent': BOLD + Fore.YELLOW,
3238 'waiting': BOLD + Fore.RED,
3239 'reply': BOLD + Fore.YELLOW,
3240 'not lgtm': BOLD + Fore.RED,
3241 'lgtm': BOLD + Fore.GREEN,
3242 'commit': BOLD + Fore.MAGENTA,
3243 'closed': BOLD + Fore.CYAN,
3244 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003245 }.get(status, Fore.WHITE)
3246
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003247
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003248def get_cl_statuses(changes, fine_grained, max_processes=None):
3249 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003250
3251 If fine_grained is true, this will fetch CL statuses from the server.
3252 Otherwise, simply indicate if there's a matching url for the given branches.
3253
3254 If max_processes is specified, it is used as the maximum number of processes
3255 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3256 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003257
3258 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003259 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003260 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003261 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003262
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003263 if not fine_grained:
3264 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003265 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003266 for cl in changes:
3267 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003268 return
3269
3270 # First, sort out authentication issues.
3271 logging.debug('ensuring credentials exist')
3272 for cl in changes:
3273 cl.EnsureAuthenticated(force=False, refresh=True)
3274
3275 def fetch(cl):
3276 try:
3277 return (cl, cl.GetStatus())
3278 except:
3279 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003280 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003281 raise
3282
3283 threads_count = len(changes)
3284 if max_processes:
3285 threads_count = max(1, min(threads_count, max_processes))
3286 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3287
Edward Lemur61bf4172020-02-24 23:22:37 +00003288 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003289 fetched_cls = set()
3290 try:
3291 it = pool.imap_unordered(fetch, changes).__iter__()
3292 while True:
3293 try:
3294 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003295 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003296 break
3297 fetched_cls.add(cl)
3298 yield cl, status
3299 finally:
3300 pool.close()
3301
3302 # Add any branches that failed to fetch.
3303 for cl in set(changes) - fetched_cls:
3304 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003305
rmistry@google.com2dd99862015-06-22 12:22:18 +00003306
Jose Lopes3863fc52020-04-07 17:00:25 +00003307def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003308 """Uploads CLs of local branches that are dependents of the current branch.
3309
3310 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003311
3312 test1 -> test2.1 -> test3.1
3313 -> test3.2
3314 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003315
3316 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3317 run on the dependent branches in this order:
3318 test2.1, test3.1, test3.2, test2.2, test3.3
3319
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003320 Note: This function does not rebase your local dependent branches. Use it
3321 when you make a change to the parent branch that will not conflict
3322 with its dependent branches, and you would like their dependencies
3323 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003324 """
3325 if git_common.is_dirty_git_tree('upload-branch-deps'):
3326 return 1
3327
3328 root_branch = cl.GetBranch()
3329 if root_branch is None:
3330 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3331 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003332 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003333 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3334 'patchset dependencies without an uploaded CL.')
3335
3336 branches = RunGit(['for-each-ref',
3337 '--format=%(refname:short) %(upstream:short)',
3338 'refs/heads'])
3339 if not branches:
3340 print('No local branches found.')
3341 return 0
3342
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003343 # Create a dictionary of all local branches to the branches that are
3344 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003345 tracked_to_dependents = collections.defaultdict(list)
3346 for b in branches.splitlines():
3347 tokens = b.split()
3348 if len(tokens) == 2:
3349 branch_name, tracked = tokens
3350 tracked_to_dependents[tracked].append(branch_name)
3351
vapiera7fbd5a2016-06-16 09:17:49 -07003352 print()
3353 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003354 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003355
rmistry@google.com2dd99862015-06-22 12:22:18 +00003356 def traverse_dependents_preorder(branch, padding=''):
3357 dependents_to_process = tracked_to_dependents.get(branch, [])
3358 padding += ' '
3359 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003360 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003361 dependents.append(dependent)
3362 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003363
rmistry@google.com2dd99862015-06-22 12:22:18 +00003364 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003365 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003366
3367 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003368 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003369 return 0
3370
Jose Lopes3863fc52020-04-07 17:00:25 +00003371 if not force:
3372 confirm_or_exit('This command will checkout all dependent branches and run '
3373 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003374
rmistry@google.com2dd99862015-06-22 12:22:18 +00003375 # Record all dependents that failed to upload.
3376 failures = {}
3377 # Go through all dependents, checkout the branch and upload.
3378 try:
3379 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003380 print()
3381 print('--------------------------------------')
3382 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003383 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003384 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003385 try:
3386 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003387 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003388 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003389 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003390 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003391 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003392 finally:
3393 # Swap back to the original root branch.
3394 RunGit(['checkout', '-q', root_branch])
3395
vapiera7fbd5a2016-06-16 09:17:49 -07003396 print()
3397 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003398 for dependent_branch in dependents:
3399 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003400 print(' %s : %s' % (dependent_branch, upload_status))
3401 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003402
3403 return 0
3404
3405
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003406def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003407 """Given a proposed tag name, returns a tag name that is guaranteed to be
3408 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3409 or 'foo-3', and so on."""
3410
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003411 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003412 for suffix_num in itertools.count(1):
3413 if suffix_num == 1:
3414 to_check = proposed_tag
3415 else:
3416 to_check = '%s-%d' % (proposed_tag, suffix_num)
3417
3418 if to_check not in existing_tags:
3419 return to_check
3420
3421
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003422@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003423def CMDarchive(parser, args):
3424 """Archives and deletes branches associated with closed changelists."""
3425 parser.add_option(
3426 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003427 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003428 parser.add_option(
3429 '-f', '--force', action='store_true',
3430 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003431 parser.add_option(
3432 '-d', '--dry-run', action='store_true',
3433 help='Skip the branch tagging and removal steps.')
3434 parser.add_option(
3435 '-t', '--notags', action='store_true',
3436 help='Do not tag archived branches. '
3437 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003438 parser.add_option(
3439 '-p',
3440 '--pattern',
3441 default='git-cl-archived-{issue}-{branch}',
3442 help='Format string for archive tags. '
3443 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003444
kmarshall3bff56b2016-06-06 18:31:47 -07003445 options, args = parser.parse_args(args)
3446 if args:
3447 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003448
3449 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3450 if not branches:
3451 return 0
3452
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003453 tags = RunGit(['for-each-ref', '--format=%(refname)',
3454 'refs/tags']).splitlines() or []
3455 tags = [t.split('/')[-1] for t in tags]
3456
vapiera7fbd5a2016-06-16 09:17:49 -07003457 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003458 changes = [Changelist(branchref=b)
3459 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003460 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3461 statuses = get_cl_statuses(changes,
3462 fine_grained=True,
3463 max_processes=options.maxjobs)
3464 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003465 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3466 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003467 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003468 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003469 proposal.sort()
3470
3471 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003472 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003473 return 0
3474
Edward Lemur85153282020-02-14 22:06:29 +00003475 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003476
vapiera7fbd5a2016-06-16 09:17:49 -07003477 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003478 if options.notags:
3479 for next_item in proposal:
3480 print(' ' + next_item[0])
3481 else:
3482 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3483 for next_item in proposal:
3484 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003485
kmarshall9249e012016-08-23 12:02:16 -07003486 # Quit now on precondition failure or if instructed by the user, either
3487 # via an interactive prompt or by command line flags.
3488 if options.dry_run:
3489 print('\nNo changes were made (dry run).\n')
3490 return 0
3491 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003492 print('You are currently on a branch \'%s\' which is associated with a '
3493 'closed codereview issue, so archive cannot proceed. Please '
3494 'checkout another branch and run this command again.' %
3495 current_branch)
3496 return 1
kmarshall9249e012016-08-23 12:02:16 -07003497 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003498 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003499 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003500 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003501 return 1
3502
3503 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003504 if not options.notags:
3505 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003506
3507 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3508 # Clean up the tag if we failed to delete the branch.
3509 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003510
vapiera7fbd5a2016-06-16 09:17:49 -07003511 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003512
3513 return 0
3514
3515
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003516@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003517def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003518 """Show status of changelists.
3519
3520 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003521 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003522 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003523 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003524 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003525 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003526 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003527 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003528
3529 Also see 'git cl comments'.
3530 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003531 parser.add_option(
3532 '--no-branch-color',
3533 action='store_true',
3534 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003535 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003536 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003537 parser.add_option('-f', '--fast', action='store_true',
3538 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003539 parser.add_option(
3540 '-j', '--maxjobs', action='store', type=int,
3541 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003542 parser.add_option(
3543 '-i', '--issue', type=int,
3544 help='Operate on this issue instead of the current branch\'s implicit '
3545 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003546 parser.add_option('-d',
3547 '--date-order',
3548 action='store_true',
3549 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003550 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003551 if args:
3552 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003553
iannuccie53c9352016-08-17 14:40:40 -07003554 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003555 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003556
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003557 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003558 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003559 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003560 if cl.GetIssue():
3561 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003562 elif options.field == 'id':
3563 issueid = cl.GetIssue()
3564 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003565 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003566 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003567 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003568 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003569 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003570 elif options.field == 'status':
3571 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003572 elif options.field == 'url':
3573 url = cl.GetIssueURL()
3574 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003575 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003576 return 0
3577
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003578 branches = RunGit([
3579 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3580 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003581 if not branches:
3582 print('No local branch found.')
3583 return 0
3584
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003585 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003586 Changelist(branchref=b, commit_date=ct)
3587 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3588 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003589 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003590 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003591 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003592 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003593
Edward Lemur85153282020-02-14 22:06:29 +00003594 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003595
3596 def FormatBranchName(branch, colorize=False):
3597 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3598 an asterisk when it is the current branch."""
3599
3600 asterisk = ""
3601 color = Fore.RESET
3602 if branch == current_branch:
3603 asterisk = "* "
3604 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003605 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003606
3607 if colorize:
3608 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003609 return asterisk + branch_name
3610
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003611 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003612
3613 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003614 if options.date_order:
3615 sorted_changes = sorted(changes,
3616 key=lambda c: c.GetCommitDate(),
3617 reverse=True)
3618 else:
3619 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3620 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003621 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003622 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003623 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003624 branch_statuses[c.GetBranch()] = status
3625 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003626 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003627 if url and (not status or status == 'error'):
3628 # The issue probably doesn't exist anymore.
3629 url += ' (broken)'
3630
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003631 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003632 # Turn off bold as well as colors.
3633 END = '\033[0m'
3634 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003635 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003636 color = ''
3637 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003638 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003639
Alan Cuttera3be9a52019-03-04 18:50:33 +00003640 branch_display = FormatBranchName(branch)
3641 padding = ' ' * (alignment - len(branch_display))
3642 if not options.no_branch_color:
3643 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003644
Alan Cuttera3be9a52019-03-04 18:50:33 +00003645 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3646 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003647
vapiera7fbd5a2016-06-16 09:17:49 -07003648 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003649 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003650 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003651 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003652 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003653 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003655 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003656 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003657 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003658 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003659 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003660 return 0
3661
3662
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003663def colorize_CMDstatus_doc():
3664 """To be called once in main() to add colors to git cl status help."""
3665 colors = [i for i in dir(Fore) if i[0].isupper()]
3666
3667 def colorize_line(line):
3668 for color in colors:
3669 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003670 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003671 indent = len(line) - len(line.lstrip(' ')) + 1
3672 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3673 return line
3674
3675 lines = CMDstatus.__doc__.splitlines()
3676 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3677
3678
phajdan.jre328cf92016-08-22 04:12:17 -07003679def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003680 if path == '-':
3681 json.dump(contents, sys.stdout)
3682 else:
3683 with open(path, 'w') as f:
3684 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003685
3686
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003687@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003688@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003689def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003690 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003691
3692 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003693 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003694 parser.add_option('-r', '--reverse', action='store_true',
3695 help='Lookup the branch(es) for the specified issues. If '
3696 'no issues are specified, all branches with mapped '
3697 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003698 parser.add_option('--json',
3699 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003700 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003701
dnj@chromium.org406c4402015-03-03 17:22:28 +00003702 if options.reverse:
3703 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003704 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003705 # Reverse issue lookup.
3706 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003707
3708 git_config = {}
3709 for config in RunGit(['config', '--get-regexp',
3710 r'branch\..*issue']).splitlines():
3711 name, _space, val = config.partition(' ')
3712 git_config[name] = val
3713
dnj@chromium.org406c4402015-03-03 17:22:28 +00003714 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003715 issue = git_config.get(
3716 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003717 if issue:
3718 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003719 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003720 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003721 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003722 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003723 try:
3724 issue_num = int(issue)
3725 except ValueError:
3726 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003727 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003728 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003729 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003730 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003731 if options.json:
3732 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003733 return 0
3734
3735 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003736 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003737 if not issue.valid:
3738 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3739 'or no argument to list it.\n'
3740 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003741 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003742 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003743 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003744 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003745 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3746 if options.json:
3747 write_json(options.json, {
3748 'issue': cl.GetIssue(),
3749 'issue_url': cl.GetIssueURL(),
3750 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003751 return 0
3752
3753
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003754@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003755def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003756 """Shows or posts review comments for any changelist."""
3757 parser.add_option('-a', '--add-comment', dest='comment',
3758 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003759 parser.add_option('-p', '--publish', action='store_true',
3760 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003761 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003762 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003763 parser.add_option('-m', '--machine-readable', dest='readable',
3764 action='store_false', default=True,
3765 help='output comments in a format compatible with '
3766 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003767 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003768 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003769 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003770
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003771 issue = None
3772 if options.issue:
3773 try:
3774 issue = int(options.issue)
3775 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003776 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003777
Edward Lemur934836a2019-09-09 20:16:54 +00003778 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003779
3780 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003781 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003782 return 0
3783
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003784 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3785 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003786 for comment in summary:
3787 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003788 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003789 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003790 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003791 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003792 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003793 elif comment.autogenerated:
3794 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003795 else:
3796 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003797 print('\n%s%s %s%s\n%s' % (
3798 color,
3799 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3800 comment.sender,
3801 Fore.RESET,
3802 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3803
smut@google.comc85ac942015-09-15 16:34:43 +00003804 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003805 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003806 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003807 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3808 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003809 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003810 return 0
3811
3812
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003813@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003814@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003815def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003816 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003817 parser.add_option('-d', '--display', action='store_true',
3818 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003819 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003820 help='New description to set for this issue (- for stdin, '
3821 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003822 parser.add_option('-f', '--force', action='store_true',
3823 help='Delete any unpublished Gerrit edits for this issue '
3824 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003825
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003826 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003827
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003828 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003829 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003830 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003831 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003832 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003833
Edward Lemur934836a2019-09-09 20:16:54 +00003834 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003835 if target_issue_arg:
3836 kwargs['issue'] = target_issue_arg.issue
3837 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003838
3839 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003840 if not cl.GetIssue():
3841 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003842
Edward Lemur678a6842019-10-03 22:25:05 +00003843 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003844 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003845
Edward Lemur6c6827c2020-02-06 21:15:18 +00003846 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003847
smut@google.com34fb6b12015-07-13 20:03:26 +00003848 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003849 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003850 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003851
3852 if options.new_description:
3853 text = options.new_description
3854 if text == '-':
3855 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003856 elif text == '+':
3857 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003858 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003859
3860 description.set_description(text)
3861 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003862 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003863 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003864 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003865 return 0
3866
3867
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003868@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003869def CMDlint(parser, args):
3870 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003871 parser.add_option('--filter', action='append', metavar='-x,+y',
3872 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003873 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003874
3875 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003876 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003877 try:
3878 import cpplint
3879 import cpplint_chromium
3880 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003882 return 1
3883
3884 # Change the current working directory before calling lint so that it
3885 # shows the correct base.
3886 previous_cwd = os.getcwd()
3887 os.chdir(settings.GetRoot())
3888 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003889 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003890 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003891 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003893 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003894
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003895 # Process cpplint arguments, if any.
3896 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3897 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003898 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003899
Lei Zhang379d1ad2020-07-15 19:40:06 +00003900 include_regex = re.compile(settings.GetLintRegex())
3901 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003902 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3903 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003904 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003906 continue
3907
3908 if ignore_regex.match(filename):
3909 print('Ignoring file %s' % filename)
3910 continue
3911
3912 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3913 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003914 finally:
3915 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003917 if cpplint._cpplint_state.error_count != 0:
3918 return 1
3919 return 0
3920
3921
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003922@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003923def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003924 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003925 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003926 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003927 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003928 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003929 parser.add_option('--all', action='store_true',
3930 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003931 parser.add_option('--parallel', action='store_true',
3932 help='Run all tests specified by input_api.RunTests in all '
3933 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003934 parser.add_option('--resultdb', action='store_true',
3935 help='Run presubmit checks in the ResultSink environment '
3936 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003937 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003938 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003939
sbc@chromium.org71437c02015-04-09 19:29:40 +00003940 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003941 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003942 return 1
3943
Edward Lemur934836a2019-09-09 20:16:54 +00003944 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003945 if args:
3946 base_branch = args[0]
3947 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003948 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003949 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003950
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003951 if cl.GetIssue():
3952 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003953 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003954 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003955
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003956 cl.RunHook(
3957 committing=not options.upload,
3958 may_prompt=False,
3959 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003960 parallel=options.parallel,
3961 upstream=base_branch,
3962 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003963 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003964 resultdb=options.resultdb,
3965 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003966 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003967
3968
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003969def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003970 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003971
3972 Works the same way as
3973 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3974 but can be called on demand on all platforms.
3975
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003976 The basic idea is to generate git hash of a state of the tree, original
3977 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003978 """
3979 lines = []
3980 tree_hash = RunGitSilent(['write-tree'])
3981 lines.append('tree %s' % tree_hash.strip())
3982 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3983 if code == 0:
3984 lines.append('parent %s' % parent.strip())
3985 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3986 lines.append('author %s' % author.strip())
3987 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3988 lines.append('committer %s' % committer.strip())
3989 lines.append('')
3990 # Note: Gerrit's commit-hook actually cleans message of some lines and
3991 # whitespace. This code is not doing this, but it clearly won't decrease
3992 # entropy.
3993 lines.append(message)
3994 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003995 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003996 return 'I%s' % change_hash.strip()
3997
3998
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003999def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004000 """Computes the remote branch ref to use for the CL.
4001
4002 Args:
4003 remote (str): The git remote for the CL.
4004 remote_branch (str): The git remote branch for the CL.
4005 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004006 """
4007 if not (remote and remote_branch):
4008 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004009
wittman@chromium.org455dc922015-01-26 20:15:50 +00004010 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004011 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004012 # refs, which are then translated into the remote full symbolic refs
4013 # below.
4014 if '/' not in target_branch:
4015 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4016 else:
4017 prefix_replacements = (
4018 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4019 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4020 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4021 )
4022 match = None
4023 for regex, replacement in prefix_replacements:
4024 match = re.search(regex, target_branch)
4025 if match:
4026 remote_branch = target_branch.replace(match.group(0), replacement)
4027 break
4028 if not match:
4029 # This is a branch path but not one we recognize; use as-is.
4030 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004031 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4032 # Handle the refs that need to land in different refs.
4033 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004034
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004035 # Migration to new default branch, only if available on remote.
4036 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4037 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4038 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4039 stderr=subprocess2.PIPE):
4040 # TODO(crbug.com/ID): Print location to local git migration script.
4041 print("WARNING: Using new branch name %s instead of %s" % (
4042 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4043 remote_branch = DEFAULT_NEW_BRANCH
4044
wittman@chromium.org455dc922015-01-26 20:15:50 +00004045 # Create the true path to the remote branch.
4046 # Does the following translation:
4047 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004048 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004049 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4050 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4051 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4052 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4053 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4054 'refs/heads/')
4055 elif remote_branch.startswith('refs/remotes/branch-heads'):
4056 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004057
wittman@chromium.org455dc922015-01-26 20:15:50 +00004058 return remote_branch
4059
4060
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004061def cleanup_list(l):
4062 """Fixes a list so that comma separated items are put as individual items.
4063
4064 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4065 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4066 """
4067 items = sum((i.split(',') for i in l), [])
4068 stripped_items = (i.strip() for i in items)
4069 return sorted(filter(None, stripped_items))
4070
4071
Aaron Gable4db38df2017-11-03 14:59:07 -07004072@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004073@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004074def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004075 """Uploads the current changelist to codereview.
4076
4077 Can skip dependency patchset uploads for a branch by running:
4078 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004079 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004080 git config --unset branch.branch_name.skip-deps-uploads
4081 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004082
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004083 If the name of the checked out branch starts with "bug-" or "fix-" followed
4084 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004085 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004086
4087 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004088 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004089 [git-cl] add support for hashtags
4090 Foo bar: implement foo
4091 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004092 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004093 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4094 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004095 parser.add_option('--bypass-watchlists', action='store_true',
4096 dest='bypass_watchlists',
4097 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004098 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004099 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004100 parser.add_option('--message', '-m', dest='message',
4101 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004102 parser.add_option('-b', '--bug',
4103 help='pre-populate the bug number(s) for this issue. '
4104 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004105 parser.add_option('--message-file', dest='message_file',
4106 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004107 parser.add_option('--title', '-t', dest='title',
4108 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004109 parser.add_option('-T', '--skip-title', action='store_true',
4110 dest='skip_title',
4111 help='Use the most recent commit message as the title of '
4112 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004113 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004114 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004115 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004116 parser.add_option('--tbrs',
4117 action='append', default=[],
4118 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004119 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004120 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004121 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004122 parser.add_option('--hashtag', dest='hashtags',
4123 action='append', default=[],
4124 help=('Gerrit hashtag for new CL; '
4125 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004126 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004127 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004128 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004129 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004130 metavar='TARGET',
4131 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004132 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004133 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004134 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004135 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004136 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004137 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004138 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004139 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4140 const='TBR', help='add a set of OWNERS to TBR')
4141 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4142 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004143 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004144 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004145 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004146 'implies --send-mail')
4147 parser.add_option('-d', '--cq-dry-run',
4148 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004149 help='Send the patchset to do a CQ dry run right after '
4150 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004151 parser.add_option('--set-bot-commit', action='store_true',
4152 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004153 parser.add_option('--preserve-tryjobs', action='store_true',
4154 help='instruct the CQ to let tryjobs running even after '
4155 'new patchsets are uploaded instead of canceling '
4156 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004157 parser.add_option('--dependencies', action='store_true',
4158 help='Uploads CLs of all the local branches that depend on '
4159 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004160 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4161 help='Sends your change to the CQ after an approval. Only '
4162 'works on repos that have the Auto-Submit label '
4163 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004164 parser.add_option('--parallel', action='store_true',
4165 help='Run all tests specified by input_api.RunTests in all '
4166 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004167 parser.add_option('--no-autocc', action='store_true',
4168 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004169 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004170 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004171 parser.add_option('-R', '--retry-failed', action='store_true',
4172 help='Retry failed tryjobs from old patchset immediately '
4173 'after uploading new patchset. Cannot be used with '
4174 '--use-commit-queue or --cq-dry-run.')
4175 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4176 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004177 parser.add_option('--fixed', '-x',
4178 help='List of bugs that will be commented on and marked '
4179 'fixed (pre-populates "Fixed:" tag). Same format as '
4180 '-b option / "Bug:" tag. If fixing several issues, '
4181 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004182 parser.add_option('--edit-description', action='store_true', default=False,
4183 help='Modify description before upload. Cannot be used '
4184 'with --force. It is a noop when --no-squash is set '
4185 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004186 parser.add_option('--git-completion-helper', action="store_true",
4187 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004188 parser.add_option('--resultdb', action='store_true',
4189 help='Run presubmit checks in the ResultSink environment '
4190 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004191 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004192
rmistry@google.com2dd99862015-06-22 12:22:18 +00004193 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004194 (options, args) = parser.parse_args(args)
4195
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004196 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004197 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4198 if opt.help != optparse.SUPPRESS_HELP))
4199 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004200
sbc@chromium.org71437c02015-04-09 19:29:40 +00004201 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004202 return 1
4203
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004204 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004205 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004206 options.cc = cleanup_list(options.cc)
4207
Josipe827b0f2020-01-30 00:07:20 +00004208 if options.edit_description and options.force:
4209 parser.error('Only one of --force and --edit-description allowed')
4210
tandriib80458a2016-06-23 12:20:07 -07004211 if options.message_file:
4212 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004213 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004214 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004215
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004216 if ([options.cq_dry_run,
4217 options.use_commit_queue,
4218 options.retry_failed].count(True) > 1):
4219 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4220 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004221
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004222 if options.skip_title and options.title:
4223 parser.error('Only one of --title and --skip-title allowed.')
4224
Aaron Gableedbc4132017-09-11 13:22:28 -07004225 if options.use_commit_queue:
4226 options.send_mail = True
4227
Edward Lesmes0dd54822020-03-26 18:24:25 +00004228 if options.squash is None:
4229 # Load default for user, repo, squash=true, in this order.
4230 options.squash = settings.GetSquashGerritUploads()
4231
Edward Lemur934836a2019-09-09 20:16:54 +00004232 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004233 # Warm change details cache now to avoid RPCs later, reducing latency for
4234 # developers.
4235 if cl.GetIssue():
4236 cl._GetChangeDetail(
4237 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4238
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004239 if options.retry_failed and not cl.GetIssue():
4240 print('No previous patchsets, so --retry-failed has no effect.')
4241 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004242
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004243 # cl.GetMostRecentPatchset uses cached information, and can return the last
4244 # patchset before upload. Calling it here makes it clear that it's the
4245 # last patchset before upload. Note that GetMostRecentPatchset will fail
4246 # if no CL has been uploaded yet.
4247 if options.retry_failed:
4248 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004249
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004250 ret = cl.CMDUpload(options, args, orig_args)
4251
4252 if options.retry_failed:
4253 if ret != 0:
4254 print('Upload failed, so --retry-failed has no effect.')
4255 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004256 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004257 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004258 jobs = _filter_failed_for_retry(builds)
4259 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004260 print('No failed tryjobs, so --retry-failed has no effect.')
4261 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004262 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004263
4264 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004265
4266
Francois Dorayd42c6812017-05-30 15:10:20 -04004267@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004268@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004269def CMDsplit(parser, args):
4270 """Splits a branch into smaller branches and uploads CLs.
4271
4272 Creates a branch and uploads a CL for each group of files modified in the
4273 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004274 comment, the string '$directory', is replaced with the directory containing
4275 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004276 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004277 parser.add_option('-d', '--description', dest='description_file',
4278 help='A text file containing a CL description in which '
4279 '$directory will be replaced by each CL\'s directory.')
4280 parser.add_option('-c', '--comment', dest='comment_file',
4281 help='A text file containing a CL comment.')
4282 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004283 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004284 help='List the files and reviewers for each CL that would '
4285 'be created, but don\'t create branches or CLs.')
4286 parser.add_option('--cq-dry-run', action='store_true',
4287 help='If set, will do a cq dry run for each uploaded CL. '
4288 'Please be careful when doing this; more than ~10 CLs '
4289 'has the potential to overload our build '
4290 'infrastructure. Try to upload these not during high '
4291 'load times (usually 11-3 Mountain View time). Email '
4292 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004293 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4294 default=True,
4295 help='Sends your change to the CQ after an approval. Only '
4296 'works on repos that have the Auto-Submit label '
4297 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004298 options, _ = parser.parse_args(args)
4299
4300 if not options.description_file:
4301 parser.error('No --description flag specified.')
4302
4303 def WrappedCMDupload(args):
4304 return CMDupload(OptionParser(), args)
4305
Edward Lemur2c62b332020-03-12 22:12:33 +00004306 return split_cl.SplitCl(
4307 options.description_file, options.comment_file, Changelist,
4308 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4309 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004310
4311
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004312@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004313@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004314def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004315 """DEPRECATED: Used to commit the current changelist via git-svn."""
4316 message = ('git-cl no longer supports committing to SVN repositories via '
4317 'git-svn. You probably want to use `git cl land` instead.')
4318 print(message)
4319 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004320
4321
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004322@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004323@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004324def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004325 """Commits the current changelist via git.
4326
4327 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4328 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004329 """
4330 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4331 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004332 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004333 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004334 parser.add_option('--parallel', action='store_true',
4335 help='Run all tests specified by input_api.RunTests in all '
4336 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004337 parser.add_option('--resultdb', action='store_true',
4338 help='Run presubmit checks in the ResultSink environment '
4339 'and send results to the ResultDB database.')
4340 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004341 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004342
Edward Lemur934836a2019-09-09 20:16:54 +00004343 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004344
Robert Iannucci2e73d432018-03-14 01:10:47 -07004345 if not cl.GetIssue():
4346 DieWithError('You must upload the change first to Gerrit.\n'
4347 ' If you would rather have `git cl land` upload '
4348 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004349 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4350 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004351
4352
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004353@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004354@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004355def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004356 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004357 parser.add_option('-b', dest='newbranch',
4358 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004359 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004360 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004361 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004362 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004363
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004364 group = optparse.OptionGroup(
4365 parser,
4366 'Options for continuing work on the current issue uploaded from a '
4367 'different clone (e.g. different machine). Must be used independently '
4368 'from the other options. No issue number should be specified, and the '
4369 'branch must have an issue number associated with it')
4370 group.add_option('--reapply', action='store_true', dest='reapply',
4371 help='Reset the branch and reapply the issue.\n'
4372 'CAUTION: This will undo any local changes in this '
4373 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004374
4375 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004376 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004377 parser.add_option_group(group)
4378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004379 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004380
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004381 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004382 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004383 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004384 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004385 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004386
Edward Lemur934836a2019-09-09 20:16:54 +00004387 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004388 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004389 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004390
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004391 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004392 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004393 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004394
4395 RunGit(['reset', '--hard', upstream])
4396 if options.pull:
4397 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004398
Edward Lemur678a6842019-10-03 22:25:05 +00004399 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004400 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4401 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004402
4403 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004404 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004405
Edward Lemurf38bc172019-09-03 21:02:13 +00004406 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004407 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004408 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004409
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004410 # We don't want uncommitted changes mixed up with the patch.
4411 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004412 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004413
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004414 if options.newbranch:
4415 if options.force:
4416 RunGit(['branch', '-D', options.newbranch],
4417 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004418 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004419
Edward Lemur678a6842019-10-03 22:25:05 +00004420 cl = Changelist(
4421 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004422
Edward Lemur678a6842019-10-03 22:25:05 +00004423 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004424 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004425
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004426 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4427 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428
4429
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004430def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431 """Fetches the tree status and returns either 'open', 'closed',
4432 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004433 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004434 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004435 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004436 if status.find('closed') != -1 or status == '0':
4437 return 'closed'
4438 elif status.find('open') != -1 or status == '1':
4439 return 'open'
4440 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441 return 'unset'
4442
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004443
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004444def GetTreeStatusReason():
4445 """Fetches the tree status from a json url and returns the message
4446 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004447 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004448 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004449 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004450 status = json.loads(connection.read())
4451 connection.close()
4452 return status['message']
4453
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004454
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004455@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004456def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004457 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004458 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459 status = GetTreeStatus()
4460 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004461 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462 return 2
4463
vapiera7fbd5a2016-06-16 09:17:49 -07004464 print('The tree is %s' % status)
4465 print()
4466 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004467 if status != 'open':
4468 return 1
4469 return 0
4470
4471
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004472@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004473def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004474 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4475 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004476 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004477 '-b', '--bot', action='append',
4478 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4479 'times to specify multiple builders. ex: '
4480 '"-b win_rel -b win_layout". See '
4481 'the try server waterfall for the builders name and the tests '
4482 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004483 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004484 '-B', '--bucket', default='',
4485 help=('Buildbucket bucket to send the try requests.'))
4486 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004487 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004488 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004489 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004490 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004491 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004492 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004493 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004494 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004495 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004496 '--category', default='git_cl_try', help='Specify custom build category.')
4497 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004498 '--project',
4499 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004500 'in recipe to determine to which repository or directory to '
4501 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004502 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004503 '-p', '--property', dest='properties', action='append', default=[],
4504 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004505 'key2=value2 etc. The value will be treated as '
4506 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004507 'NOTE: using this may make your tryjob not usable for CQ, '
4508 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004509 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004510 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4511 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004512 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004513 parser.add_option(
4514 '-R', '--retry-failed', action='store_true', default=False,
4515 help='Retry failed jobs from the latest set of tryjobs. '
4516 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004517 parser.add_option(
4518 '-i', '--issue', type=int,
4519 help='Operate on this issue instead of the current branch\'s implicit '
4520 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004521 options, args = parser.parse_args(args)
4522
machenbach@chromium.org45453142015-09-15 08:45:22 +00004523 # Make sure that all properties are prop=value pairs.
4524 bad_params = [x for x in options.properties if '=' not in x]
4525 if bad_params:
4526 parser.error('Got properties with missing "=": %s' % bad_params)
4527
maruel@chromium.org15192402012-09-06 12:38:29 +00004528 if args:
4529 parser.error('Unknown arguments: %s' % args)
4530
Edward Lemur934836a2019-09-09 20:16:54 +00004531 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004532 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004533 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004534
Edward Lemurf38bc172019-09-03 21:02:13 +00004535 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004536 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004537
tandriie113dfd2016-10-11 10:20:12 -07004538 error_message = cl.CannotTriggerTryJobReason()
4539 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004540 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004541
Edward Lemur45768512020-03-02 19:03:14 +00004542 if options.bot:
4543 if options.retry_failed:
4544 parser.error('--bot is not compatible with --retry-failed.')
4545 if not options.bucket:
4546 parser.error('A bucket (e.g. "chromium/try") is required.')
4547
4548 triggered = [b for b in options.bot if 'triggered' in b]
4549 if triggered:
4550 parser.error(
4551 'Cannot schedule builds on triggered bots: %s.\n'
4552 'This type of bot requires an initial job from a parent (usually a '
4553 'builder). Schedule a job on the parent instead.\n' % triggered)
4554
4555 if options.bucket.startswith('.master'):
4556 parser.error('Buildbot masters are not supported.')
4557
4558 project, bucket = _parse_bucket(options.bucket)
4559 if project is None or bucket is None:
4560 parser.error('Invalid bucket: %s.' % options.bucket)
4561 jobs = sorted((project, bucket, bot) for bot in options.bot)
4562 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004563 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004564 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004565 if options.verbose:
4566 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004567 jobs = _filter_failed_for_retry(builds)
4568 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004569 print('There are no failed jobs in the latest set of jobs '
4570 '(patchset #%d), doing nothing.' % patchset)
4571 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004572 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004573 if num_builders > 10:
4574 confirm_or_exit('There are %d builders with failed builds.'
4575 % num_builders, action='continue')
4576 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004577 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004578 print('git cl try with no bots now defaults to CQ dry run.')
4579 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4580 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004581
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004582 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004583 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004584 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004585 except BuildbucketResponseException as ex:
4586 print('ERROR: %s' % ex)
4587 return 1
4588 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004589
4590
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004591@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004592def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004593 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004594 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004595 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004596 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004597 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004598 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004599 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004600 '--color', action='store_true', default=setup_color.IS_TTY,
4601 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004602 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004603 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4604 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004605 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004606 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004607 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004608 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004609 parser.add_option(
4610 '-i', '--issue', type=int,
4611 help='Operate on this issue instead of the current branch\'s implicit '
4612 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004613 options, args = parser.parse_args(args)
4614 if args:
4615 parser.error('Unrecognized args: %s' % ' '.join(args))
4616
Edward Lemur934836a2019-09-09 20:16:54 +00004617 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004618 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004619 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004620
tandrii221ab252016-10-06 08:12:04 -07004621 patchset = options.patchset
4622 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004623 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004624 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004625 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004626 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004627 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004628 cl.GetIssue())
4629
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004630 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004631 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004632 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004633 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004634 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004635 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004636 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004637 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004638 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004639 return 0
4640
4641
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004642@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004643@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004645 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004646 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004647 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004648 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004649
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004651 if args:
4652 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004653 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004654 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004655 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004656 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004657
4658 # Clear configured merge-base, if there is one.
4659 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004660 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004661 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004662 return 0
4663
4664
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004665@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004666def CMDweb(parser, args):
4667 """Opens the current CL in the web browser."""
4668 _, args = parser.parse_args(args)
4669 if args:
4670 parser.error('Unrecognized args: %s' % ' '.join(args))
4671
4672 issue_url = Changelist().GetIssueURL()
4673 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004674 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004675 return 1
4676
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004677 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004678 # allows us to hide the "Created new window in existing browser session."
4679 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004680 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004681 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004682 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004683 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004684 os.open(os.devnull, os.O_RDWR)
4685 try:
4686 webbrowser.open(issue_url)
4687 finally:
4688 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004689 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004690 return 0
4691
4692
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004693@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004694def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004695 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004696 parser.add_option('-d', '--dry-run', action='store_true',
4697 help='trigger in dry run mode')
4698 parser.add_option('-c', '--clear', action='store_true',
4699 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004700 parser.add_option(
4701 '-i', '--issue', type=int,
4702 help='Operate on this issue instead of the current branch\'s implicit '
4703 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004704 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004705 if args:
4706 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004707 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004708 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004709
Edward Lemur934836a2019-09-09 20:16:54 +00004710 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004711 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004712 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004713 elif options.dry_run:
4714 state = _CQState.DRY_RUN
4715 else:
4716 state = _CQState.COMMIT
4717 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004718 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004719 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004720 return 0
4721
4722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004723@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004724def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004725 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004726 parser.add_option(
4727 '-i', '--issue', type=int,
4728 help='Operate on this issue instead of the current branch\'s implicit '
4729 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004730 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004731 if args:
4732 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004733 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004734 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004735 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004736 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004737 cl.CloseIssue()
4738 return 0
4739
4740
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004741@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004742def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004743 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004744 parser.add_option(
4745 '--stat',
4746 action='store_true',
4747 dest='stat',
4748 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004749 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004750 if args:
4751 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004752
Edward Lemur934836a2019-09-09 20:16:54 +00004753 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004754 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004755 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004756 if not issue:
4757 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004758
Aaron Gablea718c3e2017-08-28 17:47:28 -07004759 base = cl._GitGetBranchConfigValue('last-upload-hash')
4760 if not base:
4761 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4762 if not base:
4763 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4764 revision_info = detail['revisions'][detail['current_revision']]
4765 fetch_info = revision_info['fetch']['http']
4766 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4767 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004768
Aaron Gablea718c3e2017-08-28 17:47:28 -07004769 cmd = ['git', 'diff']
4770 if options.stat:
4771 cmd.append('--stat')
4772 cmd.append(base)
4773 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004774
4775 return 0
4776
4777
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004778@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004779def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004780 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004781 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004782 '--ignore-current',
4783 action='store_true',
4784 help='Ignore the CL\'s current reviewers and start from scratch.')
4785 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004786 '--ignore-self',
4787 action='store_true',
4788 help='Do not consider CL\'s author as an owners.')
4789 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004790 '--no-color',
4791 action='store_true',
4792 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004793 parser.add_option(
4794 '--batch',
4795 action='store_true',
4796 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004797 # TODO: Consider moving this to another command, since other
4798 # git-cl owners commands deal with owners for a given CL.
4799 parser.add_option(
4800 '--show-all',
4801 action='store_true',
4802 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004803 options, args = parser.parse_args(args)
4804
Edward Lemur934836a2019-09-09 20:16:54 +00004805 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004806 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004807
Yang Guo6e269a02019-06-26 11:17:02 +00004808 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004809 if len(args) == 0:
4810 print('No files specified for --show-all. Nothing to do.')
4811 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004812 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004813 for path in args:
4814 print('Owners for %s:' % path)
4815 print('\n'.join(
4816 ' - %s' % owner
4817 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004818 return 0
4819
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004820 if args:
4821 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004822 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004823 base_branch = args[0]
4824 else:
4825 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004826 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004827
Edward Lemur2c62b332020-03-12 22:12:33 +00004828 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004829
4830 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004831 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
4832 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07004833 return 0
4834
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004835 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004836 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01004837 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004838 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00004839 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004840 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004841 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004842
4843
Aiden Bennerc08566e2018-10-03 17:52:42 +00004844def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004845 """Generates a diff command."""
4846 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004847 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4848
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004849 if allow_prefix:
4850 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4851 # case that diff.noprefix is set in the user's git config.
4852 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4853 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004854 diff_cmd += ['--no-prefix']
4855
4856 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004857
4858 if args:
4859 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004860 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004861 diff_cmd.append(arg)
4862 else:
4863 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004864
4865 return diff_cmd
4866
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004867
Jamie Madill5e96ad12020-01-13 16:08:35 +00004868def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4869 """Runs clang-format-diff and sets a return value if necessary."""
4870
4871 if not clang_diff_files:
4872 return 0
4873
4874 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4875 # formatted. This is used to block during the presubmit.
4876 return_value = 0
4877
4878 # Locate the clang-format binary in the checkout
4879 try:
4880 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4881 except clang_format.NotFoundError as e:
4882 DieWithError(e)
4883
4884 if opts.full or settings.GetFormatFullByDefault():
4885 cmd = [clang_format_tool]
4886 if not opts.dry_run and not opts.diff:
4887 cmd.append('-i')
4888 if opts.dry_run:
4889 for diff_file in clang_diff_files:
4890 with open(diff_file, 'r') as myfile:
4891 code = myfile.read().replace('\r\n', '\n')
4892 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4893 stdout = stdout.replace('\r\n', '\n')
4894 if opts.diff:
4895 sys.stdout.write(stdout)
4896 if code != stdout:
4897 return_value = 2
4898 else:
4899 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4900 if opts.diff:
4901 sys.stdout.write(stdout)
4902 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004903 try:
4904 script = clang_format.FindClangFormatScriptInChromiumTree(
4905 'clang-format-diff.py')
4906 except clang_format.NotFoundError as e:
4907 DieWithError(e)
4908
Edward Lesmes89624cd2020-04-06 17:51:56 +00004909 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004910 if not opts.dry_run and not opts.diff:
4911 cmd.append('-i')
4912
4913 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004914 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004915
Edward Lesmes89624cd2020-04-06 17:51:56 +00004916 env = os.environ.copy()
4917 env['PATH'] = (
4918 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4919 stdout = RunCommand(
4920 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004921 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004922 if opts.diff:
4923 sys.stdout.write(stdout)
4924 if opts.dry_run and len(stdout) > 0:
4925 return_value = 2
4926
4927 return return_value
4928
4929
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004930def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004931 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004932 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004933
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004934
enne@chromium.org555cfe42014-01-29 18:21:39 +00004935@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004936@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004937def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004938 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004939 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004940 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004941 parser.add_option('--full', action='store_true',
4942 help='Reformat the full content of all touched files')
4943 parser.add_option('--dry-run', action='store_true',
4944 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004945 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004946 '--no-clang-format',
4947 dest='clang_format',
4948 action='store_false',
4949 default=True,
4950 help='Disables formatting of various file types using clang-format.')
4951 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004952 '--python',
4953 action='store_true',
4954 default=None,
4955 help='Enables python formatting on all python files.')
4956 parser.add_option(
4957 '--no-python',
4958 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004959 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004960 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004961 'If neither --python or --no-python are set, python files that have a '
4962 '.style.yapf file in an ancestor directory will be formatted. '
4963 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004964 parser.add_option(
4965 '--js',
4966 action='store_true',
4967 help='Format javascript code with clang-format. '
4968 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004969 parser.add_option('--diff', action='store_true',
4970 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004971 parser.add_option('--presubmit', action='store_true',
4972 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004973 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004974
Garrett Beaty91a6f332020-01-06 16:57:24 +00004975 if opts.python is not None and opts.no_python:
4976 raise parser.error('Cannot set both --python and --no-python')
4977 if opts.no_python:
4978 opts.python = False
4979
Daniel Chengc55eecf2016-12-30 03:11:02 -08004980 # Normalize any remaining args against the current path, so paths relative to
4981 # the current directory are still resolved as expected.
4982 args = [os.path.join(os.getcwd(), arg) for arg in args]
4983
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004984 # git diff generates paths against the root of the repository. Change
4985 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004986 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004987 if rel_base_path:
4988 os.chdir(rel_base_path)
4989
digit@chromium.org29e47272013-05-17 17:01:46 +00004990 # Grab the merge-base commit, i.e. the upstream commit of the current
4991 # branch when it was created or the last time it was rebased. This is
4992 # to cover the case where the user may have called "git fetch origin",
4993 # moving the origin branch to a newer commit, but hasn't rebased yet.
4994 upstream_commit = None
4995 cl = Changelist()
4996 upstream_branch = cl.GetUpstreamBranch()
4997 if upstream_branch:
4998 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4999 upstream_commit = upstream_commit.strip()
5000
5001 if not upstream_commit:
5002 DieWithError('Could not find base commit for this branch. '
5003 'Are you in detached state?')
5004
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005005 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5006 diff_output = RunGit(changed_files_cmd)
5007 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005008 # Filter out files deleted by this CL
5009 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005010
Andreas Haas417d89c2020-02-06 10:24:27 +00005011 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005012 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005013
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005014 clang_diff_files = []
5015 if opts.clang_format:
5016 clang_diff_files = [
5017 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5018 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005019 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005020 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005021
Edward Lesmes50da7702020-03-30 19:23:43 +00005022 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005023
Jamie Madill5e96ad12020-01-13 16:08:35 +00005024 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5025 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005026
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005027 # Similar code to above, but using yapf on .py files rather than clang-format
5028 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005029 py_explicitly_disabled = opts.python is not None and not opts.python
5030 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005031 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5032 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005033
Aiden Bennerc08566e2018-10-03 17:52:42 +00005034 # Used for caching.
5035 yapf_configs = {}
5036 for f in python_diff_files:
5037 # Find the yapf style config for the current file, defaults to depot
5038 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005039 _FindYapfConfigFile(f, yapf_configs, top_dir)
5040
5041 # Turn on python formatting by default if a yapf config is specified.
5042 # This breaks in the case of this repo though since the specified
5043 # style file is also the global default.
5044 if opts.python is None:
5045 filtered_py_files = []
5046 for f in python_diff_files:
5047 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5048 filtered_py_files.append(f)
5049 else:
5050 filtered_py_files = python_diff_files
5051
5052 # Note: yapf still seems to fix indentation of the entire file
5053 # even if line ranges are specified.
5054 # See https://github.com/google/yapf/issues/499
5055 if not opts.full and filtered_py_files:
5056 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5057
Brian Sheedyb4307d52019-12-02 19:18:17 +00005058 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5059 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5060 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005061
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005062 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005063 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5064 # Default to pep8 if not .style.yapf is found.
5065 if not yapf_style:
5066 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005067
Peter Wend9399922020-06-17 17:33:49 +00005068 with open(f, 'r') as py_f:
5069 if 'python3' in py_f.readline():
5070 vpython_script = 'vpython3'
5071 else:
5072 vpython_script = 'vpython'
5073
5074 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005075
5076 has_formattable_lines = False
5077 if not opts.full:
5078 # Only run yapf over changed line ranges.
5079 for diff_start, diff_len in py_line_diffs[f]:
5080 diff_end = diff_start + diff_len - 1
5081 # Yapf errors out if diff_end < diff_start but this
5082 # is a valid line range diff for a removal.
5083 if diff_end >= diff_start:
5084 has_formattable_lines = True
5085 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5086 # If all line diffs were removals we have nothing to format.
5087 if not has_formattable_lines:
5088 continue
5089
5090 if opts.diff or opts.dry_run:
5091 cmd += ['--diff']
5092 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005093 stdout = RunCommand(cmd,
5094 error_ok=True,
5095 cwd=top_dir,
5096 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005097 if opts.diff:
5098 sys.stdout.write(stdout)
5099 elif len(stdout) > 0:
5100 return_value = 2
5101 else:
5102 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005103 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005104
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005105 # Format GN build files. Always run on full build files for canonical form.
5106 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005107 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005108 if opts.dry_run or opts.diff:
5109 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005110 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005111 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005112 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005113 cwd=top_dir)
5114 if opts.dry_run and gn_ret == 2:
5115 return_value = 2 # Not formatted.
5116 elif opts.diff and gn_ret == 2:
5117 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005118 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005119 elif gn_ret != 0:
5120 # For non-dry run cases (and non-2 return values for dry-run), a
5121 # nonzero error code indicates a failure, probably because the file
5122 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005123 DieWithError('gn format failed on ' + gn_diff_file +
5124 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005125
Ilya Shermane081cbe2017-08-15 17:51:04 -07005126 # Skip the metrics formatting from the global presubmit hook. These files have
5127 # a separate presubmit hook that issues an error if the files need formatting,
5128 # whereas the top-level presubmit script merely issues a warning. Formatting
5129 # these files is somewhat slow, so it's important not to duplicate the work.
5130 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005131 for diff_xml in GetDiffXMLs(diff_files):
5132 xml_dir = GetMetricsDir(diff_xml)
5133 if not xml_dir:
5134 continue
5135
Ilya Shermane081cbe2017-08-15 17:51:04 -07005136 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005137 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5138 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005139
5140 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5141 # command as histograms/pretty_print.py now needs a relative path argument
5142 # after splitting the histograms into multiple directories.
5143 # For example, in tools/metrics/ukm, pretty-print could be run using:
5144 # $ python pretty_print.py
5145 # But in tools/metrics/histogrmas, pretty-print should be run with an
5146 # additional relative path argument, like:
5147 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5148 # $ python pretty_print.py enums.xml
5149
5150 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5151 # version of histograms/pretty_print.py is released.
5152 filepath_required = os.path.exists(
5153 os.path.join(tool_dir, 'validate_prefix.py'))
5154
Weilun Shib92c4b72020-08-27 17:45:11 +00005155 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5156 or diff_xml.endswith('histogram_suffixes_list.xml')
5157 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005158 cmd.append(diff_xml)
5159
Ilya Shermane081cbe2017-08-15 17:51:04 -07005160 if opts.dry_run or opts.diff:
5161 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005162
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005163 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5164 # `shell` param and instead replace `'vpython'` with
5165 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005166 stdout = RunCommand(cmd,
5167 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005168 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005169 if opts.diff:
5170 sys.stdout.write(stdout)
5171 if opts.dry_run and stdout:
5172 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005173
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005174 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005175
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005176
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005177def GetDiffXMLs(diff_files):
5178 return [
5179 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5180 ]
5181
5182
5183def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005184 metrics_xml_dirs = [
5185 os.path.join('tools', 'metrics', 'actions'),
5186 os.path.join('tools', 'metrics', 'histograms'),
5187 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005188 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005189 os.path.join('tools', 'metrics', 'ukm'),
5190 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005191 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005192 if diff_xml.startswith(xml_dir):
5193 return xml_dir
5194 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005195
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005196
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005197@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005198@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005199def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005200 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005201 _, args = parser.parse_args(args)
5202
5203 if len(args) != 1:
5204 parser.print_help()
5205 return 1
5206
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005207 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005208 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005209 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005210
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005211 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005212
Edward Lemur52969c92020-02-06 18:15:28 +00005213 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005214 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005215 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005216
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005217 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005218 for key, issue in [x.split() for x in output.splitlines()]:
5219 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005220 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005221
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005222 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005223 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005224 return 1
5225 if len(branches) == 1:
5226 RunGit(['checkout', branches[0]])
5227 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005228 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005229 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005230 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005231 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005232 try:
5233 RunGit(['checkout', branches[int(which)]])
5234 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005235 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005236 return 1
5237
5238 return 0
5239
5240
maruel@chromium.org29404b52014-09-08 22:58:00 +00005241def CMDlol(parser, args):
5242 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005243 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005244 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5245 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5246 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005247 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005248 return 0
5249
5250
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005251class OptionParser(optparse.OptionParser):
5252 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005253
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005254 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005255 optparse.OptionParser.__init__(
5256 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005257 self.add_option(
5258 '-v', '--verbose', action='count', default=0,
5259 help='Use 2 times for more debugging info')
5260
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005261 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005262 try:
5263 return self._parse_args(args)
5264 finally:
5265 # Regardless of success or failure of args parsing, we want to report
5266 # metrics, but only after logging has been initialized (if parsing
5267 # succeeded).
5268 global settings
5269 settings = Settings()
5270
5271 if not metrics.DISABLE_METRICS_COLLECTION:
5272 # GetViewVCUrl ultimately calls logging method.
5273 project_url = settings.GetViewVCUrl().strip('/+')
5274 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5275 metrics.collector.add('project_urls', [project_url])
5276
5277 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005278 # Create an optparse.Values object that will store only the actual passed
5279 # options, without the defaults.
5280 actual_options = optparse.Values()
5281 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5282 # Create an optparse.Values object with the default options.
5283 options = optparse.Values(self.get_default_values().__dict__)
5284 # Update it with the options passed by the user.
5285 options._update_careful(actual_options.__dict__)
5286 # Store the options passed by the user in an _actual_options attribute.
5287 # We store only the keys, and not the values, since the values can contain
5288 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005289 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005290
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005291 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005292 logging.basicConfig(
5293 level=levels[min(options.verbose, len(levels) - 1)],
5294 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5295 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005296
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005297 return options, args
5298
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005299
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005300def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005301 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005302 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005303 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005304 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005305
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005306 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005307 dispatcher = subcommand.CommandDispatcher(__name__)
5308 try:
5309 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005310 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005311 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005312 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005313 if e.code != 500:
5314 raise
5315 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005316 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005317 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005318 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005319
5320
5321if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005322 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5323 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005324 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005325 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005326 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005327 sys.exit(main(sys.argv[1:]))