blob: 4a054be41d8b24b50078921e01a3437e85b8ea2a [file] [log] [blame]
Edward Lemur1f3bafb2019-10-08 17:56:33 +00001#!/usr/bin/env vpython
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
49import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040051import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000052import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000053import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from third_party import six
57from six.moves import urllib
58
59
60if sys.version_info.major == 3:
61 basestring = (str,) # pylint: disable=redefined-builtin
62
Edward Lemurb9830242019-10-30 22:19:20 +000063
tandrii7400cf02016-06-21 08:48:07 -070064__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065
Edward Lemur0f58ae42019-04-30 17:24:12 +000066# Traces for git push will be stored in a traces directory inside the
67# depot_tools checkout.
68DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
69TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000070PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000071
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800104POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000105DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000106REFS_THAT_ALIAS_TO_OTHER_REFS = {
107 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
108 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
109}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000110
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000111DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
112DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
113
thestig@chromium.org44202a22014-03-11 19:22:18 +0000114# Valid extensions for files we want to lint.
115DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
116DEFAULT_LINT_IGNORE_REGEX = r"$^"
117
Aiden Bennerc08566e2018-10-03 17:52:42 +0000118# File name for yapf style config files.
119YAPF_CONFIG_FILENAME = '.style.yapf'
120
Edward Lesmes50da7702020-03-30 19:23:43 +0000121# The issue, patchset and codereview server are stored on git config for each
122# branch under branch.<branch-name>.<config-key>.
123ISSUE_CONFIG_KEY = 'gerritissue'
124PATCHSET_CONFIG_KEY = 'gerritpatchset'
125CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
126
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000127# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000128Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000129
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000130# Initialized in main()
131settings = None
132
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100133# Used by tests/git_cl_test.py to add extra logging.
134# Inside the weirdly failing test, add this:
135# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700136# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100137_IS_BEING_TESTED = False
138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000140_KNOWN_GERRIT_TO_SHORT_URLS = {
141 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
142 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
143}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000144assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
145 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000146
147
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000148class GitPushError(Exception):
149 pass
150
151
Christopher Lamf732cd52017-01-24 12:40:11 +1100152def DieWithError(message, change_desc=None):
153 if change_desc:
154 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000155 print('\n ** Content of CL description **\n' +
156 '='*72 + '\n' +
157 change_desc.description + '\n' +
158 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100159
vapiera7fbd5a2016-06-16 09:17:49 -0700160 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161 sys.exit(1)
162
163
Christopher Lamf732cd52017-01-24 12:40:11 +1100164def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000165 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000166 print('\nsaving CL description to %s\n' % backup_path)
Josip906bfde2020-01-31 22:38:49 +0000167 with open(backup_path, 'w') as backup_file:
168 backup_file.write(change_desc.description)
Christopher Lamf732cd52017-01-24 12:40:11 +1100169
170
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000171def GetNoGitPagerEnv():
172 env = os.environ.copy()
173 # 'cat' is a magical git string that disables pagers on all platforms.
174 env['GIT_PAGER'] = 'cat'
175 return env
176
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000177
bsep@chromium.org627d9002016-04-29 00:00:52 +0000178def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000179 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000180 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
181 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000182 except subprocess2.CalledProcessError as e:
183 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000184 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000185 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
186 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Edward Lemur79d4f992019-11-11 23:49:02 +0000187 return e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000188
189
190def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000191 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000195def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700197 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000198 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700199 else:
200 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000201 try:
tandrii5d48c322016-08-18 16:19:37 -0700202 (out, _), code = subprocess2.communicate(['git'] + args,
203 env=GetNoGitPagerEnv(),
204 stdout=subprocess2.PIPE,
205 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000206 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700207 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900208 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000210
211
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000212def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000213 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000214 return RunGitWithCode(args, suppress_stderr=True)[1]
215
216
tandrii2a16b952016-10-19 07:09:44 -0700217def time_sleep(seconds):
218 # Use this so that it can be mocked in tests without interfering with python
219 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700220 return time.sleep(seconds)
221
222
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000223def time_time():
224 # Use this so that it can be mocked in tests without interfering with python
225 # system machinery.
226 return time.time()
227
228
Edward Lemur1b52d872019-05-09 21:12:12 +0000229def datetime_now():
230 # Use this so that it can be mocked in tests without interfering with python
231 # system machinery.
232 return datetime.datetime.now()
233
234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235def confirm_or_exit(prefix='', action='confirm'):
236 """Asks user to press enter to continue or press Ctrl+C to abort."""
237 if not prefix or prefix.endswith('\n'):
238 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100239 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240 mid = ' Press'
241 elif prefix.endswith(' '):
242 mid = 'press'
243 else:
244 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000245 gclient_utils.AskForData(
246 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100247
248
249def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000250 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000251 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252 while True:
253 if 'yes'.startswith(result):
254 return True
255 if 'no'.startswith(result):
256 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000257 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100258
259
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000261 prop_list = getattr(options, 'properties', [])
262 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000263 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000264 try:
265 properties[key] = json.loads(val)
266 except ValueError:
267 pass # If a value couldn't be evaluated, treat it as a string.
268 return properties
269
270
Edward Lemur4c707a22019-09-24 21:13:43 +0000271def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000272 """Calls a buildbucket v2 method and returns the parsed json response."""
273 headers = {
274 'Accept': 'application/json',
275 'Content-Type': 'application/json',
276 }
277 request = json.dumps(request)
278 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
279
280 logging.info('POST %s with %s' % (url, request))
281
282 attempts = 1
283 time_to_sleep = 1
284 while True:
285 response, content = http.request(url, 'POST', body=request, headers=headers)
286 if response.status == 200:
287 return json.loads(content[4:])
288 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
289 msg = '%s error when calling POST %s with %s: %s' % (
290 response.status, url, request, content)
291 raise BuildbucketResponseException(msg)
292 logging.debug(
293 '%s error when calling POST %s with %s. '
294 'Sleeping for %d seconds and retrying...' % (
295 response.status, url, request, time_to_sleep))
296 time.sleep(time_to_sleep)
297 time_to_sleep *= 2
298 attempts += 1
299
300 assert False, 'unreachable'
301
302
Edward Lemur6215c792019-10-03 21:59:05 +0000303def _parse_bucket(raw_bucket):
304 legacy = True
305 project = bucket = None
306 if '/' in raw_bucket:
307 legacy = False
308 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000309 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000310 elif raw_bucket.startswith('luci.'):
311 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000312 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000313 elif '.' in raw_bucket:
314 project = raw_bucket.split('.')[0]
315 bucket = raw_bucket
316 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000317 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000318 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
319 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000320
321
Quinten Yearsley777660f2020-03-04 23:37:06 +0000322def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000323 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700324
325 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000326 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000327 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700328 options: Command-line options.
329 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000331 for project, bucket, builder in jobs:
332 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333 print('To see results here, run: git cl try-results')
334 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700335
Quinten Yearsley777660f2020-03-04 23:37:06 +0000336 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000337 if not requests:
338 return
339
Edward Lemur5b929a42019-10-21 17:57:39 +0000340 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000341 http.force_exception_to_status_code = True
342
343 batch_request = {'requests': requests}
344 batch_response = _call_buildbucket(
345 http, options.buildbucket_host, 'Batch', batch_request)
346
347 errors = [
348 ' ' + response['error']['message']
349 for response in batch_response.get('responses', [])
350 if 'error' in response
351 ]
352 if errors:
353 raise BuildbucketResponseException(
354 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
355
356
Quinten Yearsley777660f2020-03-04 23:37:06 +0000357def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000358 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000359 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000360 shared_properties = {
361 'category': options.ensure_value('category', 'git_cl_try')
362 }
363 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000364 shared_properties['clobber'] = True
365 shared_properties.update(_get_properties_from_options(options) or {})
366
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000367 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000368 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000369 shared_tags.append({'key': 'retry_failed',
370 'value': '1'})
371
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000372 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000373 for (project, bucket, builder) in jobs:
374 properties = shared_properties.copy()
375 if 'presubmit' in builder.lower():
376 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377
Edward Lemur45768512020-03-02 19:03:14 +0000378 requests.append({
379 'scheduleBuild': {
380 'requestId': str(uuid.uuid4()),
381 'builder': {
382 'project': getattr(options, 'project', None) or project,
383 'bucket': bucket,
384 'builder': builder,
385 },
386 'gerritChanges': gerrit_changes,
387 'properties': properties,
388 'tags': [
389 {'key': 'builder', 'value': builder},
390 ] + shared_tags,
391 }
392 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000393
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000394 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000395 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000396 requests[-1]['scheduleBuild']['gitilesCommit'] = {
397 'host': gerrit_changes[0]['host'],
398 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000399 'id': options.revision,
400 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000401 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000402
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000403 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000404
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000405
Quinten Yearsley777660f2020-03-04 23:37:06 +0000406def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000407 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000408
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000409 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000410 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000411 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000412 request = {
413 'predicate': {
414 'gerritChanges': [changelist.GetGerritChange(patchset)],
415 },
416 'fields': ','.join('builds.*.' + field for field in fields),
417 }
tandrii221ab252016-10-06 08:12:04 -0700418
Edward Lemur5b929a42019-10-21 17:57:39 +0000419 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000420 if authenticator.has_cached_credentials():
421 http = authenticator.authorize(httplib2.Http())
422 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700423 print('Warning: Some results might be missing because %s' %
424 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000425 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000426 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000427 http.force_exception_to_status_code = True
428
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000429 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
430 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431
Edward Lemur45768512020-03-02 19:03:14 +0000432
Edward Lemur5b929a42019-10-21 17:57:39 +0000433def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000434 """Fetches builds from the latest patchset that has builds (within
435 the last few patchsets).
436
437 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000438 changelist (Changelist): The CL to fetch builds for
439 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000440 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
441 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000442 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000443 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
444 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000445 """
446 assert buildbucket_host
447 assert changelist.GetIssue(), 'CL must be uploaded first'
448 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000449 if latest_patchset is None:
450 assert changelist.GetMostRecentPatchset()
451 ps = changelist.GetMostRecentPatchset()
452 else:
453 assert latest_patchset > 0, latest_patchset
454 ps = latest_patchset
455
Quinten Yearsley983111f2019-09-26 17:18:48 +0000456 min_ps = max(1, ps - 5)
457 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000458 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000459 if len(builds):
460 return builds, ps
461 ps -= 1
462 return [], 0
463
464
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000465def _filter_failed_for_retry(all_builds):
466 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000467
468 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000469 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000470 i.e. a list of buildbucket.v2.Builds which includes status and builder
471 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000472
473 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000474 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000475 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000476 """
Edward Lemur45768512020-03-02 19:03:14 +0000477 grouped = {}
478 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000479 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000480 key = (builder['project'], builder['bucket'], builder['builder'])
481 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000482
Edward Lemur45768512020-03-02 19:03:14 +0000483 jobs = []
484 for (project, bucket, builder), builds in grouped.items():
485 if 'triggered' in builder:
486 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
487 'from a parent. Please schedule a manual job for the parent '
488 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000489 continue
490 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
491 # Don't retry if any are running.
492 continue
Edward Lemur45768512020-03-02 19:03:14 +0000493 # If builder had several builds, retry only if the last one failed.
494 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
495 # build, but in case of retrying failed jobs retrying a flaky one makes
496 # sense.
497 builds = sorted(builds, key=lambda b: b['createTime'])
498 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
499 continue
500 # Don't retry experimental build previously triggered by CQ.
501 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
502 for t in builds[-1]['tags']):
503 continue
504 jobs.append((project, bucket, builder))
505
506 # Sort the jobs to make testing easier.
507 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000508
509
Quinten Yearsley777660f2020-03-04 23:37:06 +0000510def _print_tryjobs(options, builds):
511 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000513 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000514 return
515
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000516 longest_builder = max(len(b['builder']['builder']) for b in builds)
517 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000519 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
520 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000521
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000522 builds_by_status = {}
523 for b in builds:
524 builds_by_status.setdefault(b['status'], []).append({
525 'id': b['id'],
526 'name': name_fmt.format(
527 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
528 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000529
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000530 sort_key = lambda b: (b['name'], b['id'])
531
532 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 if not builds:
535 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000536
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000538 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000540 else:
541 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
542
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000543 print(colorize(title))
544 for b in sorted(builds, key=sort_key):
545 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546
547 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 print_builds(
549 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
550 print_builds(
551 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
552 color=Fore.MAGENTA)
553 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
554 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
555 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000556 print_builds('Started:', builds_by_status.pop('STARTED', []),
557 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000558 print_builds(
559 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000561 print_builds(
562 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000563 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564
565
Aiden Bennerc08566e2018-10-03 17:52:42 +0000566def _ComputeDiffLineRanges(files, upstream_commit):
567 """Gets the changed line ranges for each file since upstream_commit.
568
569 Parses a git diff on provided files and returns a dict that maps a file name
570 to an ordered list of range tuples in the form (start_line, count).
571 Ranges are in the same format as a git diff.
572 """
573 # If files is empty then diff_output will be a full diff.
574 if len(files) == 0:
575 return {}
576
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000577 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000578 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000579 diff_output = RunGit(diff_cmd)
580
581 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
582 # 2 capture groups
583 # 0 == fname of diff file
584 # 1 == 'diff_start,diff_count' or 'diff_start'
585 # will match each of
586 # diff --git a/foo.foo b/foo.py
587 # @@ -12,2 +14,3 @@
588 # @@ -12,2 +17 @@
589 # running re.findall on the above string with pattern will give
590 # [('foo.py', ''), ('', '14,3'), ('', '17')]
591
592 curr_file = None
593 line_diffs = {}
594 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
595 if match[0] != '':
596 # Will match the second filename in diff --git a/a.py b/b.py.
597 curr_file = match[0]
598 line_diffs[curr_file] = []
599 else:
600 # Matches +14,3
601 if ',' in match[1]:
602 diff_start, diff_count = match[1].split(',')
603 else:
604 # Single line changes are of the form +12 instead of +12,1.
605 diff_start = match[1]
606 diff_count = 1
607
608 diff_start = int(diff_start)
609 diff_count = int(diff_count)
610
611 # If diff_count == 0 this is a removal we can ignore.
612 line_diffs[curr_file].append((diff_start, diff_count))
613
614 return line_diffs
615
616
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000617def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000618 """Checks if a yapf file is in any parent directory of fpath until top_dir.
619
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000620 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000621 is found returns None. Uses yapf_config_cache as a cache for previously found
622 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000624 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000625 # Return result if we've already computed it.
626 if fpath in yapf_config_cache:
627 return yapf_config_cache[fpath]
628
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000629 parent_dir = os.path.dirname(fpath)
630 if os.path.isfile(fpath):
631 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000632 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000633 # Otherwise fpath is a directory
634 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
635 if os.path.isfile(yapf_file):
636 ret = yapf_file
637 elif fpath == top_dir or parent_dir == fpath:
638 # If we're at the top level directory, or if we're at root
639 # there is no provided style.
640 ret = None
641 else:
642 # Otherwise recurse on the current directory.
643 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000644 yapf_config_cache[fpath] = ret
645 return ret
646
647
Brian Sheedyb4307d52019-12-02 19:18:17 +0000648def _GetYapfIgnorePatterns(top_dir):
649 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000650
651 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
652 but this functionality appears to break when explicitly passing files to
653 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000654 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000655 the .yapfignore file should be in the directory that yapf is invoked from,
656 which we assume to be the top level directory in this case.
657
658 Args:
659 top_dir: The top level directory for the repository being formatted.
660
661 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000662 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000663 """
664 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000665 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000666 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000668
Anthony Politoc64e3902021-04-30 21:55:25 +0000669 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
670 stripped_line = line.strip()
671 # Comments and blank lines should be ignored.
672 if stripped_line.startswith('#') or stripped_line == '':
673 continue
674 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000675 return ignore_patterns
676
677
678def _FilterYapfIgnoredFiles(filepaths, patterns):
679 """Filters out any filepaths that match any of the given patterns.
680
681 Args:
682 filepaths: An iterable of strings containing filepaths to filter.
683 patterns: An iterable of strings containing fnmatch patterns to filter on.
684
685 Returns:
686 A list of strings containing all the elements of |filepaths| that did not
687 match any of the patterns in |patterns|.
688 """
689 # Not inlined so that tests can use the same implementation.
690 return [f for f in filepaths
691 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000692
693
Aaron Gable13101a62018-02-09 13:20:41 -0800694def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000695 """Prints statistics about the change to the user."""
696 # --no-ext-diff is broken in some versions of Git, so try to work around
697 # this by overriding the environment (but there is still a problem if the
698 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000699 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 if 'GIT_EXTERNAL_DIFF' in env:
701 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000702
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000703 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800704 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000705 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000706
707
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000708class BuildbucketResponseException(Exception):
709 pass
710
711
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000712class Settings(object):
713 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000714 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000715 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716 self.tree_status_url = None
717 self.viewvc_url = None
718 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000719 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000720 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000721 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000722 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000723 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000724
Edward Lemur26964072020-02-19 19:18:51 +0000725 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000726 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000727 if self.updated:
728 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000729
Edward Lemur26964072020-02-19 19:18:51 +0000730 # The only value that actually changes the behavior is
731 # autoupdate = "false". Everything else means "true".
732 autoupdate = (
733 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
734
735 cr_settings_file = FindCodereviewSettingsFile()
736 if autoupdate != 'false' and cr_settings_file:
737 LoadCodereviewSettingsFromFile(cr_settings_file)
738 cr_settings_file.close()
739
740 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000742 @staticmethod
743 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000744 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000745
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 if self.root is None:
748 self.root = os.path.abspath(self.GetRelativeRoot())
749 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000751 def GetTreeStatusUrl(self, error_ok=False):
752 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000753 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
754 if self.tree_status_url is None and not error_ok:
755 DieWithError(
756 'You must configure your tree status URL by running '
757 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000758 return self.tree_status_url
759
760 def GetViewVCUrl(self):
761 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000762 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 return self.viewvc_url
764
rmistry@google.com90752582014-01-14 21:04:50 +0000765 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000766 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000767
rmistry@google.com5626a922015-02-26 14:03:30 +0000768 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000769 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000770 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000771 return run_post_upload_hook == "True"
772
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000773 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000774 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000775
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000776 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000777 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000778 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000779 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
780 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000781 # Default is squash now (http://crbug.com/611892#c23).
782 self.squash_gerrit_uploads = self._GetConfig(
783 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000784 return self.squash_gerrit_uploads
785
Edward Lesmes4de54132020-05-05 19:41:33 +0000786 def GetSquashGerritUploadsOverride(self):
787 """Return True or False if codereview.settings should be overridden.
788
789 Returns None if no override has been defined.
790 """
791 # See also http://crbug.com/611892#c23
792 result = self._GetConfig('gerrit.override-squash-uploads').lower()
793 if result == 'true':
794 return True
795 if result == 'false':
796 return False
797 return None
798
tandrii@chromium.org28253532016-04-14 13:46:56 +0000799 def GetGerritSkipEnsureAuthenticated(self):
800 """Return True if EnsureAuthenticated should not be done for Gerrit
801 uploads."""
802 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000803 self.gerrit_skip_ensure_authenticated = self._GetConfig(
804 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000805 return self.gerrit_skip_ensure_authenticated
806
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000807 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000808 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000809 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000810 # Git requires single quotes for paths with spaces. We need to replace
811 # them with double quotes for Windows to treat such paths as a single
812 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000813 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000814 return self.git_editor or None
815
thestig@chromium.org44202a22014-03-11 19:22:18 +0000816 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000817 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000818
819 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000820 return self._GetConfig(
821 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000822
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000823 def GetFormatFullByDefault(self):
824 if self.format_full_by_default is None:
825 result = (
826 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
827 error_ok=True).strip())
828 self.format_full_by_default = (result == 'true')
829 return self.format_full_by_default
830
Edward Lemur26964072020-02-19 19:18:51 +0000831 def _GetConfig(self, key, default=''):
832 self._LazyUpdateIfNeeded()
833 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834
835
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000836class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000837 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000838 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000839 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000840 DRY_RUN = 'dry_run'
841 COMMIT = 'commit'
842
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000843 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000844
845
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000847 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000848 self.issue = issue
849 self.patchset = patchset
850 self.hostname = hostname
851
852 @property
853 def valid(self):
854 return self.issue is not None
855
856
Edward Lemurf38bc172019-09-03 21:02:13 +0000857def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000858 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
859 fail_result = _ParsedIssueNumberArgument()
860
Edward Lemur678a6842019-10-03 22:25:05 +0000861 if isinstance(arg, int):
862 return _ParsedIssueNumberArgument(issue=arg)
863 if not isinstance(arg, basestring):
864 return fail_result
865
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000866 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000867 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000868 if not arg.startswith('http'):
869 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700870
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000871 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000872 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
873 if url.startswith(short_url):
874 url = gerrit_url + url[len(short_url):]
875 break
876
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000878 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000879 except ValueError:
880 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200881
Edward Lemur678a6842019-10-03 22:25:05 +0000882 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
883 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
884 # Short urls like https://domain/<issue_number> can be used, but don't allow
885 # specifying the patchset (you'd 404), but we allow that here.
886 if parsed_url.path == '/':
887 part = parsed_url.fragment
888 else:
889 part = parsed_url.path
890
891 match = re.match(
892 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
893 if not match:
894 return fail_result
895
896 issue = int(match.group('issue'))
897 patchset = match.group('patchset')
898 return _ParsedIssueNumberArgument(
899 issue=issue,
900 patchset=int(patchset) if patchset else None,
901 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000902
903
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000904def _create_description_from_log(args):
905 """Pulls out the commit log to use as a base for the CL description."""
906 log_args = []
907 if len(args) == 1 and not args[0].endswith('.'):
908 log_args = [args[0] + '..']
909 elif len(args) == 1 and args[0].endswith('...'):
910 log_args = [args[0][:-1]]
911 elif len(args) == 2:
912 log_args = [args[0] + '..' + args[1]]
913 else:
914 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000915 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000916
917
Aaron Gablea45ee112016-11-22 15:14:38 -0800918class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700919 def __init__(self, issue, url):
920 self.issue = issue
921 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800922 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700923
924 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800925 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700926 self.issue, self.url)
927
928
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100929_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000930 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100931 # TODO(tandrii): these two aren't known in Gerrit.
932 'approval', 'disapproval'])
933
934
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000935class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000936 """Changelist works with one changelist in local branch.
937
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000938 Notes:
939 * Not safe for concurrent multi-{thread,process} use.
940 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700941 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000942 """
943
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000944 def __init__(self,
945 branchref=None,
946 issue=None,
947 codereview_host=None,
948 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000949 """Create a new ChangeList instance.
950
Edward Lemurf38bc172019-09-03 21:02:13 +0000951 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000952 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000953 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000954 global settings
955 if not settings:
956 # Happens when git_cl.py is used as a utility library.
957 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000958
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000959 self.branchref = branchref
960 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000961 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000962 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000963 else:
964 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000965 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000966 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000967 self.lookedup_issue = False
968 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000970 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000972 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800973 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000974 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000975 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000976
Edward Lemur125d60a2019-09-13 18:25:41 +0000977 # Lazily cached values.
978 self._gerrit_host = None # e.g. chromium-review.googlesource.com
979 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +0000980 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +0000981 # Map from change number (issue) to its detail cache.
982 self._detail_cache = {}
983
984 if codereview_host is not None:
985 assert not codereview_host.startswith('https://'), codereview_host
986 self._gerrit_host = codereview_host
987 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988
Edward Lesmese1576912021-02-16 21:53:34 +0000989 @property
990 def owners_client(self):
991 if self._owners_client is None:
992 remote, remote_branch = self.GetRemoteBranch()
993 branch = GetTargetRef(remote, remote_branch, None)
994 self._owners_client = owners_client.GetCodeOwnersClient(
995 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +0000996 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +0000997 host=self.GetGerritHost(),
998 project=self.GetGerritProject(),
999 branch=branch)
1000 return self._owners_client
1001
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001002 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001003 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001004
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001005 The return value is a string suitable for passing to git cl with the --cc
1006 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001007 """
1008 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001009 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001010 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001011 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1012 return self.cc
1013
Daniel Cheng7227d212017-11-17 08:12:37 -08001014 def ExtendCC(self, more_cc):
1015 """Extends the list of users to cc on this CL based on the changed files."""
1016 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001018 def GetCommitDate(self):
1019 """Returns the commit date as provided in the constructor"""
1020 return self.commit_date
1021
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001022 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001023 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001025 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001026 if not branchref:
1027 return None
1028 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001029 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 return self.branch
1031
1032 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001033 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 self.GetBranch() # Poke the lazy loader.
1035 return self.branchref
1036
Edward Lemur85153282020-02-14 22:06:29 +00001037 def _GitGetBranchConfigValue(self, key, default=None):
1038 return scm.GIT.GetBranchConfig(
1039 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001040
Edward Lemur85153282020-02-14 22:06:29 +00001041 def _GitSetBranchConfigValue(self, key, value):
1042 action = 'set %s to %r' % (key, value)
1043 if not value:
1044 action = 'unset %s' % key
1045 assert self.GetBranch(), 'a branch is needed to ' + action
1046 return scm.GIT.SetBranchConfig(
1047 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001048
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001049 @staticmethod
1050 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001051 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001052 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001054 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1055 settings.GetRoot(), branch)
1056 if not remote or not upstream_branch:
1057 DieWithError(
1058 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001059 'Verify this branch is set up to track another \n'
1060 '(via the --track argument to "git checkout -b ..."). \n'
1061 'or pass complete "git diff"-style arguments if supported, like\n'
1062 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001063
1064 return remote, upstream_branch
1065
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001066 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001067 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001068 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001069 DieWithError('The upstream for the current branch (%s) does not exist '
1070 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001071 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001072 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001073
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001074 def GetUpstreamBranch(self):
1075 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001076 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001077 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001078 upstream_branch = upstream_branch.replace('refs/heads/',
1079 'refs/remotes/%s/' % remote)
1080 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1081 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 self.upstream_branch = upstream_branch
1083 return self.upstream_branch
1084
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001085 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001086 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001087 remote, branch = None, self.GetBranch()
1088 seen_branches = set()
1089 while branch not in seen_branches:
1090 seen_branches.add(branch)
1091 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001092 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001093 if remote != '.' or branch.startswith('refs/remotes'):
1094 break
1095 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001096 remotes = RunGit(['remote'], error_ok=True).split()
1097 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001098 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001099 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001100 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001101 logging.warning('Could not determine which remote this change is '
1102 'associated with, so defaulting to "%s".' %
1103 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001104 else:
Gavin Make6a62332020-12-04 21:57:10 +00001105 logging.warning('Could not determine which remote this change is '
1106 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 branch = 'HEAD'
1108 if branch.startswith('refs/remotes'):
1109 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001110 elif branch.startswith('refs/branch-heads/'):
1111 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 else:
1113 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001114 return self._remote
1115
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 def GetRemoteUrl(self):
1117 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1118
1119 Returns None if there is no remote.
1120 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001121 is_cached, value = self._cached_remote_url
1122 if is_cached:
1123 return value
1124
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001126 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001127
Edward Lemur298f2cf2019-02-22 21:40:39 +00001128 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001129 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001130 if host:
1131 self._cached_remote_url = (True, url)
1132 return url
1133
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001134 # If it cannot be parsed as an url, assume it is a local directory,
1135 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001136 logging.warning('"%s" doesn\'t appear to point to a git host. '
1137 'Interpreting it as a local directory.', url)
1138 if not os.path.isdir(url):
1139 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001140 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1141 'but it doesn\'t exist.',
1142 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001143 return None
1144
1145 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001146 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001147
Edward Lemur79d4f992019-11-11 23:49:02 +00001148 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001149 if not host:
1150 logging.error(
1151 'Remote "%(remote)s" for branch "%(branch)s" points to '
1152 '"%(cache_path)s", but it is misconfigured.\n'
1153 '"%(cache_path)s" must be a git repo and must have a remote named '
1154 '"%(remote)s" pointing to the git host.', {
1155 'remote': remote,
1156 'cache_path': cache_path,
1157 'branch': self.GetBranch()})
1158 return None
1159
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001160 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001161 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001163 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001164 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001165 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001166 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001167 if self.issue is not None:
1168 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001169 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001170 return self.issue
1171
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001172 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001174 issue = self.GetIssue()
1175 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001176 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001177 server = self.GetCodereviewServer()
1178 if short:
1179 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1180 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181
Edward Lemur6c6827c2020-02-06 21:15:18 +00001182 def FetchDescription(self, pretty=False):
1183 assert self.GetIssue(), 'issue is required to query Gerrit'
1184
Edward Lemur9aa1a962020-02-25 00:58:38 +00001185 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001186 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1187 current_rev = data['current_revision']
1188 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001189
1190 if not pretty:
1191 return self.description
1192
1193 # Set width to 72 columns + 2 space indent.
1194 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1195 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1196 lines = self.description.splitlines()
1197 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198
1199 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001200 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001201 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001202 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001203 if self.patchset is not None:
1204 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001205 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001206 return self.patchset
1207
Edward Lemur9aa1a962020-02-25 00:58:38 +00001208 def GetAuthor(self):
1209 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1210
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001211 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001212 """Set this branch's patchset. If patchset=0, clears the patchset."""
1213 assert self.GetBranch()
1214 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001215 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001216 else:
1217 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001218 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001219
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001220 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001221 """Set this branch's issue. If issue isn't given, clears the issue."""
1222 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001224 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001225 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001226 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001227 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001228 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001229 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001230 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 else:
tandrii5d48c322016-08-18 16:19:37 -07001232 # Reset all of these just to be clean.
1233 reset_suffixes = [
1234 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001235 ISSUE_CONFIG_KEY,
1236 PATCHSET_CONFIG_KEY,
1237 CODEREVIEW_SERVER_CONFIG_KEY,
1238 'gerritsquashhash',
1239 ]
tandrii5d48c322016-08-18 16:19:37 -07001240 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001241 try:
1242 self._GitSetBranchConfigValue(prop, None)
1243 except subprocess2.CalledProcessError:
1244 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001245 msg = RunGit(['log', '-1', '--format=%B']).strip()
1246 if msg and git_footers.get_footer_change_id(msg):
1247 print('WARNING: The change patched into this branch has a Change-Id. '
1248 'Removing it.')
1249 RunGit(['commit', '--amend', '-m',
1250 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001251 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001252 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001253 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254
Edward Lemur2c62b332020-03-12 22:12:33 +00001255 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001256 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001257 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001258 except subprocess2.CalledProcessError:
1259 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001260 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001261 'This branch probably doesn\'t exist anymore. To reset the\n'
1262 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001263 ' git branch --set-upstream-to origin/main %s\n'
1264 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001265 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001266
dsansomee2d6fd92016-09-08 00:10:47 -07001267 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001268 assert self.GetIssue(), 'issue is required to update description'
1269
1270 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001271 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 if not force:
1273 confirm_or_exit(
1274 'The description cannot be modified while the issue has a pending '
1275 'unpublished edit. Either publish the edit in the Gerrit web UI '
1276 'or delete it.\n\n', action='delete the unpublished edit')
1277
1278 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001279 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001281 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001282 description, notify='NONE')
1283
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001284 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001285
Edward Lemur75526302020-02-27 22:31:05 +00001286 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001287 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001288 '--root', settings.GetRoot(),
1289 '--upstream', upstream,
1290 ]
1291
1292 args.extend(['--verbose'] * verbose)
1293
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001294 remote, remote_branch = self.GetRemoteBranch()
1295 target_ref = GetTargetRef(remote, remote_branch, None)
1296 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1297 args.extend(['--gerrit_project', self.GetGerritProject()])
1298 args.extend(['--gerrit_branch', target_ref])
1299
Edward Lemur99df04e2020-03-05 19:39:43 +00001300 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001301 issue = self.GetIssue()
1302 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001303 if author:
1304 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001305 if issue:
1306 args.extend(['--issue', str(issue)])
1307 if patchset:
1308 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001309
Edward Lemur75526302020-02-27 22:31:05 +00001310 return args
1311
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001312 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001313 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001314 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1315 args = self._GetCommonPresubmitArgs(verbose, upstream)
1316 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001317 if may_prompt:
1318 args.append('--may_prompt')
1319 if parallel:
1320 args.append('--parallel')
1321 if all_files:
1322 args.append('--all_files')
1323
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001324 if resultdb and not realm:
1325 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1326 # it is not required to pass the realm flag
1327 print('Note: ResultDB reporting will NOT be performed because --realm'
1328 ' was not specified. To enable ResultDB, please run the command'
1329 ' again with the --realm argument to specify the LUCI realm.')
1330
1331 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1332 use_python3=False)
1333 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1334 use_python3=True)
1335 return self._MergePresubmitResults(py2_results, py3_results)
1336
1337 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1338 args = args[:]
1339 vpython = 'vpython3' if use_python3 else 'vpython'
1340
Edward Lemur227d5102020-02-25 23:45:35 +00001341 with gclient_utils.temporary_file() as description_file:
1342 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001343 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001344 args.extend(['--json_output', json_output])
1345 args.extend(['--description_file', description_file])
1346
1347 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001348 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001349 if resultdb and realm:
1350 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001351
1352 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001353 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001354
Edward Lemur227d5102020-02-25 23:45:35 +00001355 metrics.collector.add_repeated('sub_commands', {
1356 'command': 'presubmit',
1357 'execution_time': time_time() - start,
1358 'exit_code': exit_code,
1359 })
1360
1361 if exit_code:
1362 sys.exit(exit_code)
1363
1364 json_results = gclient_utils.FileRead(json_output)
1365 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001367 def _MergePresubmitResults(self, py2_results, py3_results):
1368 return {
1369 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1370 py3_results.get('more_cc', []))),
1371 'errors': (
1372 py2_results.get('errors', []) + py3_results.get('errors', [])),
1373 'notifications': (
1374 py2_results.get('notifications', []) +
1375 py3_results.get('notifications', [])),
1376 'warnings': (
1377 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1378 }
1379
Edward Lemur75526302020-02-27 22:31:05 +00001380 def RunPostUploadHook(self, verbose, upstream, description):
1381 args = self._GetCommonPresubmitArgs(verbose, upstream)
1382 args.append('--post_upload')
1383
1384 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001385 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001386 args.extend(['--description_file', description_file])
1387 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1388 p.wait()
1389
Edward Lemur5a644f82020-03-18 16:44:57 +00001390 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1391 # Get description message for upload.
1392 if self.GetIssue():
1393 description = self.FetchDescription()
1394 elif options.message:
1395 description = options.message
1396 else:
1397 description = _create_description_from_log(git_diff_args)
1398 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001399 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001400
1401 # Extract bug number from branch name.
1402 bug = options.bug
1403 fixed = options.fixed
1404 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1405 self.GetBranch())
1406 if not bug and not fixed and match:
1407 if match.group('type') == 'bug':
1408 bug = match.group('bugnum')
1409 else:
1410 fixed = match.group('bugnum')
1411
1412 change_description = ChangeDescription(description, bug, fixed)
1413
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001414 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1415 if options.add_owners_to:
1416 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001417 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001418 files, [], options.tbrs + options.reviewers)
1419 missing_files = [
1420 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001421 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001422 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001423 owners = self.owners_client.SuggestOwners(
1424 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001425 if options.add_owners_to == 'TBR':
1426 assert isinstance(options.tbrs, list), options.tbrs
1427 options.tbrs.extend(owners)
1428 else:
1429 assert isinstance(options.reviewers, list), options.reviewers
1430 options.reviewers.extend(owners)
1431
Edward Lemur5a644f82020-03-18 16:44:57 +00001432 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001433 if options.reviewers or options.tbrs:
1434 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001435
1436 return change_description
1437
1438 def _GetTitleForUpload(self, options):
1439 # When not squashing, just return options.title.
1440 if not options.squash:
1441 return options.title
1442
1443 # On first upload, patchset title is always this string, while options.title
1444 # gets converted to first line of message.
1445 if not self.GetIssue():
1446 return 'Initial upload'
1447
1448 # When uploading subsequent patchsets, options.message is taken as the title
1449 # if options.title is not provided.
1450 if options.title:
1451 return options.title
1452 if options.message:
1453 return options.message.strip()
1454
1455 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001456 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001457 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001458 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001459 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001460
1461 # Use the default title if the user confirms the default with a 'y'.
1462 if user_title.lower() == 'y':
1463 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001464 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001465
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001466 def CMDUpload(self, options, git_diff_args, orig_args):
1467 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001468 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001469 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001470 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001471 else:
1472 if self.GetBranch() is None:
1473 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1474
1475 # Default to diffing against common ancestor of upstream branch
1476 base_branch = self.GetCommonAncestorWithUpstream()
1477 git_diff_args = [base_branch, 'HEAD']
1478
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001479 # Fast best-effort checks to abort before running potentially expensive
1480 # hooks if uploading is likely to fail anyway. Passing these checks does
1481 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001482 self.EnsureAuthenticated(force=options.force)
1483 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001484
1485 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001486 watchlist = watchlists.Watchlists(settings.GetRoot())
1487 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001488 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001489 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001490
Edward Lemur5a644f82020-03-18 16:44:57 +00001491 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001492 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001493 hook_results = self.RunHook(
1494 committing=False,
1495 may_prompt=not options.force,
1496 verbose=options.verbose,
1497 parallel=options.parallel,
1498 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001499 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001500 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001501 resultdb=options.resultdb,
1502 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001503 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001504
Aaron Gable13101a62018-02-09 13:20:41 -08001505 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001506 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001507 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001508 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001509 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001510 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001511 # Run post upload hooks, if specified.
1512 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001513 self.RunPostUploadHook(
1514 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001515
1516 # Upload all dependencies if specified.
1517 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001518 print()
1519 print('--dependencies has been specified.')
1520 print('All dependent local branches will be re-uploaded.')
1521 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001522 # Remove the dependencies flag from args so that we do not end up in a
1523 # loop.
1524 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001525 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 return ret
1527
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001528 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001529 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001530
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001531 Issue must have been already uploaded and known. Optionally allows for
1532 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001533 """
1534 assert new_state in _CQState.ALL_STATES
1535 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001536 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001537 vote_map = {
1538 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001539 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001540 _CQState.DRY_RUN: 1,
1541 _CQState.COMMIT: 2,
1542 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001543 if new_state == _CQState.QUICK_RUN:
1544 labels = {
1545 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1546 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1547 }
1548 else:
1549 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001550 notify = False if new_state == _CQState.DRY_RUN else None
1551 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001552 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001553 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001554 return 0
1555 except KeyboardInterrupt:
1556 raise
1557 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001558 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001559 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001560 ' * Your project has no CQ,\n'
1561 ' * You don\'t have permission to change the CQ state,\n'
1562 ' * There\'s a bug in this code (see stack trace below).\n'
1563 'Consider specifying which bots to trigger manually or asking your '
1564 'project owners for permissions or contacting Chrome Infra at:\n'
1565 'https://www.chromium.org/infra\n\n' %
1566 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001567 # Still raise exception so that stack trace is printed.
1568 raise
1569
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001570 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001571 # Lazy load of configs.
1572 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001573 if self._gerrit_host and '.' not in self._gerrit_host:
1574 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1575 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001576 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001577 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001578 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001579 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001580 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1581 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001582 return self._gerrit_host
1583
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001584 def _GetGitHost(self):
1585 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001586 remote_url = self.GetRemoteUrl()
1587 if not remote_url:
1588 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001589 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001590
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001591 def GetCodereviewServer(self):
1592 if not self._gerrit_server:
1593 # If we're on a branch then get the server potentially associated
1594 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001595 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001596 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001597 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001598 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001599 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001600 if not self._gerrit_server:
1601 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1602 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001603 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001604 parts[0] = parts[0] + '-review'
1605 self._gerrit_host = '.'.join(parts)
1606 self._gerrit_server = 'https://%s' % self._gerrit_host
1607 return self._gerrit_server
1608
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001609 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001610 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001611 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001612 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001613 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001614 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001615 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001616 if project.endswith('.git'):
1617 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001618 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1619 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1620 # gitiles/git-over-https protocol. E.g.,
1621 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1622 # as
1623 # https://chromium.googlesource.com/v8/v8
1624 if project.startswith('a/'):
1625 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001626 return project
1627
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001628 def _GerritChangeIdentifier(self):
1629 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1630
1631 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001632 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001633 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001634 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001635 if project:
1636 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1637 # Fall back on still unique, but less efficient change number.
1638 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001639
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001640 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001641 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001642 if settings.GetGerritSkipEnsureAuthenticated():
1643 # For projects with unusual authentication schemes.
1644 # See http://crbug.com/603378.
1645 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001646
1647 # Check presence of cookies only if using cookies-based auth method.
1648 cookie_auth = gerrit_util.Authenticator.get()
1649 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001650 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001651
Florian Mayerae510e82020-01-30 21:04:48 +00001652 remote_url = self.GetRemoteUrl()
1653 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001654 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001655 return
1656 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001657 logging.warning('Ignoring branch %(branch)s with non-https remote '
1658 '%(remote)s', {
1659 'branch': self.branch,
1660 'remote': self.GetRemoteUrl()
1661 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001662 return
1663
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001664 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001665 self.GetCodereviewServer()
1666 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001667 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001668
1669 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1670 git_auth = cookie_auth.get_auth_header(git_host)
1671 if gerrit_auth and git_auth:
1672 if gerrit_auth == git_auth:
1673 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001674 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001675 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001676 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001677 ' %s\n'
1678 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001679 ' Consider running the following command:\n'
1680 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001681 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001682 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001683 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001684 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001685 cookie_auth.get_new_password_message(git_host)))
1686 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001687 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001688 return
1689 else:
1690 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001691 ([] if gerrit_auth else [self._gerrit_host]) +
1692 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001693 DieWithError('Credentials for the following hosts are required:\n'
1694 ' %s\n'
1695 'These are read from %s (or legacy %s)\n'
1696 '%s' % (
1697 '\n '.join(missing),
1698 cookie_auth.get_gitcookies_path(),
1699 cookie_auth.get_netrc_path(),
1700 cookie_auth.get_new_password_message(git_host)))
1701
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001702 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001703 if not self.GetIssue():
1704 return
1705
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001706 status = self._GetChangeDetail()['status']
1707 if status in ('MERGED', 'ABANDONED'):
1708 DieWithError('Change %s has been %s, new uploads are not allowed' %
1709 (self.GetIssueURL(),
1710 'submitted' if status == 'MERGED' else 'abandoned'))
1711
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001712 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1713 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1714 # Apparently this check is not very important? Otherwise get_auth_email
1715 # could have been added to other implementations of Authenticator.
1716 cookies_auth = gerrit_util.Authenticator.get()
1717 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001718 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001719
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001720 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001721 if self.GetIssueOwner() == cookies_user:
1722 return
1723 logging.debug('change %s owner is %s, cookies user is %s',
1724 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001725 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001726 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001727 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001728 if details['email'] == self.GetIssueOwner():
1729 return
1730 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001731 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001732 'as %s.\n'
1733 'Uploading may fail due to lack of permissions.' %
1734 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1735 confirm_or_exit(action='upload')
1736
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001738 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001739 or CQ status, assuming adherence to a common workflow.
1740
1741 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001742 * 'error' - error from review tool (including deleted issues)
1743 * 'unsent' - no reviewers added
1744 * 'waiting' - waiting for review
1745 * 'reply' - waiting for uploader to reply to review
1746 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001747 * 'dry-run' - dry-running in the CQ
1748 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001749 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001750 """
1751 if not self.GetIssue():
1752 return None
1753
1754 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001755 data = self._GetChangeDetail([
1756 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001757 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001758 return 'error'
1759
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001760 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001761 return 'closed'
1762
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001763 cq_label = data['labels'].get('Commit-Queue', {})
1764 max_cq_vote = 0
1765 for vote in cq_label.get('all', []):
1766 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1767 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001768 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001769 if max_cq_vote == 1:
1770 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001771
Aaron Gable9ab38c62017-04-06 14:36:33 -07001772 if data['labels'].get('Code-Review', {}).get('approved'):
1773 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001774
1775 if not data.get('reviewers', {}).get('REVIEWER', []):
1776 return 'unsent'
1777
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001778 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001779 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001780 while messages:
1781 m = messages.pop()
1782 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001783 # Ignore replies from CQ.
1784 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001785 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001786 # Most recent message was by owner.
1787 return 'waiting'
1788 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001789 # Some reply from non-owner.
1790 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001791
1792 # Somehow there are no messages even though there are reviewers.
1793 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001794
1795 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001796 if not self.GetIssue():
1797 return None
1798
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001799 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001800 patchset = data['revisions'][data['current_revision']]['_number']
1801 self.SetPatchset(patchset)
1802 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001803
Gavin Make61ccc52020-11-13 00:12:57 +00001804 def GetMostRecentDryRunPatchset(self):
1805 """Get patchsets equivalent to the most recent patchset and return
1806 the patchset with the latest dry run. If none have been dry run, return
1807 the latest patchset."""
1808 if not self.GetIssue():
1809 return None
1810
1811 data = self._GetChangeDetail(['ALL_REVISIONS'])
1812 patchset = data['revisions'][data['current_revision']]['_number']
1813 dry_run = set([int(m['_revision_number'])
1814 for m in data.get('messages', [])
1815 if m.get('tag', '').endswith('dry-run')])
1816
1817 for revision_info in sorted(data.get('revisions', {}).values(),
1818 key=lambda c: c['_number'], reverse=True):
1819 if revision_info['_number'] in dry_run:
1820 patchset = revision_info['_number']
1821 break
1822 if revision_info.get('kind', '') not in \
1823 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1824 break
1825 self.SetPatchset(patchset)
1826 return patchset
1827
Aaron Gable636b13f2017-07-14 10:42:48 -07001828 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001829 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001830 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001831 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001832
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001833 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001834 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001835 # CURRENT_REVISION is included to get the latest patchset so that
1836 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001837 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001838 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1839 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001840 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001841 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001842 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001843 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001844
1845 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001846 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001847 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001848 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001849 line_comments = file_comments.setdefault(path, [])
1850 line_comments.extend(
1851 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001852
1853 # Build dictionary of file comments for easy access and sorting later.
1854 # {author+date: {path: {patchset: {line: url+message}}}}
1855 comments = collections.defaultdict(
1856 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001857
1858 server = self.GetCodereviewServer()
1859 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1860 # /c/ is automatically added by short URL server.
1861 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1862 self.GetIssue())
1863 else:
1864 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1865
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001866 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001867 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001868 tag = comment.get('tag', '')
1869 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001870 continue
1871 key = (comment['author']['email'], comment['updated'])
1872 if comment.get('side', 'REVISION') == 'PARENT':
1873 patchset = 'Base'
1874 else:
1875 patchset = 'PS%d' % comment['patch_set']
1876 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001877 url = ('%s/%s/%s#%s%s' %
1878 (url_prefix, comment['patch_set'], path,
1879 'b' if comment.get('side') == 'PARENT' else '',
1880 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001881 comments[key][path][patchset][line] = (url, comment['message'])
1882
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001883 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001884 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001885 summary = self._BuildCommentSummary(msg, comments, readable)
1886 if summary:
1887 summaries.append(summary)
1888 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001889
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001890 @staticmethod
1891 def _BuildCommentSummary(msg, comments, readable):
1892 key = (msg['author']['email'], msg['date'])
1893 # Don't bother showing autogenerated messages that don't have associated
1894 # file or line comments. this will filter out most autogenerated
1895 # messages, but will keep robot comments like those from Tricium.
1896 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1897 if is_autogenerated and not comments.get(key):
1898 return None
1899 message = msg['message']
1900 # Gerrit spits out nanoseconds.
1901 assert len(msg['date'].split('.')[-1]) == 9
1902 date = datetime.datetime.strptime(msg['date'][:-3],
1903 '%Y-%m-%d %H:%M:%S.%f')
1904 if key in comments:
1905 message += '\n'
1906 for path, patchsets in sorted(comments.get(key, {}).items()):
1907 if readable:
1908 message += '\n%s' % path
1909 for patchset, lines in sorted(patchsets.items()):
1910 for line, (url, content) in sorted(lines.items()):
1911 if line:
1912 line_str = 'Line %d' % line
1913 path_str = '%s:%d:' % (path, line)
1914 else:
1915 line_str = 'File comment'
1916 path_str = '%s:0:' % path
1917 if readable:
1918 message += '\n %s, %s: %s' % (patchset, line_str, url)
1919 message += '\n %s\n' % content
1920 else:
1921 message += '\n%s ' % path_str
1922 message += '\n%s\n' % content
1923
1924 return _CommentSummary(
1925 date=date,
1926 message=message,
1927 sender=msg['author']['email'],
1928 autogenerated=is_autogenerated,
1929 # These could be inferred from the text messages and correlated with
1930 # Code-Review label maximum, however this is not reliable.
1931 # Leaving as is until the need arises.
1932 approval=False,
1933 disapproval=False,
1934 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001935
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001937 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001938 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001939
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001940 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001941 gerrit_util.SubmitChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001942 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001943 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001944
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001945 def _GetChangeDetail(self, options=None):
1946 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001947 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001948 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001949
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001950 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001951 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001952 options.append('CURRENT_COMMIT')
1953
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001954 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001955 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001956 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001957
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001958 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1959 # Assumption: data fetched before with extra options is suitable
1960 # for return for a smaller set of options.
1961 # For example, if we cached data for
1962 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1963 # and request is for options=[CURRENT_REVISION],
1964 # THEN we can return prior cached data.
1965 if options_set.issubset(cached_options_set):
1966 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001967
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001968 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001969 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001970 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001971 except gerrit_util.GerritError as e:
1972 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001973 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001974 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001975
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001976 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001977 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001978
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001979 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001980 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001981 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001982 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001983 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001984 except gerrit_util.GerritError as e:
1985 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001986 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001987 raise
agable32978d92016-11-01 12:55:02 -07001988 return data
1989
Karen Qian40c19422019-03-13 21:28:29 +00001990 def _IsCqConfigured(self):
1991 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001992 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001993
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001994 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001995 if git_common.is_dirty_git_tree('land'):
1996 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001997
tandriid60367b2016-06-22 05:25:12 -07001998 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001999 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002000 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002001 'which can test and land changes for you. '
2002 'Are you sure you wish to bypass it?\n',
2003 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002004 differs = True
tandriic4344b52016-08-29 06:04:54 -07002005 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002006 # Note: git diff outputs nothing if there is no diff.
2007 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002008 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002009 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002010 if detail['current_revision'] == last_upload:
2011 differs = False
2012 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002013 print('WARNING: Local branch contents differ from latest uploaded '
2014 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002015 if differs:
2016 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002017 confirm_or_exit(
2018 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2019 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002020 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002021 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002022 upstream = self.GetCommonAncestorWithUpstream()
2023 if self.GetIssue():
2024 description = self.FetchDescription()
2025 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002026 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002027 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002028 committing=True,
2029 may_prompt=not force,
2030 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002031 parallel=parallel,
2032 upstream=upstream,
2033 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002034 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002035 resultdb=resultdb,
2036 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002037
2038 self.SubmitIssue(wait_for_merge=True)
2039 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002040 links = self._GetChangeCommit().get('web_links', [])
2041 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002042 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002043 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002044 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002045 return 0
2046
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002047 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2048 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002049 assert parsed_issue_arg.valid
2050
Edward Lemur125d60a2019-09-13 18:25:41 +00002051 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002052
2053 if parsed_issue_arg.hostname:
2054 self._gerrit_host = parsed_issue_arg.hostname
2055 self._gerrit_server = 'https://%s' % self._gerrit_host
2056
tandriic2405f52016-10-10 08:13:15 -07002057 try:
2058 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002059 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002060 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002061
2062 if not parsed_issue_arg.patchset:
2063 # Use current revision by default.
2064 revision_info = detail['revisions'][detail['current_revision']]
2065 patchset = int(revision_info['_number'])
2066 else:
2067 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002068 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2070 break
2071 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002072 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002073 (parsed_issue_arg.patchset, self.GetIssue()))
2074
Edward Lemur125d60a2019-09-13 18:25:41 +00002075 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002076 if remote_url.endswith('.git'):
2077 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002078 remote_url = remote_url.rstrip('/')
2079
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002081 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002082
2083 if remote_url != fetch_info['url']:
2084 DieWithError('Trying to patch a change from %s but this repo appears '
2085 'to be %s.' % (fetch_info['url'], remote_url))
2086
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002087 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002088
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002089 # If we have created a new branch then do the "set issue" immediately in
2090 # case the cherry-pick fails, which happens when resolving conflicts.
2091 if newbranch:
2092 self.SetIssue(parsed_issue_arg.issue)
2093
Aaron Gable62619a32017-06-16 08:22:09 -07002094 if force:
2095 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2096 print('Checked out commit for change %i patchset %i locally' %
2097 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002098 elif nocommit:
2099 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2100 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002101 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002102 RunGit(['cherry-pick', 'FETCH_HEAD'])
2103 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002104 (parsed_issue_arg.issue, patchset))
2105 print('Note: this created a local commit which does not have '
2106 'the same hash as the one uploaded for review. This will make '
2107 'uploading changes based on top of this branch difficult.\n'
2108 'If you want to do that, use "git cl patch --force" instead.')
2109
Stefan Zagerd08043c2017-10-12 12:07:02 -07002110 if self.GetBranch():
2111 self.SetIssue(parsed_issue_arg.issue)
2112 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002113 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002114 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2115 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2116 else:
2117 print('WARNING: You are in detached HEAD state.\n'
2118 'The patch has been applied to your checkout, but you will not be '
2119 'able to upload a new patch set to the gerrit issue.\n'
2120 'Try using the \'-b\' option if you would like to work on a '
2121 'branch and/or upload a new patch set.')
2122
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 return 0
2124
tandrii16e0b4e2016-06-07 10:34:28 -07002125 def _GerritCommitMsgHookCheck(self, offer_removal):
2126 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2127 if not os.path.exists(hook):
2128 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002129 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2130 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002131 data = gclient_utils.FileRead(hook)
2132 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2133 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002134 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002135 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002136 'and may interfere with it in subtle ways.\n'
2137 'We recommend you remove the commit-msg hook.')
2138 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002139 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002140 gclient_utils.rm_file_or_tree(hook)
2141 print('Gerrit commit-msg hook removed.')
2142 else:
2143 print('OK, will keep Gerrit commit-msg hook in place.')
2144
Edward Lemur1b52d872019-05-09 21:12:12 +00002145 def _CleanUpOldTraces(self):
2146 """Keep only the last |MAX_TRACES| traces."""
2147 try:
2148 traces = sorted([
2149 os.path.join(TRACES_DIR, f)
2150 for f in os.listdir(TRACES_DIR)
2151 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2152 and not f.startswith('tmp'))
2153 ])
2154 traces_to_delete = traces[:-MAX_TRACES]
2155 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002156 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002157 except OSError:
2158 print('WARNING: Failed to remove old git traces from\n'
2159 ' %s'
2160 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002161
Edward Lemur5737f022019-05-17 01:24:00 +00002162 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002163 """Zip and write the git push traces stored in traces_dir."""
2164 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002165 traces_zip = trace_name + '-traces'
2166 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002167 # Create a temporary dir to store git config and gitcookies in. It will be
2168 # compressed and stored next to the traces.
2169 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002170 git_info_zip = trace_name + '-git-info'
2171
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002172 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002173
Edward Lemur1b52d872019-05-09 21:12:12 +00002174 git_push_metadata['trace_name'] = trace_name
2175 gclient_utils.FileWrite(
2176 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2177
2178 # Keep only the first 6 characters of the git hashes on the packet
2179 # trace. This greatly decreases size after compression.
2180 packet_traces = os.path.join(traces_dir, 'trace-packet')
2181 if os.path.isfile(packet_traces):
2182 contents = gclient_utils.FileRead(packet_traces)
2183 gclient_utils.FileWrite(
2184 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2185 shutil.make_archive(traces_zip, 'zip', traces_dir)
2186
2187 # Collect and compress the git config and gitcookies.
2188 git_config = RunGit(['config', '-l'])
2189 gclient_utils.FileWrite(
2190 os.path.join(git_info_dir, 'git-config'),
2191 git_config)
2192
2193 cookie_auth = gerrit_util.Authenticator.get()
2194 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2195 gitcookies_path = cookie_auth.get_gitcookies_path()
2196 if os.path.isfile(gitcookies_path):
2197 gitcookies = gclient_utils.FileRead(gitcookies_path)
2198 gclient_utils.FileWrite(
2199 os.path.join(git_info_dir, 'gitcookies'),
2200 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2201 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2202
Edward Lemur1b52d872019-05-09 21:12:12 +00002203 gclient_utils.rmtree(git_info_dir)
2204
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002205 def _RunGitPushWithTraces(self,
2206 refspec,
2207 refspec_opts,
2208 git_push_metadata,
2209 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002210 """Run git push and collect the traces resulting from the execution."""
2211 # Create a temporary directory to store traces in. Traces will be compressed
2212 # and stored in a 'traces' dir inside depot_tools.
2213 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002214 trace_name = os.path.join(
2215 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002216
2217 env = os.environ.copy()
2218 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2219 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002220 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002221 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2222 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2223 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2224
2225 try:
2226 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002227 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002228 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002229 push_cmd = ['git', 'push', remote_url, refspec]
2230 if git_push_options:
2231 for opt in git_push_options:
2232 push_cmd.extend(['-o', opt])
2233
Edward Lemur0f58ae42019-04-30 17:24:12 +00002234 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002235 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002236 env=env,
2237 print_stdout=True,
2238 # Flush after every line: useful for seeing progress when running as
2239 # recipe.
2240 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002241 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002242 except subprocess2.CalledProcessError as e:
2243 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002244 if 'blocked keyword' in str(e.stdout):
2245 raise GitPushError(
2246 'Failed to create a change, very likely due to blocked keyword. '
2247 'Please examine output above for the reason of the failure.\n'
2248 'If this is a false positive, you can try to bypass blocked '
2249 'keyword by using push option '
2250 '-o uploadvalidator~skip, e.g.:\n'
2251 'git cl upload -o uploadvalidator~skip\n\n'
2252 'If git-cl is not working correctly, file a bug under the '
2253 'Infra>SDK component.')
2254
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002255 raise GitPushError(
2256 'Failed to create a change. Please examine output above for the '
2257 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002258 'For emergencies, Googlers can escalate to '
2259 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002260 'Hint: run command below to diagnose common Git/Gerrit '
2261 'credential problems:\n'
2262 ' git cl creds-check\n'
2263 '\n'
2264 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2265 'component including the files below.\n'
2266 'Review the files before upload, since they might contain sensitive '
2267 'information.\n'
2268 'Set the Restrict-View-Google label so that they are not publicly '
2269 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002270 finally:
2271 execution_time = time_time() - before_push
2272 metrics.collector.add_repeated('sub_commands', {
2273 'command': 'git push',
2274 'execution_time': execution_time,
2275 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002276 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002277 })
2278
Edward Lemur1b52d872019-05-09 21:12:12 +00002279 git_push_metadata['execution_time'] = execution_time
2280 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002281 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002282
Edward Lemur1b52d872019-05-09 21:12:12 +00002283 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002284 gclient_utils.rmtree(traces_dir)
2285
2286 return push_stdout
2287
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002288 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2289 change_desc):
2290 """Upload the current branch to Gerrit, retry if new remote HEAD is
2291 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002292 remote, remote_branch = self.GetRemoteBranch()
2293 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2294
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002295 try:
2296 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002297 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002298 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002299 # Repository might be in the middle of transition to main branch as
2300 # default, and uploads to old default might be blocked.
2301 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002302 DieWithError(str(e), change_desc)
2303
Josip Sokcevicb631a882021-01-06 18:18:10 +00002304 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2305 self.GetGerritProject())
2306 if project_head == branch:
2307 DieWithError(str(e), change_desc)
2308 branch = project_head
2309
2310 print("WARNING: Fetching remote state and retrying upload to default "
2311 "branch...")
2312 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002313 options.edit_description = False
2314 options.force = True
2315 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002316 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2317 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002318 except GitPushError as e:
2319 DieWithError(str(e), change_desc)
2320
2321 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002322 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002323 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002324 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002325 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002327 # User requested to change description
2328 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002329 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002330 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002331 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002332 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002333 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002334 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002335 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002336 if len(change_ids) == 1:
2337 change_id = change_ids[0]
2338 else:
2339 change_id = GenerateGerritChangeId(change_desc.description)
2340 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002342 if options.preserve_tryjobs:
2343 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002344
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002346 parent = self._ComputeParent(
2347 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002348 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002349 with gclient_utils.temporary_file() as desc_tempfile:
2350 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2351 ref_to_push = RunGit(
2352 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002353 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002354 if options.no_add_changeid:
2355 pass
2356 else: # adding Change-Ids is okay.
2357 if not git_footers.get_footer_change_id(change_desc.description):
2358 DownloadGerritHook(False)
2359 change_desc.set_description(
2360 self._AddChangeIdToCommitMessage(change_desc.description,
2361 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002362 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002363 # For no-squash mode, we assume the remote called "origin" is the one we
2364 # want. It is not worthwhile to support different workflows for
2365 # no-squash mode.
2366 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002367 # attempt to extract the changeid from the current description
2368 # fail informatively if not possible.
2369 change_id_candidates = git_footers.get_footer_change_id(
2370 change_desc.description)
2371 if not change_id_candidates:
2372 DieWithError("Unable to extract change-id from message.")
2373 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002375 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002376 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2377 ref_to_push)]).splitlines()
2378 if len(commits) > 1:
2379 print('WARNING: This will upload %d commits. Run the following command '
2380 'to see which commits will be uploaded: ' % len(commits))
2381 print('git log %s..%s' % (parent, ref_to_push))
2382 print('You can also use `git squash-branch` to squash these into a '
2383 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002384 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002385
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002386 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002387 cc = []
2388 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2389 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2390 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002391 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002392 if len(cc) > 100:
2393 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2394 'process/lsc/lsc_workflow.md')
2395 print('WARNING: This will auto-CC %s users.' % len(cc))
2396 print('LSC may be more appropriate: %s' % lsc)
2397 print('You can also use the --no-autocc flag to disable auto-CC.')
2398 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002399 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002400 if options.cc:
2401 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002402 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002403 if change_desc.get_cced():
2404 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002405 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002406 valid_accounts = set(reviewers + cc)
2407 # TODO(crbug/877717): relax this for all hosts.
2408 else:
2409 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002410 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002411 logging.info('accounts %s are recognized, %s invalid',
2412 sorted(valid_accounts),
2413 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002414
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002415 # Extra options that can be specified at push time. Doc:
2416 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002417 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002418
Aaron Gable844cf292017-06-28 11:32:59 -07002419 # By default, new changes are started in WIP mode, and subsequent patchsets
2420 # don't send email. At any time, passing --send-mail will mark the change
2421 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002422 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002423 refspec_opts.append('ready')
2424 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002425 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002426 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002427 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002428 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002429
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002430 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002431 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002432
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002433 # Set options.title in case user was prompted in _GetTitleForUpload and
2434 # _CMDUploadChange needs to be called again.
2435 options.title = self._GetTitleForUpload(options)
2436 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002437 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002438 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002439 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002440
agablec6787972016-09-09 16:13:34 -07002441 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002442 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002443
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002444 for r in sorted(reviewers):
2445 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002446 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002447 reviewers.remove(r)
2448 else:
2449 # TODO(tandrii): this should probably be a hard failure.
2450 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2451 % r)
2452 for c in sorted(cc):
2453 # refspec option will be rejected if cc doesn't correspond to an
2454 # account, even though REST call to add such arbitrary cc may succeed.
2455 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002456 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002457 cc.remove(c)
2458
rmistry9eadede2016-09-19 11:22:43 -07002459 if options.topic:
2460 # Documentation on Gerrit topics is here:
2461 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002462 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002463
Edward Lemur687ca902018-12-05 02:30:30 +00002464 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002465 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002466 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002467 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002468 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002469 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002470 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002471 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002472 elif options.cq_quick_run:
2473 refspec_opts.append('l=Commit-Queue+1')
2474 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002475
2476 if change_desc.get_reviewers(tbr_only=True):
2477 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002478 self.GetGerritHost(),
2479 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002480 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002481
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002482 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002483 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002484 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002485 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002486 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2487
2488 refspec_suffix = ''
2489 if refspec_opts:
2490 refspec_suffix = '%' + ','.join(refspec_opts)
2491 assert ' ' not in refspec_suffix, (
2492 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2493 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002494
Edward Lemur1b52d872019-05-09 21:12:12 +00002495 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002496 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002497 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002498 'change_id': change_id,
2499 'description': change_desc.description,
2500 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002501
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002502 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002503 git_push_metadata,
2504 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002505
2506 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002507 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002508 change_numbers = [m.group(1)
2509 for m in map(regex.match, push_stdout.splitlines())
2510 if m]
2511 if len(change_numbers) != 1:
2512 DieWithError(
2513 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002514 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002515 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002516 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002517
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002518 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002519 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002520 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002521 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002522 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002523 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002524 reviewers, cc,
2525 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002526
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002527 return 0
2528
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002529 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2530 change_desc):
2531 """Computes parent of the generated commit to be uploaded to Gerrit.
2532
2533 Returns revision or a ref name.
2534 """
2535 if custom_cl_base:
2536 # Try to avoid creating additional unintended CLs when uploading, unless
2537 # user wants to take this risk.
2538 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2539 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2540 local_ref_of_target_remote])
2541 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002542 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002543 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2544 'If you proceed with upload, more than 1 CL may be created by '
2545 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2546 'If you are certain that specified base `%s` has already been '
2547 'uploaded to Gerrit as another CL, you may proceed.\n' %
2548 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2549 if not force:
2550 confirm_or_exit(
2551 'Do you take responsibility for cleaning up potential mess '
2552 'resulting from proceeding with upload?',
2553 action='upload')
2554 return custom_cl_base
2555
Aaron Gablef97e33d2017-03-30 15:44:27 -07002556 if remote != '.':
2557 return self.GetCommonAncestorWithUpstream()
2558
2559 # If our upstream branch is local, we base our squashed commit on its
2560 # squashed version.
2561 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2562
Aaron Gablef97e33d2017-03-30 15:44:27 -07002563 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002564 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002565 if upstream_branch_name == 'main':
2566 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002567
2568 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002569 # TODO(tandrii): consider checking parent change in Gerrit and using its
2570 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2571 # the tree hash of the parent branch. The upside is less likely bogus
2572 # requests to reupload parent change just because it's uploadhash is
2573 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002574 parent = scm.GIT.GetBranchConfig(
2575 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002576 # Verify that the upstream branch has been uploaded too, otherwise
2577 # Gerrit will create additional CLs when uploading.
2578 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2579 RunGitSilent(['rev-parse', parent + ':'])):
2580 DieWithError(
2581 '\nUpload upstream branch %s first.\n'
2582 'It is likely that this branch has been rebased since its last '
2583 'upload, so you just need to upload it again.\n'
2584 '(If you uploaded it with --no-squash, then branch dependencies '
2585 'are not supported, and you should reupload with --squash.)'
2586 % upstream_branch_name,
2587 change_desc)
2588 return parent
2589
Edward Lemura12175c2020-03-09 16:58:26 +00002590 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002591 """Re-commits using the current message, assumes the commit hook is in
2592 place.
2593 """
Edward Lemura12175c2020-03-09 16:58:26 +00002594 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002595 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002596 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002597 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002598 return new_log_desc
2599 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002600 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002601
tandriie113dfd2016-10-11 10:20:12 -07002602 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002603 try:
2604 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002605 except GerritChangeNotExists:
2606 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002607
2608 if data['status'] in ('ABANDONED', 'MERGED'):
2609 return 'CL %s is closed' % self.GetIssue()
2610
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002611 def GetGerritChange(self, patchset=None):
2612 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002613 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002614 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002615 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002616 data = self._GetChangeDetail(['ALL_REVISIONS'])
2617
2618 assert host and issue and patchset, 'CL must be uploaded first'
2619
2620 has_patchset = any(
2621 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002622 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002623 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002624 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002625 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002626
tandrii8c5a3532016-11-04 07:52:02 -07002627 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002628 'host': host,
2629 'change': issue,
2630 'project': data['project'],
2631 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002632 }
tandriie113dfd2016-10-11 10:20:12 -07002633
tandriide281ae2016-10-12 06:02:30 -07002634 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002635 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002636
Edward Lemur707d70b2018-02-07 00:50:14 +01002637 def GetReviewers(self):
2638 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002639 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002640
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002641
Lei Zhang8a0efc12020-08-05 19:58:45 +00002642def _get_bug_line_values(default_project_prefix, bugs):
2643 """Given default_project_prefix and comma separated list of bugs, yields bug
2644 line values.
tandriif9aefb72016-07-01 09:06:51 -07002645
2646 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002647 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002648 * string, which is left as is.
2649
2650 This function may produce more than one line, because bugdroid expects one
2651 project per line.
2652
Lei Zhang8a0efc12020-08-05 19:58:45 +00002653 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002654 ['v8:123', 'chromium:789']
2655 """
2656 default_bugs = []
2657 others = []
2658 for bug in bugs.split(','):
2659 bug = bug.strip()
2660 if bug:
2661 try:
2662 default_bugs.append(int(bug))
2663 except ValueError:
2664 others.append(bug)
2665
2666 if default_bugs:
2667 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002668 if default_project_prefix:
2669 if not default_project_prefix.endswith(':'):
2670 default_project_prefix += ':'
2671 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002672 else:
2673 yield default_bugs
2674 for other in sorted(others):
2675 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2676 yield other
2677
2678
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002679class ChangeDescription(object):
2680 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002681 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002682 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002683 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002684 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002685 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002686 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2687 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002688 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002689 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002690
Dan Beamd8b04ca2019-10-10 21:23:26 +00002691 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002692 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002693 if bug:
2694 regexp = re.compile(self.BUG_LINE)
2695 prefix = settings.GetBugPrefix()
2696 if not any((regexp.match(line) for line in self._description_lines)):
2697 values = list(_get_bug_line_values(prefix, bug))
2698 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002699 if fixed:
2700 regexp = re.compile(self.FIXED_LINE)
2701 prefix = settings.GetBugPrefix()
2702 if not any((regexp.match(line) for line in self._description_lines)):
2703 values = list(_get_bug_line_values(prefix, fixed))
2704 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002705
agable@chromium.org42c20792013-09-12 17:34:49 +00002706 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002707 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002708 return '\n'.join(self._description_lines)
2709
2710 def set_description(self, desc):
2711 if isinstance(desc, basestring):
2712 lines = desc.splitlines()
2713 else:
2714 lines = [line.rstrip() for line in desc]
2715 while lines and not lines[0]:
2716 lines.pop(0)
2717 while lines and not lines[-1]:
2718 lines.pop(-1)
2719 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002720
Edward Lemur5a644f82020-03-18 16:44:57 +00002721 def ensure_change_id(self, change_id):
2722 description = self.description
2723 footer_change_ids = git_footers.get_footer_change_id(description)
2724 # Make sure that the Change-Id in the description matches the given one.
2725 if footer_change_ids != [change_id]:
2726 if footer_change_ids:
2727 # Remove any existing Change-Id footers since they don't match the
2728 # expected change_id footer.
2729 description = git_footers.remove_footer(description, 'Change-Id')
2730 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2731 'if you want to set a new one.')
2732 # Add the expected Change-Id footer.
2733 description = git_footers.add_footer_change_id(description, change_id)
2734 self.set_description(description)
2735
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002736 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002737 """Rewrites the R=/TBR= line(s) as a single line each.
2738
2739 Args:
2740 reviewers (list(str)) - list of additional emails to use for reviewers.
2741 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002742 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002743 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002744 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002745
2746 reviewers = set(reviewers)
2747 tbrs = set(tbrs)
2748 LOOKUP = {
2749 'TBR': tbrs,
2750 'R': reviewers,
2751 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002752
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002753 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002754 regexp = re.compile(self.R_LINE)
2755 matches = [regexp.match(line) for line in self._description_lines]
2756 new_desc = [l for i, l in enumerate(self._description_lines)
2757 if not matches[i]]
2758 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002759
agable@chromium.org42c20792013-09-12 17:34:49 +00002760 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002761
2762 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002763 for match in matches:
2764 if not match:
2765 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002766 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2767
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002768 # If any folks ended up in both groups, remove them from tbrs.
2769 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002770
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002771 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2772 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002773
2774 # Put the new lines in the description where the old first R= line was.
2775 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2776 if 0 <= line_loc < len(self._description_lines):
2777 if new_tbr_line:
2778 self._description_lines.insert(line_loc, new_tbr_line)
2779 if new_r_line:
2780 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002781 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002782 if new_r_line:
2783 self.append_footer(new_r_line)
2784 if new_tbr_line:
2785 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002786
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002787 def set_preserve_tryjobs(self):
2788 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2789 footers = git_footers.parse_footers(self.description)
2790 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2791 if v.lower() == 'true':
2792 return
2793 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2794
Anthony Polito8b955342019-09-24 19:01:36 +00002795 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002796 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002797 self.set_description([
2798 '# Enter a description of the change.',
2799 '# This will be displayed on the codereview site.',
2800 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002801 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002802 '--------------------',
2803 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002804 bug_regexp = re.compile(self.BUG_LINE)
2805 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002806 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002807 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002808
Dan Beamd8b04ca2019-10-10 21:23:26 +00002809 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002810 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002811
Bruce Dawsonfc487042020-10-27 19:11:37 +00002812 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002813 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002814 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002815 if not content:
2816 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002817 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002818
Bruce Dawson2377b012018-01-11 16:46:49 -08002819 # Strip off comments and default inserted "Bug:" line.
2820 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002821 (line.startswith('#') or
2822 line.rstrip() == "Bug:" or
2823 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002824 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002825 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002826 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002827
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002828 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002829 """Adds a footer line to the description.
2830
2831 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2832 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2833 that Gerrit footers are always at the end.
2834 """
2835 parsed_footer_line = git_footers.parse_footer(line)
2836 if parsed_footer_line:
2837 # Line is a gerrit footer in the form: Footer-Key: any value.
2838 # Thus, must be appended observing Gerrit footer rules.
2839 self.set_description(
2840 git_footers.add_footer(self.description,
2841 key=parsed_footer_line[0],
2842 value=parsed_footer_line[1]))
2843 return
2844
2845 if not self._description_lines:
2846 self._description_lines.append(line)
2847 return
2848
2849 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2850 if gerrit_footers:
2851 # git_footers.split_footers ensures that there is an empty line before
2852 # actual (gerrit) footers, if any. We have to keep it that way.
2853 assert top_lines and top_lines[-1] == ''
2854 top_lines, separator = top_lines[:-1], top_lines[-1:]
2855 else:
2856 separator = [] # No need for separator if there are no gerrit_footers.
2857
2858 prev_line = top_lines[-1] if top_lines else ''
2859 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2860 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2861 top_lines.append('')
2862 top_lines.append(line)
2863 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002864
tandrii99a72f22016-08-17 14:33:24 -07002865 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002867 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002868 reviewers = [match.group(2).strip()
2869 for match in matches
2870 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002871 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002872
bradnelsond975b302016-10-23 12:20:23 -07002873 def get_cced(self):
2874 """Retrieves the list of reviewers."""
2875 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2876 cced = [match.group(2).strip() for match in matches if match]
2877 return cleanup_list(cced)
2878
Nodir Turakulov23b82142017-11-16 11:04:25 -08002879 def get_hash_tags(self):
2880 """Extracts and sanitizes a list of Gerrit hashtags."""
2881 subject = (self._description_lines or ('',))[0]
2882 subject = re.sub(
2883 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2884
2885 tags = []
2886 start = 0
2887 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2888 while True:
2889 m = bracket_exp.match(subject, start)
2890 if not m:
2891 break
2892 tags.append(self.sanitize_hash_tag(m.group(1)))
2893 start = m.end()
2894
2895 if not tags:
2896 # Try "Tag: " prefix.
2897 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2898 if m:
2899 tags.append(self.sanitize_hash_tag(m.group(1)))
2900 return tags
2901
2902 @classmethod
2903 def sanitize_hash_tag(cls, tag):
2904 """Returns a sanitized Gerrit hash tag.
2905
2906 A sanitized hashtag can be used as a git push refspec parameter value.
2907 """
2908 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2909
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002910
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002911def FindCodereviewSettingsFile(filename='codereview.settings'):
2912 """Finds the given file starting in the cwd and going up.
2913
2914 Only looks up to the top of the repository unless an
2915 'inherit-review-settings-ok' file exists in the root of the repository.
2916 """
2917 inherit_ok_file = 'inherit-review-settings-ok'
2918 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002919 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002920 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2921 root = '/'
2922 while True:
2923 if filename in os.listdir(cwd):
2924 if os.path.isfile(os.path.join(cwd, filename)):
2925 return open(os.path.join(cwd, filename))
2926 if cwd == root:
2927 break
2928 cwd = os.path.dirname(cwd)
2929
2930
2931def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002932 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002933 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002934
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002935 def SetProperty(name, setting, unset_error_ok=False):
2936 fullname = 'rietveld.' + name
2937 if setting in keyvals:
2938 RunGit(['config', fullname, keyvals[setting]])
2939 else:
2940 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2941
tandrii48df5812016-10-17 03:55:37 -07002942 if not keyvals.get('GERRIT_HOST', False):
2943 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002944 # Only server setting is required. Other settings can be absent.
2945 # In that case, we ignore errors raised during option deletion attempt.
2946 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2947 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2948 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002949 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002950 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2951 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002952 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2953 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002954 SetProperty(
2955 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002956
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002957 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002958 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002959
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002960 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002961 RunGit(['config', 'gerrit.squash-uploads',
2962 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002963
tandrii@chromium.org28253532016-04-14 13:46:56 +00002964 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002965 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002966 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2967
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002968 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002969 # should be of the form
2970 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2971 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002972 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2973 keyvals['ORIGIN_URL_CONFIG']])
2974
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002975
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002976def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002977 """Downloads a network object to a local file, like urllib.urlretrieve.
2978
2979 This is necessary because urllib is broken for SSL connections via a proxy.
2980 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002981 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002982 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002983
2984
ukai@chromium.org712d6102013-11-27 00:52:58 +00002985def hasSheBang(fname):
2986 """Checks fname is a #! script."""
2987 with open(fname) as f:
2988 return f.read(2).startswith('#!')
2989
2990
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002991def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002992 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002993
2994 Args:
2995 force: True to update hooks. False to install hooks if not present.
2996 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002997 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002998 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2999 if not os.access(dst, os.X_OK):
3000 if os.path.exists(dst):
3001 if not force:
3002 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003003 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003004 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003005 if not hasSheBang(dst):
3006 DieWithError('Not a script: %s\n'
3007 'You need to download from\n%s\n'
3008 'into .git/hooks/commit-msg and '
3009 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003010 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3011 except Exception:
3012 if os.path.exists(dst):
3013 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003014 DieWithError('\nFailed to download hooks.\n'
3015 'You need to download from\n%s\n'
3016 'into .git/hooks/commit-msg and '
3017 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003018
3019
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003020class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003021 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003022
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003023 _GOOGLESOURCE = 'googlesource.com'
3024
3025 def __init__(self):
3026 # Cached list of [host, identity, source], where source is either
3027 # .gitcookies or .netrc.
3028 self._all_hosts = None
3029
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003030 def ensure_configured_gitcookies(self):
3031 """Runs checks and suggests fixes to make git use .gitcookies from default
3032 path."""
3033 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3034 configured_path = RunGitSilent(
3035 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003036 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003037 if configured_path:
3038 self._ensure_default_gitcookies_path(configured_path, default)
3039 else:
3040 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003041
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003042 @staticmethod
3043 def _ensure_default_gitcookies_path(configured_path, default_path):
3044 assert configured_path
3045 if configured_path == default_path:
3046 print('git is already configured to use your .gitcookies from %s' %
3047 configured_path)
3048 return
3049
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003050 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003051 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3052 (configured_path, default_path))
3053
3054 if not os.path.exists(configured_path):
3055 print('However, your configured .gitcookies file is missing.')
3056 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3057 action='reconfigure')
3058 RunGit(['config', '--global', 'http.cookiefile', default_path])
3059 return
3060
3061 if os.path.exists(default_path):
3062 print('WARNING: default .gitcookies file already exists %s' %
3063 default_path)
3064 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3065 default_path)
3066
3067 confirm_or_exit('Move existing .gitcookies to default location?',
3068 action='move')
3069 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003070 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003071 print('Moved and reconfigured git to use .gitcookies from %s' %
3072 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003073
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003074 @staticmethod
3075 def _configure_gitcookies_path(default_path):
3076 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3077 if os.path.exists(netrc_path):
3078 print('You seem to be using outdated .netrc for git credentials: %s' %
3079 netrc_path)
3080 print('This tool will guide you through setting up recommended '
3081 '.gitcookies store for git credentials.\n'
3082 '\n'
3083 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3084 ' git config --global --unset http.cookiefile\n'
3085 ' mv %s %s.backup\n\n' % (default_path, default_path))
3086 confirm_or_exit(action='setup .gitcookies')
3087 RunGit(['config', '--global', 'http.cookiefile', default_path])
3088 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003089
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003090 def get_hosts_with_creds(self, include_netrc=False):
3091 if self._all_hosts is None:
3092 a = gerrit_util.CookiesAuthenticator()
3093 self._all_hosts = [
3094 (h, u, s)
3095 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003096 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3097 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003098 )
3099 if h.endswith(self._GOOGLESOURCE)
3100 ]
3101
3102 if include_netrc:
3103 return self._all_hosts
3104 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3105
3106 def print_current_creds(self, include_netrc=False):
3107 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3108 if not hosts:
3109 print('No Git/Gerrit credentials found')
3110 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003111 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003112 header = [('Host', 'User', 'Which file'),
3113 ['=' * l for l in lengths]]
3114 for row in (header + hosts):
3115 print('\t'.join((('%%+%ds' % l) % s)
3116 for l, s in zip(lengths, row)))
3117
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003118 @staticmethod
3119 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003120 """Parses identity "git-<username>.domain" into <username> and domain."""
3121 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003122 # distinguishable from sub-domains. But we do know typical domains:
3123 if identity.endswith('.chromium.org'):
3124 domain = 'chromium.org'
3125 username = identity[:-len('.chromium.org')]
3126 else:
3127 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003128 if username.startswith('git-'):
3129 username = username[len('git-'):]
3130 return username, domain
3131
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003132 def _canonical_git_googlesource_host(self, host):
3133 """Normalizes Gerrit hosts (with '-review') to Git host."""
3134 assert host.endswith(self._GOOGLESOURCE)
3135 # Prefix doesn't include '.' at the end.
3136 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3137 if prefix.endswith('-review'):
3138 prefix = prefix[:-len('-review')]
3139 return prefix + '.' + self._GOOGLESOURCE
3140
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003141 def _canonical_gerrit_googlesource_host(self, host):
3142 git_host = self._canonical_git_googlesource_host(host)
3143 prefix = git_host.split('.', 1)[0]
3144 return prefix + '-review.' + self._GOOGLESOURCE
3145
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003146 def _get_counterpart_host(self, host):
3147 assert host.endswith(self._GOOGLESOURCE)
3148 git = self._canonical_git_googlesource_host(host)
3149 gerrit = self._canonical_gerrit_googlesource_host(git)
3150 return git if gerrit == host else gerrit
3151
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003152 def has_generic_host(self):
3153 """Returns whether generic .googlesource.com has been configured.
3154
3155 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3156 """
3157 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3158 if host == '.' + self._GOOGLESOURCE:
3159 return True
3160 return False
3161
3162 def _get_git_gerrit_identity_pairs(self):
3163 """Returns map from canonic host to pair of identities (Git, Gerrit).
3164
3165 One of identities might be None, meaning not configured.
3166 """
3167 host_to_identity_pairs = {}
3168 for host, identity, _ in self.get_hosts_with_creds():
3169 canonical = self._canonical_git_googlesource_host(host)
3170 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3171 idx = 0 if canonical == host else 1
3172 pair[idx] = identity
3173 return host_to_identity_pairs
3174
3175 def get_partially_configured_hosts(self):
3176 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003177 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003178 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003179 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003180
3181 def get_conflicting_hosts(self):
3182 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003183 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003184 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003185 if None not in (i1, i2) and i1 != i2)
3186
3187 def get_duplicated_hosts(self):
3188 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003189 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003190
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003191
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003192 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003193 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003194 hosts = sorted(hosts)
3195 assert hosts
3196 if extra_column_func is None:
3197 extras = [''] * len(hosts)
3198 else:
3199 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003200 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3201 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003202 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003203 lines.append(tmpl % he)
3204 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003205
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003206 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003207 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003208 yield ('.googlesource.com wildcard record detected',
3209 ['Chrome Infrastructure team recommends to list full host names '
3210 'explicitly.'],
3211 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003212
3213 dups = self.get_duplicated_hosts()
3214 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003215 yield ('The following hosts were defined twice',
3216 self._format_hosts(dups),
3217 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003218
3219 partial = self.get_partially_configured_hosts()
3220 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003221 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3222 'These hosts are missing',
3223 self._format_hosts(partial, lambda host: 'but %s defined' %
3224 self._get_counterpart_host(host)),
3225 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003226
3227 conflicting = self.get_conflicting_hosts()
3228 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003229 yield ('The following Git hosts have differing credentials from their '
3230 'Gerrit counterparts',
3231 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3232 tuple(self._get_git_gerrit_identity_pairs()[host])),
3233 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003234
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003235 def find_and_report_problems(self):
3236 """Returns True if there was at least one problem, else False."""
3237 found = False
3238 bad_hosts = set()
3239 for title, sublines, hosts in self._find_problems():
3240 if not found:
3241 found = True
3242 print('\n\n.gitcookies problem report:\n')
3243 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003244 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003245 if sublines:
3246 print()
3247 print(' %s' % '\n '.join(sublines))
3248 print()
3249
3250 if bad_hosts:
3251 assert found
3252 print(' You can manually remove corresponding lines in your %s file and '
3253 'visit the following URLs with correct account to generate '
3254 'correct credential lines:\n' %
3255 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3256 print(' %s' % '\n '.join(sorted(set(
3257 gerrit_util.CookiesAuthenticator().get_new_password_url(
3258 self._canonical_git_googlesource_host(host))
3259 for host in bad_hosts
3260 ))))
3261 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003262
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003263
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003264@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003265def CMDcreds_check(parser, args):
3266 """Checks credentials and suggests changes."""
3267 _, _ = parser.parse_args(args)
3268
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003269 # Code below checks .gitcookies. Abort if using something else.
3270 authn = gerrit_util.Authenticator.get()
3271 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003272 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003273 'This command is not designed for bot environment. It checks '
3274 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003275 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3276 if isinstance(authn, gerrit_util.GceAuthenticator):
3277 message += (
3278 '\n'
3279 'If you need to run this on GCE or a cloudtop instance, '
3280 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3281 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003282
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003283 checker = _GitCookiesChecker()
3284 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003285
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003286 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003287 checker.print_current_creds(include_netrc=True)
3288
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003290 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291 return 0
3292 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003293
3294
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003295@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003296def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003297 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003298 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003299 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003300 _, args = parser.parse_args(args)
3301 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003302 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003303 return RunGit(['config', 'branch.%s.base-url' % branch],
3304 error_ok=False).strip()
3305 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003306 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003307 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3308 error_ok=False).strip()
3309
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003310
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003311def color_for_status(status):
3312 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003313 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003314 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003315 'unsent': BOLD + Fore.YELLOW,
3316 'waiting': BOLD + Fore.RED,
3317 'reply': BOLD + Fore.YELLOW,
3318 'not lgtm': BOLD + Fore.RED,
3319 'lgtm': BOLD + Fore.GREEN,
3320 'commit': BOLD + Fore.MAGENTA,
3321 'closed': BOLD + Fore.CYAN,
3322 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003323 }.get(status, Fore.WHITE)
3324
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003325
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003326def get_cl_statuses(changes, fine_grained, max_processes=None):
3327 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003328
3329 If fine_grained is true, this will fetch CL statuses from the server.
3330 Otherwise, simply indicate if there's a matching url for the given branches.
3331
3332 If max_processes is specified, it is used as the maximum number of processes
3333 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3334 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003335
3336 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003337 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003338 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003339 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003340
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003341 if not fine_grained:
3342 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003343 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003344 for cl in changes:
3345 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003346 return
3347
3348 # First, sort out authentication issues.
3349 logging.debug('ensuring credentials exist')
3350 for cl in changes:
3351 cl.EnsureAuthenticated(force=False, refresh=True)
3352
3353 def fetch(cl):
3354 try:
3355 return (cl, cl.GetStatus())
3356 except:
3357 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003358 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003359 raise
3360
3361 threads_count = len(changes)
3362 if max_processes:
3363 threads_count = max(1, min(threads_count, max_processes))
3364 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3365
Edward Lemur61bf4172020-02-24 23:22:37 +00003366 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003367 fetched_cls = set()
3368 try:
3369 it = pool.imap_unordered(fetch, changes).__iter__()
3370 while True:
3371 try:
3372 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003373 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003374 break
3375 fetched_cls.add(cl)
3376 yield cl, status
3377 finally:
3378 pool.close()
3379
3380 # Add any branches that failed to fetch.
3381 for cl in set(changes) - fetched_cls:
3382 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003383
rmistry@google.com2dd99862015-06-22 12:22:18 +00003384
Jose Lopes3863fc52020-04-07 17:00:25 +00003385def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003386 """Uploads CLs of local branches that are dependents of the current branch.
3387
3388 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003389
3390 test1 -> test2.1 -> test3.1
3391 -> test3.2
3392 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003393
3394 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3395 run on the dependent branches in this order:
3396 test2.1, test3.1, test3.2, test2.2, test3.3
3397
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003398 Note: This function does not rebase your local dependent branches. Use it
3399 when you make a change to the parent branch that will not conflict
3400 with its dependent branches, and you would like their dependencies
3401 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003402 """
3403 if git_common.is_dirty_git_tree('upload-branch-deps'):
3404 return 1
3405
3406 root_branch = cl.GetBranch()
3407 if root_branch is None:
3408 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3409 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003410 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003411 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3412 'patchset dependencies without an uploaded CL.')
3413
3414 branches = RunGit(['for-each-ref',
3415 '--format=%(refname:short) %(upstream:short)',
3416 'refs/heads'])
3417 if not branches:
3418 print('No local branches found.')
3419 return 0
3420
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003421 # Create a dictionary of all local branches to the branches that are
3422 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003423 tracked_to_dependents = collections.defaultdict(list)
3424 for b in branches.splitlines():
3425 tokens = b.split()
3426 if len(tokens) == 2:
3427 branch_name, tracked = tokens
3428 tracked_to_dependents[tracked].append(branch_name)
3429
vapiera7fbd5a2016-06-16 09:17:49 -07003430 print()
3431 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003432 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003433
rmistry@google.com2dd99862015-06-22 12:22:18 +00003434 def traverse_dependents_preorder(branch, padding=''):
3435 dependents_to_process = tracked_to_dependents.get(branch, [])
3436 padding += ' '
3437 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003438 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003439 dependents.append(dependent)
3440 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003441
rmistry@google.com2dd99862015-06-22 12:22:18 +00003442 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003443 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003444
3445 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003446 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003447 return 0
3448
Jose Lopes3863fc52020-04-07 17:00:25 +00003449 if not force:
3450 confirm_or_exit('This command will checkout all dependent branches and run '
3451 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003452
rmistry@google.com2dd99862015-06-22 12:22:18 +00003453 # Record all dependents that failed to upload.
3454 failures = {}
3455 # Go through all dependents, checkout the branch and upload.
3456 try:
3457 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003458 print()
3459 print('--------------------------------------')
3460 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003461 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003462 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003463 try:
3464 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003465 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003466 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003467 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003468 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003469 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003470 finally:
3471 # Swap back to the original root branch.
3472 RunGit(['checkout', '-q', root_branch])
3473
vapiera7fbd5a2016-06-16 09:17:49 -07003474 print()
3475 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003476 for dependent_branch in dependents:
3477 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003478 print(' %s : %s' % (dependent_branch, upload_status))
3479 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003480
3481 return 0
3482
3483
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003484def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003485 """Given a proposed tag name, returns a tag name that is guaranteed to be
3486 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3487 or 'foo-3', and so on."""
3488
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003489 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003490 for suffix_num in itertools.count(1):
3491 if suffix_num == 1:
3492 to_check = proposed_tag
3493 else:
3494 to_check = '%s-%d' % (proposed_tag, suffix_num)
3495
3496 if to_check not in existing_tags:
3497 return to_check
3498
3499
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003500@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003501def CMDarchive(parser, args):
3502 """Archives and deletes branches associated with closed changelists."""
3503 parser.add_option(
3504 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003505 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003506 parser.add_option(
3507 '-f', '--force', action='store_true',
3508 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003509 parser.add_option(
3510 '-d', '--dry-run', action='store_true',
3511 help='Skip the branch tagging and removal steps.')
3512 parser.add_option(
3513 '-t', '--notags', action='store_true',
3514 help='Do not tag archived branches. '
3515 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003516 parser.add_option(
3517 '-p',
3518 '--pattern',
3519 default='git-cl-archived-{issue}-{branch}',
3520 help='Format string for archive tags. '
3521 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003522
kmarshall3bff56b2016-06-06 18:31:47 -07003523 options, args = parser.parse_args(args)
3524 if args:
3525 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003526
3527 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3528 if not branches:
3529 return 0
3530
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003531 tags = RunGit(['for-each-ref', '--format=%(refname)',
3532 'refs/tags']).splitlines() or []
3533 tags = [t.split('/')[-1] for t in tags]
3534
vapiera7fbd5a2016-06-16 09:17:49 -07003535 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003536 changes = [Changelist(branchref=b)
3537 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003538 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3539 statuses = get_cl_statuses(changes,
3540 fine_grained=True,
3541 max_processes=options.maxjobs)
3542 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003543 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3544 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003545 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003546 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003547 proposal.sort()
3548
3549 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003550 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003551 return 0
3552
Edward Lemur85153282020-02-14 22:06:29 +00003553 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003554
vapiera7fbd5a2016-06-16 09:17:49 -07003555 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003556 if options.notags:
3557 for next_item in proposal:
3558 print(' ' + next_item[0])
3559 else:
3560 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3561 for next_item in proposal:
3562 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003563
kmarshall9249e012016-08-23 12:02:16 -07003564 # Quit now on precondition failure or if instructed by the user, either
3565 # via an interactive prompt or by command line flags.
3566 if options.dry_run:
3567 print('\nNo changes were made (dry run).\n')
3568 return 0
3569 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003570 print('You are currently on a branch \'%s\' which is associated with a '
3571 'closed codereview issue, so archive cannot proceed. Please '
3572 'checkout another branch and run this command again.' %
3573 current_branch)
3574 return 1
kmarshall9249e012016-08-23 12:02:16 -07003575 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003576 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003577 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003578 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003579 return 1
3580
3581 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003582 if not options.notags:
3583 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003584
3585 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3586 # Clean up the tag if we failed to delete the branch.
3587 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003588
vapiera7fbd5a2016-06-16 09:17:49 -07003589 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003590
3591 return 0
3592
3593
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003594@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003595def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003596 """Show status of changelists.
3597
3598 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003599 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003600 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003601 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003602 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003603 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003604 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003605 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003606
3607 Also see 'git cl comments'.
3608 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003609 parser.add_option(
3610 '--no-branch-color',
3611 action='store_true',
3612 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003613 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003614 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003615 parser.add_option('-f', '--fast', action='store_true',
3616 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003617 parser.add_option(
3618 '-j', '--maxjobs', action='store', type=int,
3619 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003620 parser.add_option(
3621 '-i', '--issue', type=int,
3622 help='Operate on this issue instead of the current branch\'s implicit '
3623 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003624 parser.add_option('-d',
3625 '--date-order',
3626 action='store_true',
3627 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003628 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003629 if args:
3630 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003631
iannuccie53c9352016-08-17 14:40:40 -07003632 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003633 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003634
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003635 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003636 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003637 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003638 if cl.GetIssue():
3639 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003640 elif options.field == 'id':
3641 issueid = cl.GetIssue()
3642 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003643 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003644 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003645 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003646 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003647 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003648 elif options.field == 'status':
3649 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003650 elif options.field == 'url':
3651 url = cl.GetIssueURL()
3652 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003653 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003654 return 0
3655
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003656 branches = RunGit([
3657 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3658 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003659 if not branches:
3660 print('No local branch found.')
3661 return 0
3662
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003663 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003664 Changelist(branchref=b, commit_date=ct)
3665 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3666 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003667 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003668 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003669 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003670 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003671
Edward Lemur85153282020-02-14 22:06:29 +00003672 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003673
3674 def FormatBranchName(branch, colorize=False):
3675 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3676 an asterisk when it is the current branch."""
3677
3678 asterisk = ""
3679 color = Fore.RESET
3680 if branch == current_branch:
3681 asterisk = "* "
3682 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003683 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003684
3685 if colorize:
3686 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003687 return asterisk + branch_name
3688
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003689 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003690
3691 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003692 if options.date_order:
3693 sorted_changes = sorted(changes,
3694 key=lambda c: c.GetCommitDate(),
3695 reverse=True)
3696 else:
3697 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3698 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003699 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003700 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003701 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003702 branch_statuses[c.GetBranch()] = status
3703 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003704 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003705 if url and (not status or status == 'error'):
3706 # The issue probably doesn't exist anymore.
3707 url += ' (broken)'
3708
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003709 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003710 # Turn off bold as well as colors.
3711 END = '\033[0m'
3712 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003713 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003714 color = ''
3715 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003716 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003717
Alan Cuttera3be9a52019-03-04 18:50:33 +00003718 branch_display = FormatBranchName(branch)
3719 padding = ' ' * (alignment - len(branch_display))
3720 if not options.no_branch_color:
3721 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003722
Alan Cuttera3be9a52019-03-04 18:50:33 +00003723 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3724 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003725
vapiera7fbd5a2016-06-16 09:17:49 -07003726 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003727 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003728 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003729 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003730 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003731 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003732 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003733 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003735 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003736 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003737 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003738 return 0
3739
3740
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003741def colorize_CMDstatus_doc():
3742 """To be called once in main() to add colors to git cl status help."""
3743 colors = [i for i in dir(Fore) if i[0].isupper()]
3744
3745 def colorize_line(line):
3746 for color in colors:
3747 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003748 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003749 indent = len(line) - len(line.lstrip(' ')) + 1
3750 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3751 return line
3752
3753 lines = CMDstatus.__doc__.splitlines()
3754 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3755
3756
phajdan.jre328cf92016-08-22 04:12:17 -07003757def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003758 if path == '-':
3759 json.dump(contents, sys.stdout)
3760 else:
3761 with open(path, 'w') as f:
3762 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003763
3764
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003765@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003766@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003767def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003768 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003769
3770 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003771 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003772 parser.add_option('-r', '--reverse', action='store_true',
3773 help='Lookup the branch(es) for the specified issues. If '
3774 'no issues are specified, all branches with mapped '
3775 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003776 parser.add_option('--json',
3777 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003778 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003779
dnj@chromium.org406c4402015-03-03 17:22:28 +00003780 if options.reverse:
3781 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003782 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003783 # Reverse issue lookup.
3784 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003785
3786 git_config = {}
3787 for config in RunGit(['config', '--get-regexp',
3788 r'branch\..*issue']).splitlines():
3789 name, _space, val = config.partition(' ')
3790 git_config[name] = val
3791
dnj@chromium.org406c4402015-03-03 17:22:28 +00003792 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003793 issue = git_config.get(
3794 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003795 if issue:
3796 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003797 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003798 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003799 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003800 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003801 try:
3802 issue_num = int(issue)
3803 except ValueError:
3804 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003805 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003806 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003807 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003808 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003809 if options.json:
3810 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003811 return 0
3812
3813 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003814 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003815 if not issue.valid:
3816 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3817 'or no argument to list it.\n'
3818 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003819 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003820 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003821 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003822 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003823 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3824 if options.json:
3825 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003826 'gerrit_host': cl.GetGerritHost(),
3827 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003828 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003829 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003830 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003831 return 0
3832
3833
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003834@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003835def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003836 """Shows or posts review comments for any changelist."""
3837 parser.add_option('-a', '--add-comment', dest='comment',
3838 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003839 parser.add_option('-p', '--publish', action='store_true',
3840 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003841 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003842 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003843 parser.add_option('-m', '--machine-readable', dest='readable',
3844 action='store_false', default=True,
3845 help='output comments in a format compatible with '
3846 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003847 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003848 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003849 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003850
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003851 issue = None
3852 if options.issue:
3853 try:
3854 issue = int(options.issue)
3855 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003856 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003857
Edward Lemur934836a2019-09-09 20:16:54 +00003858 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003859
3860 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003861 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003862 return 0
3863
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003864 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3865 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003866 for comment in summary:
3867 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003868 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003869 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003870 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003871 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003872 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003873 elif comment.autogenerated:
3874 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003875 else:
3876 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003877 print('\n%s%s %s%s\n%s' % (
3878 color,
3879 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3880 comment.sender,
3881 Fore.RESET,
3882 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3883
smut@google.comc85ac942015-09-15 16:34:43 +00003884 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003885 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003886 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003887 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3888 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003889 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003890 return 0
3891
3892
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003893@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003894@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003895def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003896 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003897 parser.add_option('-d', '--display', action='store_true',
3898 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003899 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003900 help='New description to set for this issue (- for stdin, '
3901 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003902 parser.add_option('-f', '--force', action='store_true',
3903 help='Delete any unpublished Gerrit edits for this issue '
3904 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003905
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003906 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003907
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003908 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003909 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003910 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003911 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003912 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003913
Edward Lemur934836a2019-09-09 20:16:54 +00003914 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003915 if target_issue_arg:
3916 kwargs['issue'] = target_issue_arg.issue
3917 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003918
3919 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003920 if not cl.GetIssue():
3921 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003922
Edward Lemur678a6842019-10-03 22:25:05 +00003923 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003924 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003925
Edward Lemur6c6827c2020-02-06 21:15:18 +00003926 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003927
smut@google.com34fb6b12015-07-13 20:03:26 +00003928 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003929 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003930 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003931
3932 if options.new_description:
3933 text = options.new_description
3934 if text == '-':
3935 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003936 elif text == '+':
3937 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003938 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003939
3940 description.set_description(text)
3941 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003942 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003943 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003944 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003945 return 0
3946
3947
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003948@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003949def CMDlint(parser, args):
3950 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003951 parser.add_option('--filter', action='append', metavar='-x,+y',
3952 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003953 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003954
3955 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003956 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003957 try:
3958 import cpplint
3959 import cpplint_chromium
3960 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003961 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003962 return 1
3963
3964 # Change the current working directory before calling lint so that it
3965 # shows the correct base.
3966 previous_cwd = os.getcwd()
3967 os.chdir(settings.GetRoot())
3968 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003969 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003970 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003971 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003973 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003974
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003975 # Process cpplint arguments, if any.
3976 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3977 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003978 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003979
Lei Zhang379d1ad2020-07-15 19:40:06 +00003980 include_regex = re.compile(settings.GetLintRegex())
3981 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003982 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3983 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003984 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003985 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003986 continue
3987
3988 if ignore_regex.match(filename):
3989 print('Ignoring file %s' % filename)
3990 continue
3991
3992 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3993 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003994 finally:
3995 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003996 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003997 if cpplint._cpplint_state.error_count != 0:
3998 return 1
3999 return 0
4000
4001
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004002@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004003def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004004 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004005 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004006 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004007 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004008 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004009 parser.add_option('--all', action='store_true',
4010 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004011 parser.add_option('--parallel', action='store_true',
4012 help='Run all tests specified by input_api.RunTests in all '
4013 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004014 parser.add_option('--resultdb', action='store_true',
4015 help='Run presubmit checks in the ResultSink environment '
4016 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004017 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004018 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019
sbc@chromium.org71437c02015-04-09 19:29:40 +00004020 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004021 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004022 return 1
4023
Edward Lemur934836a2019-09-09 20:16:54 +00004024 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004025 if args:
4026 base_branch = args[0]
4027 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004028 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004029 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004030
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004031 if cl.GetIssue():
4032 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004033 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004034 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004035
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004036 cl.RunHook(
4037 committing=not options.upload,
4038 may_prompt=False,
4039 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00004040 parallel=options.parallel,
4041 upstream=base_branch,
4042 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004043 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004044 resultdb=options.resultdb,
4045 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004046 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004047
4048
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004049def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004050 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004051
4052 Works the same way as
4053 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4054 but can be called on demand on all platforms.
4055
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004056 The basic idea is to generate git hash of a state of the tree, original
4057 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004058 """
4059 lines = []
4060 tree_hash = RunGitSilent(['write-tree'])
4061 lines.append('tree %s' % tree_hash.strip())
4062 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4063 if code == 0:
4064 lines.append('parent %s' % parent.strip())
4065 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4066 lines.append('author %s' % author.strip())
4067 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4068 lines.append('committer %s' % committer.strip())
4069 lines.append('')
4070 # Note: Gerrit's commit-hook actually cleans message of some lines and
4071 # whitespace. This code is not doing this, but it clearly won't decrease
4072 # entropy.
4073 lines.append(message)
4074 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004075 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004076 return 'I%s' % change_hash.strip()
4077
4078
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004079def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004080 """Computes the remote branch ref to use for the CL.
4081
4082 Args:
4083 remote (str): The git remote for the CL.
4084 remote_branch (str): The git remote branch for the CL.
4085 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004086 """
4087 if not (remote and remote_branch):
4088 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004089
wittman@chromium.org455dc922015-01-26 20:15:50 +00004090 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004091 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004092 # refs, which are then translated into the remote full symbolic refs
4093 # below.
4094 if '/' not in target_branch:
4095 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4096 else:
4097 prefix_replacements = (
4098 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4099 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4100 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4101 )
4102 match = None
4103 for regex, replacement in prefix_replacements:
4104 match = re.search(regex, target_branch)
4105 if match:
4106 remote_branch = target_branch.replace(match.group(0), replacement)
4107 break
4108 if not match:
4109 # This is a branch path but not one we recognize; use as-is.
4110 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004111 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4112 # Handle the refs that need to land in different refs.
4113 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004114
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004115 # Migration to new default branch, only if available on remote.
4116 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4117 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4118 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4119 stderr=subprocess2.PIPE):
4120 # TODO(crbug.com/ID): Print location to local git migration script.
4121 print("WARNING: Using new branch name %s instead of %s" % (
4122 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4123 remote_branch = DEFAULT_NEW_BRANCH
4124
wittman@chromium.org455dc922015-01-26 20:15:50 +00004125 # Create the true path to the remote branch.
4126 # Does the following translation:
4127 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004128 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004129 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4130 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4131 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4132 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4133 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4134 'refs/heads/')
4135 elif remote_branch.startswith('refs/remotes/branch-heads'):
4136 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004137
wittman@chromium.org455dc922015-01-26 20:15:50 +00004138 return remote_branch
4139
4140
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004141def cleanup_list(l):
4142 """Fixes a list so that comma separated items are put as individual items.
4143
4144 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4145 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4146 """
4147 items = sum((i.split(',') for i in l), [])
4148 stripped_items = (i.strip() for i in items)
4149 return sorted(filter(None, stripped_items))
4150
4151
Aaron Gable4db38df2017-11-03 14:59:07 -07004152@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004153@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004154def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004155 """Uploads the current changelist to codereview.
4156
4157 Can skip dependency patchset uploads for a branch by running:
4158 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004159 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004160 git config --unset branch.branch_name.skip-deps-uploads
4161 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004162
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004163 If the name of the checked out branch starts with "bug-" or "fix-" followed
4164 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004165 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004166
4167 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004168 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004169 [git-cl] add support for hashtags
4170 Foo bar: implement foo
4171 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004172 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004173 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4174 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004175 parser.add_option('--bypass-watchlists', action='store_true',
4176 dest='bypass_watchlists',
4177 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004178 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004179 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004180 parser.add_option('--message', '-m', dest='message',
4181 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004182 parser.add_option('-b', '--bug',
4183 help='pre-populate the bug number(s) for this issue. '
4184 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004185 parser.add_option('--message-file', dest='message_file',
4186 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004187 parser.add_option('--title', '-t', dest='title',
4188 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004189 parser.add_option('-T', '--skip-title', action='store_true',
4190 dest='skip_title',
4191 help='Use the most recent commit message as the title of '
4192 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004193 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004194 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004195 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004196 parser.add_option('--tbrs',
4197 action='append', default=[],
4198 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004199 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004200 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004201 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004202 parser.add_option('--hashtag', dest='hashtags',
4203 action='append', default=[],
4204 help=('Gerrit hashtag for new CL; '
4205 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004206 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004207 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004208 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004209 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004210 metavar='TARGET',
4211 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004212 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004213 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004214 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004215 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004216 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004217 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004218 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004219 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4220 const='TBR', help='add a set of OWNERS to TBR')
4221 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4222 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004223 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004224 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004225 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004226 'implies --send-mail')
4227 parser.add_option('-d', '--cq-dry-run',
4228 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004229 help='Send the patchset to do a CQ dry run right after '
4230 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004231 parser.add_option(
4232 '-q',
4233 '--cq-quick-run',
4234 action='store_true',
4235 default=False,
4236 help='Send the patchset to do a CQ quick run right after '
4237 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4238 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004239 parser.add_option('--set-bot-commit', action='store_true',
4240 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004241 parser.add_option('--preserve-tryjobs', action='store_true',
4242 help='instruct the CQ to let tryjobs running even after '
4243 'new patchsets are uploaded instead of canceling '
4244 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004245 parser.add_option('--dependencies', action='store_true',
4246 help='Uploads CLs of all the local branches that depend on '
4247 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004248 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4249 help='Sends your change to the CQ after an approval. Only '
4250 'works on repos that have the Auto-Submit label '
4251 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004252 parser.add_option('--parallel', action='store_true',
4253 help='Run all tests specified by input_api.RunTests in all '
4254 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004255 parser.add_option('--no-autocc', action='store_true',
4256 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004257 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004258 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004259 parser.add_option('-R', '--retry-failed', action='store_true',
4260 help='Retry failed tryjobs from old patchset immediately '
4261 'after uploading new patchset. Cannot be used with '
4262 '--use-commit-queue or --cq-dry-run.')
4263 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4264 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004265 parser.add_option('--fixed', '-x',
4266 help='List of bugs that will be commented on and marked '
4267 'fixed (pre-populates "Fixed:" tag). Same format as '
4268 '-b option / "Bug:" tag. If fixing several issues, '
4269 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004270 parser.add_option('--edit-description', action='store_true', default=False,
4271 help='Modify description before upload. Cannot be used '
4272 'with --force. It is a noop when --no-squash is set '
4273 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004274 parser.add_option('--git-completion-helper', action="store_true",
4275 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004276 parser.add_option('--resultdb', action='store_true',
4277 help='Run presubmit checks in the ResultSink environment '
4278 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004279 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004280 parser.add_option('-o',
4281 '--push-options',
4282 action='append',
4283 default=[],
4284 help='Transmit the given string to the server when '
4285 'performing git push (pass-through). See git-push '
4286 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004287 parser.add_option('--no-add-changeid',
4288 action='store_true',
4289 dest='no_add_changeid',
4290 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004291
rmistry@google.com2dd99862015-06-22 12:22:18 +00004292 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004293 (options, args) = parser.parse_args(args)
4294
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004295 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004296 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4297 if opt.help != optparse.SUPPRESS_HELP))
4298 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004299
sbc@chromium.org71437c02015-04-09 19:29:40 +00004300 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004301 return 1
4302
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004303 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004304 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004305 options.cc = cleanup_list(options.cc)
4306
Josipe827b0f2020-01-30 00:07:20 +00004307 if options.edit_description and options.force:
4308 parser.error('Only one of --force and --edit-description allowed')
4309
tandriib80458a2016-06-23 12:20:07 -07004310 if options.message_file:
4311 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004312 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004313 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004314
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004315 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004316 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004317 options.use_commit_queue,
4318 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004319 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4320 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004321
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004322 if options.skip_title and options.title:
4323 parser.error('Only one of --title and --skip-title allowed.')
4324
Aaron Gableedbc4132017-09-11 13:22:28 -07004325 if options.use_commit_queue:
4326 options.send_mail = True
4327
Edward Lesmes0dd54822020-03-26 18:24:25 +00004328 if options.squash is None:
4329 # Load default for user, repo, squash=true, in this order.
4330 options.squash = settings.GetSquashGerritUploads()
4331
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004332 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004333 # Warm change details cache now to avoid RPCs later, reducing latency for
4334 # developers.
4335 if cl.GetIssue():
4336 cl._GetChangeDetail(
4337 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4338
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004339 if options.retry_failed and not cl.GetIssue():
4340 print('No previous patchsets, so --retry-failed has no effect.')
4341 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004342
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004343 # cl.GetMostRecentPatchset uses cached information, and can return the last
4344 # patchset before upload. Calling it here makes it clear that it's the
4345 # last patchset before upload. Note that GetMostRecentPatchset will fail
4346 # if no CL has been uploaded yet.
4347 if options.retry_failed:
4348 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004349
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004350 ret = cl.CMDUpload(options, args, orig_args)
4351
4352 if options.retry_failed:
4353 if ret != 0:
4354 print('Upload failed, so --retry-failed has no effect.')
4355 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004356 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004357 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004358 jobs = _filter_failed_for_retry(builds)
4359 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004360 print('No failed tryjobs, so --retry-failed has no effect.')
4361 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004362 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004363
4364 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004365
4366
Francois Dorayd42c6812017-05-30 15:10:20 -04004367@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004368@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004369def CMDsplit(parser, args):
4370 """Splits a branch into smaller branches and uploads CLs.
4371
4372 Creates a branch and uploads a CL for each group of files modified in the
4373 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004374 comment, the string '$directory', is replaced with the directory containing
4375 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004376 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004377 parser.add_option('-d', '--description', dest='description_file',
4378 help='A text file containing a CL description in which '
4379 '$directory will be replaced by each CL\'s directory.')
4380 parser.add_option('-c', '--comment', dest='comment_file',
4381 help='A text file containing a CL comment.')
4382 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004383 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004384 help='List the files and reviewers for each CL that would '
4385 'be created, but don\'t create branches or CLs.')
4386 parser.add_option('--cq-dry-run', action='store_true',
4387 help='If set, will do a cq dry run for each uploaded CL. '
4388 'Please be careful when doing this; more than ~10 CLs '
4389 'has the potential to overload our build '
4390 'infrastructure. Try to upload these not during high '
4391 'load times (usually 11-3 Mountain View time). Email '
4392 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004393 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4394 default=True,
4395 help='Sends your change to the CQ after an approval. Only '
4396 'works on repos that have the Auto-Submit label '
4397 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004398 options, _ = parser.parse_args(args)
4399
4400 if not options.description_file:
4401 parser.error('No --description flag specified.')
4402
4403 def WrappedCMDupload(args):
4404 return CMDupload(OptionParser(), args)
4405
Edward Lemur2c62b332020-03-12 22:12:33 +00004406 return split_cl.SplitCl(
4407 options.description_file, options.comment_file, Changelist,
4408 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4409 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004410
4411
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004412@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004413@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004414def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004415 """DEPRECATED: Used to commit the current changelist via git-svn."""
4416 message = ('git-cl no longer supports committing to SVN repositories via '
4417 'git-svn. You probably want to use `git cl land` instead.')
4418 print(message)
4419 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004420
4421
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004422@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004423@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004424def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004425 """Commits the current changelist via git.
4426
4427 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4428 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004429 """
4430 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4431 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004432 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004433 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004434 parser.add_option('--parallel', action='store_true',
4435 help='Run all tests specified by input_api.RunTests in all '
4436 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004437 parser.add_option('--resultdb', action='store_true',
4438 help='Run presubmit checks in the ResultSink environment '
4439 'and send results to the ResultDB database.')
4440 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004441 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004442
Edward Lemur934836a2019-09-09 20:16:54 +00004443 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004444
Robert Iannucci2e73d432018-03-14 01:10:47 -07004445 if not cl.GetIssue():
4446 DieWithError('You must upload the change first to Gerrit.\n'
4447 ' If you would rather have `git cl land` upload '
4448 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004449 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4450 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451
4452
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004453@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004454@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004456 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004457 parser.add_option('-b', dest='newbranch',
4458 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004459 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004460 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004462 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004463
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004464 group = optparse.OptionGroup(
4465 parser,
4466 'Options for continuing work on the current issue uploaded from a '
4467 'different clone (e.g. different machine). Must be used independently '
4468 'from the other options. No issue number should be specified, and the '
4469 'branch must have an issue number associated with it')
4470 group.add_option('--reapply', action='store_true', dest='reapply',
4471 help='Reset the branch and reapply the issue.\n'
4472 'CAUTION: This will undo any local changes in this '
4473 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004474
4475 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004476 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004477 parser.add_option_group(group)
4478
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004479 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004480
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004481 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004482 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004483 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004484 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004485 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004486
Edward Lemur934836a2019-09-09 20:16:54 +00004487 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004488 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004489 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004490
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004491 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004492 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004493 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004494
4495 RunGit(['reset', '--hard', upstream])
4496 if options.pull:
4497 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004498
Edward Lemur678a6842019-10-03 22:25:05 +00004499 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004500 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4501 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004502
4503 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004504 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004505
Edward Lemurf38bc172019-09-03 21:02:13 +00004506 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004507 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004508 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004509
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004510 # We don't want uncommitted changes mixed up with the patch.
4511 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004512 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004513
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004514 if options.newbranch:
4515 if options.force:
4516 RunGit(['branch', '-D', options.newbranch],
4517 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004518 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004519
Edward Lemur678a6842019-10-03 22:25:05 +00004520 cl = Changelist(
4521 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004522
Edward Lemur678a6842019-10-03 22:25:05 +00004523 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004524 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004525
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004526 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4527 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004528
4529
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004530def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004531 """Fetches the tree status and returns either 'open', 'closed',
4532 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004533 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004534 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004535 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536 if status.find('closed') != -1 or status == '0':
4537 return 'closed'
4538 elif status.find('open') != -1 or status == '1':
4539 return 'open'
4540 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541 return 'unset'
4542
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004543
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004544def GetTreeStatusReason():
4545 """Fetches the tree status from a json url and returns the message
4546 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004547 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004548 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004549 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550 status = json.loads(connection.read())
4551 connection.close()
4552 return status['message']
4553
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004555@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004556def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004557 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004558 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559 status = GetTreeStatus()
4560 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004561 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004562 return 2
4563
vapiera7fbd5a2016-06-16 09:17:49 -07004564 print('The tree is %s' % status)
4565 print()
4566 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004567 if status != 'open':
4568 return 1
4569 return 0
4570
4571
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004572@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004573def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004574 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4575 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004576 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004577 '-b', '--bot', action='append',
4578 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4579 'times to specify multiple builders. ex: '
4580 '"-b win_rel -b win_layout". See '
4581 'the try server waterfall for the builders name and the tests '
4582 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004583 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004584 '-B', '--bucket', default='',
4585 help=('Buildbucket bucket to send the try requests.'))
4586 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004587 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004588 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004589 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004590 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004591 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004592 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004593 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004594 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004595 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004596 '-q',
4597 '--quick-run',
4598 action='store_true',
4599 default=False,
4600 help='trigger in quick run mode '
4601 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4602 'uick_run.md) (chromium only).')
4603 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004604 '--category', default='git_cl_try', help='Specify custom build category.')
4605 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004606 '--project',
4607 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004608 'in recipe to determine to which repository or directory to '
4609 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004610 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004611 '-p', '--property', dest='properties', action='append', default=[],
4612 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004613 'key2=value2 etc. The value will be treated as '
4614 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004615 'NOTE: using this may make your tryjob not usable for CQ, '
4616 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004617 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004618 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4619 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004620 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004621 parser.add_option(
4622 '-R', '--retry-failed', action='store_true', default=False,
4623 help='Retry failed jobs from the latest set of tryjobs. '
4624 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004625 parser.add_option(
4626 '-i', '--issue', type=int,
4627 help='Operate on this issue instead of the current branch\'s implicit '
4628 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004629 options, args = parser.parse_args(args)
4630
machenbach@chromium.org45453142015-09-15 08:45:22 +00004631 # Make sure that all properties are prop=value pairs.
4632 bad_params = [x for x in options.properties if '=' not in x]
4633 if bad_params:
4634 parser.error('Got properties with missing "=": %s' % bad_params)
4635
maruel@chromium.org15192402012-09-06 12:38:29 +00004636 if args:
4637 parser.error('Unknown arguments: %s' % args)
4638
Edward Lemur934836a2019-09-09 20:16:54 +00004639 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004640 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004641 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004642
Edward Lemurf38bc172019-09-03 21:02:13 +00004643 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004644 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004645
tandriie113dfd2016-10-11 10:20:12 -07004646 error_message = cl.CannotTriggerTryJobReason()
4647 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004648 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004649
Edward Lemur45768512020-03-02 19:03:14 +00004650 if options.bot:
4651 if options.retry_failed:
4652 parser.error('--bot is not compatible with --retry-failed.')
4653 if not options.bucket:
4654 parser.error('A bucket (e.g. "chromium/try") is required.')
4655
4656 triggered = [b for b in options.bot if 'triggered' in b]
4657 if triggered:
4658 parser.error(
4659 'Cannot schedule builds on triggered bots: %s.\n'
4660 'This type of bot requires an initial job from a parent (usually a '
4661 'builder). Schedule a job on the parent instead.\n' % triggered)
4662
4663 if options.bucket.startswith('.master'):
4664 parser.error('Buildbot masters are not supported.')
4665
4666 project, bucket = _parse_bucket(options.bucket)
4667 if project is None or bucket is None:
4668 parser.error('Invalid bucket: %s.' % options.bucket)
4669 jobs = sorted((project, bucket, bot) for bot in options.bot)
4670 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004671 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004672 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004673 if options.verbose:
4674 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004675 jobs = _filter_failed_for_retry(builds)
4676 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004677 print('There are no failed jobs in the latest set of jobs '
4678 '(patchset #%d), doing nothing.' % patchset)
4679 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004680 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004681 if num_builders > 10:
4682 confirm_or_exit('There are %d builders with failed builds.'
4683 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004684 elif options.quick_run:
4685 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4686 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004687 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004688 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004689 print('git cl try with no bots now defaults to CQ dry run.')
4690 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4691 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004692
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004693 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004694 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004695 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004696 except BuildbucketResponseException as ex:
4697 print('ERROR: %s' % ex)
4698 return 1
4699 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004700
4701
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004702@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004703def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004704 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004705 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004706 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004707 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004708 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004709 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004710 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004711 '--color', action='store_true', default=setup_color.IS_TTY,
4712 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004713 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004714 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4715 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004716 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004717 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004718 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004719 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004720 parser.add_option(
4721 '-i', '--issue', type=int,
4722 help='Operate on this issue instead of the current branch\'s implicit '
4723 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004724 options, args = parser.parse_args(args)
4725 if args:
4726 parser.error('Unrecognized args: %s' % ' '.join(args))
4727
Edward Lemur934836a2019-09-09 20:16:54 +00004728 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004729 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004730 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004731
tandrii221ab252016-10-06 08:12:04 -07004732 patchset = options.patchset
4733 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004734 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004735 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004736 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004737 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004738 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004739 cl.GetIssue())
4740
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004741 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004742 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004743 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004744 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004745 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004746 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004747 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004748 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004749 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004750 return 0
4751
4752
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004753@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004754@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004755def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004756 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004757 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004758 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004759 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004760
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004761 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004762 if args:
4763 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004764 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004765 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004766 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004767 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004768
4769 # Clear configured merge-base, if there is one.
4770 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004771 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004772 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004773 return 0
4774
4775
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004776@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004777def CMDweb(parser, args):
4778 """Opens the current CL in the web browser."""
4779 _, args = parser.parse_args(args)
4780 if args:
4781 parser.error('Unrecognized args: %s' % ' '.join(args))
4782
4783 issue_url = Changelist().GetIssueURL()
4784 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004785 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004786 return 1
4787
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004788 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004789 # allows us to hide the "Created new window in existing browser session."
4790 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004791 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004792 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004793 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004794 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004795 os.open(os.devnull, os.O_RDWR)
4796 try:
4797 webbrowser.open(issue_url)
4798 finally:
4799 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004800 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004801 return 0
4802
4803
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004804@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004805def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004806 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004807 parser.add_option('-d', '--dry-run', action='store_true',
4808 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004809 parser.add_option(
4810 '-q',
4811 '--quick-run',
4812 action='store_true',
4813 help='trigger in quick run mode '
4814 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4815 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004816 parser.add_option('-c', '--clear', action='store_true',
4817 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004818 parser.add_option(
4819 '-i', '--issue', type=int,
4820 help='Operate on this issue instead of the current branch\'s implicit '
4821 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004822 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004823 if args:
4824 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004825 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4826 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004827
Edward Lemur934836a2019-09-09 20:16:54 +00004828 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004829 if not cl.GetIssue():
4830 parser.error('Must upload the issue first.')
4831
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004832 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004833 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004834 elif options.quick_run:
4835 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004836 elif options.dry_run:
4837 state = _CQState.DRY_RUN
4838 else:
4839 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004840 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004841 return 0
4842
4843
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004844@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004845def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004846 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004847 parser.add_option(
4848 '-i', '--issue', type=int,
4849 help='Operate on this issue instead of the current branch\'s implicit '
4850 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004851 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004852 if args:
4853 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004854 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004855 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004856 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004857 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004858 cl.CloseIssue()
4859 return 0
4860
4861
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004862@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004863def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004864 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004865 parser.add_option(
4866 '--stat',
4867 action='store_true',
4868 dest='stat',
4869 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004870 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004871 if args:
4872 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004873
Edward Lemur934836a2019-09-09 20:16:54 +00004874 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004875 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004876 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004877 if not issue:
4878 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004879
Aaron Gablea718c3e2017-08-28 17:47:28 -07004880 base = cl._GitGetBranchConfigValue('last-upload-hash')
4881 if not base:
4882 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4883 if not base:
4884 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4885 revision_info = detail['revisions'][detail['current_revision']]
4886 fetch_info = revision_info['fetch']['http']
4887 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4888 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004889
Aaron Gablea718c3e2017-08-28 17:47:28 -07004890 cmd = ['git', 'diff']
4891 if options.stat:
4892 cmd.append('--stat')
4893 cmd.append(base)
4894 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004895
4896 return 0
4897
4898
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004899@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004900def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004901 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004902 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004903 '--ignore-current',
4904 action='store_true',
4905 help='Ignore the CL\'s current reviewers and start from scratch.')
4906 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004907 '--ignore-self',
4908 action='store_true',
4909 help='Do not consider CL\'s author as an owners.')
4910 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004911 '--no-color',
4912 action='store_true',
4913 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004914 parser.add_option(
4915 '--batch',
4916 action='store_true',
4917 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004918 # TODO: Consider moving this to another command, since other
4919 # git-cl owners commands deal with owners for a given CL.
4920 parser.add_option(
4921 '--show-all',
4922 action='store_true',
4923 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004924 options, args = parser.parse_args(args)
4925
Edward Lemur934836a2019-09-09 20:16:54 +00004926 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004927 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004928
Yang Guo6e269a02019-06-26 11:17:02 +00004929 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004930 if len(args) == 0:
4931 print('No files specified for --show-all. Nothing to do.')
4932 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00004933 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004934 for path in args:
4935 print('Owners for %s:' % path)
4936 print('\n'.join(
4937 ' - %s' % owner
4938 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00004939 return 0
4940
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004941 if args:
4942 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004943 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004944 base_branch = args[0]
4945 else:
4946 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004947 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004948
Edward Lemur2c62b332020-03-12 22:12:33 +00004949 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004950
4951 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00004952 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
4953 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07004954 return 0
4955
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004956 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004957 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01004958 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004959 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00004960 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004961 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004962 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004963
4964
Aiden Bennerc08566e2018-10-03 17:52:42 +00004965def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004966 """Generates a diff command."""
4967 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004968 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4969
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004970 if allow_prefix:
4971 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4972 # case that diff.noprefix is set in the user's git config.
4973 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4974 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004975 diff_cmd += ['--no-prefix']
4976
4977 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004978
4979 if args:
4980 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004981 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004982 diff_cmd.append(arg)
4983 else:
4984 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004985
4986 return diff_cmd
4987
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004988
Jamie Madill5e96ad12020-01-13 16:08:35 +00004989def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4990 """Runs clang-format-diff and sets a return value if necessary."""
4991
4992 if not clang_diff_files:
4993 return 0
4994
4995 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4996 # formatted. This is used to block during the presubmit.
4997 return_value = 0
4998
4999 # Locate the clang-format binary in the checkout
5000 try:
5001 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5002 except clang_format.NotFoundError as e:
5003 DieWithError(e)
5004
5005 if opts.full or settings.GetFormatFullByDefault():
5006 cmd = [clang_format_tool]
5007 if not opts.dry_run and not opts.diff:
5008 cmd.append('-i')
5009 if opts.dry_run:
5010 for diff_file in clang_diff_files:
5011 with open(diff_file, 'r') as myfile:
5012 code = myfile.read().replace('\r\n', '\n')
5013 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5014 stdout = stdout.replace('\r\n', '\n')
5015 if opts.diff:
5016 sys.stdout.write(stdout)
5017 if code != stdout:
5018 return_value = 2
5019 else:
5020 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5021 if opts.diff:
5022 sys.stdout.write(stdout)
5023 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005024 try:
5025 script = clang_format.FindClangFormatScriptInChromiumTree(
5026 'clang-format-diff.py')
5027 except clang_format.NotFoundError as e:
5028 DieWithError(e)
5029
Edward Lesmes89624cd2020-04-06 17:51:56 +00005030 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005031 if not opts.dry_run and not opts.diff:
5032 cmd.append('-i')
5033
5034 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005035 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005036
Edward Lesmes89624cd2020-04-06 17:51:56 +00005037 env = os.environ.copy()
5038 env['PATH'] = (
5039 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5040 stdout = RunCommand(
5041 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005042 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005043 if opts.diff:
5044 sys.stdout.write(stdout)
5045 if opts.dry_run and len(stdout) > 0:
5046 return_value = 2
5047
5048 return return_value
5049
5050
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005051def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005052 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005053 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005054
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005055
enne@chromium.org555cfe42014-01-29 18:21:39 +00005056@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005057@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005058def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005059 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005060 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005061 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005062 parser.add_option('--full', action='store_true',
5063 help='Reformat the full content of all touched files')
5064 parser.add_option('--dry-run', action='store_true',
5065 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005066 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005067 '--no-clang-format',
5068 dest='clang_format',
5069 action='store_false',
5070 default=True,
5071 help='Disables formatting of various file types using clang-format.')
5072 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005073 '--python',
5074 action='store_true',
5075 default=None,
5076 help='Enables python formatting on all python files.')
5077 parser.add_option(
5078 '--no-python',
5079 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005080 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005081 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005082 'If neither --python or --no-python are set, python files that have a '
5083 '.style.yapf file in an ancestor directory will be formatted. '
5084 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005085 parser.add_option(
5086 '--js',
5087 action='store_true',
5088 help='Format javascript code with clang-format. '
5089 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005090 parser.add_option('--diff', action='store_true',
5091 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005092 parser.add_option('--presubmit', action='store_true',
5093 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005094 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005095
Garrett Beaty91a6f332020-01-06 16:57:24 +00005096 if opts.python is not None and opts.no_python:
5097 raise parser.error('Cannot set both --python and --no-python')
5098 if opts.no_python:
5099 opts.python = False
5100
Daniel Chengc55eecf2016-12-30 03:11:02 -08005101 # Normalize any remaining args against the current path, so paths relative to
5102 # the current directory are still resolved as expected.
5103 args = [os.path.join(os.getcwd(), arg) for arg in args]
5104
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005105 # git diff generates paths against the root of the repository. Change
5106 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005107 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005108 if rel_base_path:
5109 os.chdir(rel_base_path)
5110
digit@chromium.org29e47272013-05-17 17:01:46 +00005111 # Grab the merge-base commit, i.e. the upstream commit of the current
5112 # branch when it was created or the last time it was rebased. This is
5113 # to cover the case where the user may have called "git fetch origin",
5114 # moving the origin branch to a newer commit, but hasn't rebased yet.
5115 upstream_commit = None
5116 cl = Changelist()
5117 upstream_branch = cl.GetUpstreamBranch()
5118 if upstream_branch:
5119 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5120 upstream_commit = upstream_commit.strip()
5121
5122 if not upstream_commit:
5123 DieWithError('Could not find base commit for this branch. '
5124 'Are you in detached state?')
5125
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005126 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5127 diff_output = RunGit(changed_files_cmd)
5128 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005129 # Filter out files deleted by this CL
5130 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005131
Andreas Haas417d89c2020-02-06 10:24:27 +00005132 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005133 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005134
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005135 clang_diff_files = []
5136 if opts.clang_format:
5137 clang_diff_files = [
5138 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5139 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005140 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005141 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005142
Edward Lesmes50da7702020-03-30 19:23:43 +00005143 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005144
Jamie Madill5e96ad12020-01-13 16:08:35 +00005145 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5146 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005147
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005148 # Similar code to above, but using yapf on .py files rather than clang-format
5149 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005150 py_explicitly_disabled = opts.python is not None and not opts.python
5151 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005152 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5153 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005154
Aiden Bennerc08566e2018-10-03 17:52:42 +00005155 # Used for caching.
5156 yapf_configs = {}
5157 for f in python_diff_files:
5158 # Find the yapf style config for the current file, defaults to depot
5159 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005160 _FindYapfConfigFile(f, yapf_configs, top_dir)
5161
5162 # Turn on python formatting by default if a yapf config is specified.
5163 # This breaks in the case of this repo though since the specified
5164 # style file is also the global default.
5165 if opts.python is None:
5166 filtered_py_files = []
5167 for f in python_diff_files:
5168 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5169 filtered_py_files.append(f)
5170 else:
5171 filtered_py_files = python_diff_files
5172
5173 # Note: yapf still seems to fix indentation of the entire file
5174 # even if line ranges are specified.
5175 # See https://github.com/google/yapf/issues/499
5176 if not opts.full and filtered_py_files:
5177 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5178
Brian Sheedyb4307d52019-12-02 19:18:17 +00005179 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5180 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5181 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005182
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005183 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005184 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5185 # Default to pep8 if not .style.yapf is found.
5186 if not yapf_style:
5187 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005188
Peter Wend9399922020-06-17 17:33:49 +00005189 with open(f, 'r') as py_f:
5190 if 'python3' in py_f.readline():
5191 vpython_script = 'vpython3'
5192 else:
5193 vpython_script = 'vpython'
5194
5195 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005196
5197 has_formattable_lines = False
5198 if not opts.full:
5199 # Only run yapf over changed line ranges.
5200 for diff_start, diff_len in py_line_diffs[f]:
5201 diff_end = diff_start + diff_len - 1
5202 # Yapf errors out if diff_end < diff_start but this
5203 # is a valid line range diff for a removal.
5204 if diff_end >= diff_start:
5205 has_formattable_lines = True
5206 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5207 # If all line diffs were removals we have nothing to format.
5208 if not has_formattable_lines:
5209 continue
5210
5211 if opts.diff or opts.dry_run:
5212 cmd += ['--diff']
5213 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005214 stdout = RunCommand(cmd,
5215 error_ok=True,
5216 cwd=top_dir,
5217 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005218 if opts.diff:
5219 sys.stdout.write(stdout)
5220 elif len(stdout) > 0:
5221 return_value = 2
5222 else:
5223 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005224 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005225
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005226 # Format GN build files. Always run on full build files for canonical form.
5227 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005228 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005229 if opts.dry_run or opts.diff:
5230 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005231 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005232 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005233 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005234 cwd=top_dir)
5235 if opts.dry_run and gn_ret == 2:
5236 return_value = 2 # Not formatted.
5237 elif opts.diff and gn_ret == 2:
5238 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005239 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005240 elif gn_ret != 0:
5241 # For non-dry run cases (and non-2 return values for dry-run), a
5242 # nonzero error code indicates a failure, probably because the file
5243 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005244 DieWithError('gn format failed on ' + gn_diff_file +
5245 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005246
Ilya Shermane081cbe2017-08-15 17:51:04 -07005247 # Skip the metrics formatting from the global presubmit hook. These files have
5248 # a separate presubmit hook that issues an error if the files need formatting,
5249 # whereas the top-level presubmit script merely issues a warning. Formatting
5250 # these files is somewhat slow, so it's important not to duplicate the work.
5251 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005252 for diff_xml in GetDiffXMLs(diff_files):
5253 xml_dir = GetMetricsDir(diff_xml)
5254 if not xml_dir:
5255 continue
5256
Ilya Shermane081cbe2017-08-15 17:51:04 -07005257 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005258 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5259 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005260
5261 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5262 # command as histograms/pretty_print.py now needs a relative path argument
5263 # after splitting the histograms into multiple directories.
5264 # For example, in tools/metrics/ukm, pretty-print could be run using:
5265 # $ python pretty_print.py
5266 # But in tools/metrics/histogrmas, pretty-print should be run with an
5267 # additional relative path argument, like:
5268 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5269 # $ python pretty_print.py enums.xml
5270
5271 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5272 # version of histograms/pretty_print.py is released.
5273 filepath_required = os.path.exists(
5274 os.path.join(tool_dir, 'validate_prefix.py'))
5275
Weilun Shib92c4b72020-08-27 17:45:11 +00005276 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5277 or diff_xml.endswith('histogram_suffixes_list.xml')
5278 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005279 cmd.append(diff_xml)
5280
Ilya Shermane081cbe2017-08-15 17:51:04 -07005281 if opts.dry_run or opts.diff:
5282 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005283
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005284 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5285 # `shell` param and instead replace `'vpython'` with
5286 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005287 stdout = RunCommand(cmd,
5288 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005289 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005290 if opts.diff:
5291 sys.stdout.write(stdout)
5292 if opts.dry_run and stdout:
5293 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005294
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005295 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005296
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005297
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005298def GetDiffXMLs(diff_files):
5299 return [
5300 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5301 ]
5302
5303
5304def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005305 metrics_xml_dirs = [
5306 os.path.join('tools', 'metrics', 'actions'),
5307 os.path.join('tools', 'metrics', 'histograms'),
5308 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005309 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005310 os.path.join('tools', 'metrics', 'ukm'),
5311 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005312 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005313 if diff_xml.startswith(xml_dir):
5314 return xml_dir
5315 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005316
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005317
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005318@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005319@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005320def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005321 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005322 _, args = parser.parse_args(args)
5323
5324 if len(args) != 1:
5325 parser.print_help()
5326 return 1
5327
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005328 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005329 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005330 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005331
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005332 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005333
Edward Lemur52969c92020-02-06 18:15:28 +00005334 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005335 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005336 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005337
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005338 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005339 for key, issue in [x.split() for x in output.splitlines()]:
5340 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005341 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005342
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005343 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005344 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005345 return 1
5346 if len(branches) == 1:
5347 RunGit(['checkout', branches[0]])
5348 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005349 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005350 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005351 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005352 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005353 try:
5354 RunGit(['checkout', branches[int(which)]])
5355 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005356 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005357 return 1
5358
5359 return 0
5360
5361
maruel@chromium.org29404b52014-09-08 22:58:00 +00005362def CMDlol(parser, args):
5363 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005364 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005365 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5366 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5367 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005368 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005369 return 0
5370
5371
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005372class OptionParser(optparse.OptionParser):
5373 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005374
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005375 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005376 optparse.OptionParser.__init__(
5377 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005378 self.add_option(
5379 '-v', '--verbose', action='count', default=0,
5380 help='Use 2 times for more debugging info')
5381
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005382 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005383 try:
5384 return self._parse_args(args)
5385 finally:
5386 # Regardless of success or failure of args parsing, we want to report
5387 # metrics, but only after logging has been initialized (if parsing
5388 # succeeded).
5389 global settings
5390 settings = Settings()
5391
Edward Lesmes9c349062021-05-06 20:02:39 +00005392 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005393 # GetViewVCUrl ultimately calls logging method.
5394 project_url = settings.GetViewVCUrl().strip('/+')
5395 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5396 metrics.collector.add('project_urls', [project_url])
5397
5398 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005399 # Create an optparse.Values object that will store only the actual passed
5400 # options, without the defaults.
5401 actual_options = optparse.Values()
5402 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5403 # Create an optparse.Values object with the default options.
5404 options = optparse.Values(self.get_default_values().__dict__)
5405 # Update it with the options passed by the user.
5406 options._update_careful(actual_options.__dict__)
5407 # Store the options passed by the user in an _actual_options attribute.
5408 # We store only the keys, and not the values, since the values can contain
5409 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005410 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005411
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005412 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005413 logging.basicConfig(
5414 level=levels[min(options.verbose, len(levels) - 1)],
5415 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5416 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005417
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005418 return options, args
5419
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005420
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005421def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005422 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005423 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005424 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005425 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005426
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005427 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005428 dispatcher = subcommand.CommandDispatcher(__name__)
5429 try:
5430 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005431 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005432 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005433 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005434 if e.code != 500:
5435 raise
5436 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005437 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005438 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005439 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005440
5441
5442if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005443 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5444 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005445 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005446 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005447 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005448 sys.exit(main(sys.argv[1:]))