blob: f1772c7eeca327dfe00baecc018ac98f7f6ab08d [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
piman@chromium.org336f9122014-09-04 02:16:55 +000045import owners
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:
198 stderr = subprocess2.VOID
199 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):
Edward Lemur45768512020-03-02 19:03:14 +0000395 requests[-1]['scheduleBuild']['gitilesCommit'] = {
396 'host': gerrit_changes[0]['host'],
397 'project': gerrit_changes[0]['project'],
398 'id': options.revision
399 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000400
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000401 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000402
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000403
Quinten Yearsley777660f2020-03-04 23:37:06 +0000404def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000405 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000406
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000407 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000408 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000409 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000410 request = {
411 'predicate': {
412 'gerritChanges': [changelist.GetGerritChange(patchset)],
413 },
414 'fields': ','.join('builds.*.' + field for field in fields),
415 }
tandrii221ab252016-10-06 08:12:04 -0700416
Edward Lemur5b929a42019-10-21 17:57:39 +0000417 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000418 if authenticator.has_cached_credentials():
419 http = authenticator.authorize(httplib2.Http())
420 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700421 print('Warning: Some results might be missing because %s' %
422 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000423 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000424 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 http.force_exception_to_status_code = True
426
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000427 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
428 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000429
Edward Lemur45768512020-03-02 19:03:14 +0000430
Edward Lemur5b929a42019-10-21 17:57:39 +0000431def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000432 """Fetches builds from the latest patchset that has builds (within
433 the last few patchsets).
434
435 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000436 changelist (Changelist): The CL to fetch builds for
437 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000438 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
439 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000440 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000441 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
442 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000443 """
444 assert buildbucket_host
445 assert changelist.GetIssue(), 'CL must be uploaded first'
446 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000447 if latest_patchset is None:
448 assert changelist.GetMostRecentPatchset()
449 ps = changelist.GetMostRecentPatchset()
450 else:
451 assert latest_patchset > 0, latest_patchset
452 ps = latest_patchset
453
Quinten Yearsley983111f2019-09-26 17:18:48 +0000454 min_ps = max(1, ps - 5)
455 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000456 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000457 if len(builds):
458 return builds, ps
459 ps -= 1
460 return [], 0
461
462
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000463def _filter_failed_for_retry(all_builds):
464 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000465
466 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000467 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 i.e. a list of buildbucket.v2.Builds which includes status and builder
469 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470
471 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000472 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000473 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000474 """
Edward Lemur45768512020-03-02 19:03:14 +0000475 grouped = {}
476 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000477 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000478 key = (builder['project'], builder['bucket'], builder['builder'])
479 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000480
Edward Lemur45768512020-03-02 19:03:14 +0000481 jobs = []
482 for (project, bucket, builder), builds in grouped.items():
483 if 'triggered' in builder:
484 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
485 'from a parent. Please schedule a manual job for the parent '
486 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000487 continue
488 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
489 # Don't retry if any are running.
490 continue
Edward Lemur45768512020-03-02 19:03:14 +0000491 # If builder had several builds, retry only if the last one failed.
492 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
493 # build, but in case of retrying failed jobs retrying a flaky one makes
494 # sense.
495 builds = sorted(builds, key=lambda b: b['createTime'])
496 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
497 continue
498 # Don't retry experimental build previously triggered by CQ.
499 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
500 for t in builds[-1]['tags']):
501 continue
502 jobs.append((project, bucket, builder))
503
504 # Sort the jobs to make testing easier.
505 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000506
507
Quinten Yearsley777660f2020-03-04 23:37:06 +0000508def _print_tryjobs(options, builds):
509 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000511 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 return
513
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000514 longest_builder = max(len(b['builder']['builder']) for b in builds)
515 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000517 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
518 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000520 builds_by_status = {}
521 for b in builds:
522 builds_by_status.setdefault(b['status'], []).append({
523 'id': b['id'],
524 'name': name_fmt.format(
525 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
526 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000527
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000528 sort_key = lambda b: (b['name'], b['id'])
529
530 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000532 if not builds:
533 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000536 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 else:
539 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
540
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000541 print(colorize(title))
542 for b in sorted(builds, key=sort_key):
543 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544
545 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000546 print_builds(
547 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
548 print_builds(
549 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
550 color=Fore.MAGENTA)
551 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
552 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
553 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000554 print_builds('Started:', builds_by_status.pop('STARTED', []),
555 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000556 print_builds(
557 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000559 print_builds(
560 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562
563
Aiden Bennerc08566e2018-10-03 17:52:42 +0000564def _ComputeDiffLineRanges(files, upstream_commit):
565 """Gets the changed line ranges for each file since upstream_commit.
566
567 Parses a git diff on provided files and returns a dict that maps a file name
568 to an ordered list of range tuples in the form (start_line, count).
569 Ranges are in the same format as a git diff.
570 """
571 # If files is empty then diff_output will be a full diff.
572 if len(files) == 0:
573 return {}
574
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000575 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000576 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000577 diff_output = RunGit(diff_cmd)
578
579 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
580 # 2 capture groups
581 # 0 == fname of diff file
582 # 1 == 'diff_start,diff_count' or 'diff_start'
583 # will match each of
584 # diff --git a/foo.foo b/foo.py
585 # @@ -12,2 +14,3 @@
586 # @@ -12,2 +17 @@
587 # running re.findall on the above string with pattern will give
588 # [('foo.py', ''), ('', '14,3'), ('', '17')]
589
590 curr_file = None
591 line_diffs = {}
592 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
593 if match[0] != '':
594 # Will match the second filename in diff --git a/a.py b/b.py.
595 curr_file = match[0]
596 line_diffs[curr_file] = []
597 else:
598 # Matches +14,3
599 if ',' in match[1]:
600 diff_start, diff_count = match[1].split(',')
601 else:
602 # Single line changes are of the form +12 instead of +12,1.
603 diff_start = match[1]
604 diff_count = 1
605
606 diff_start = int(diff_start)
607 diff_count = int(diff_count)
608
609 # If diff_count == 0 this is a removal we can ignore.
610 line_diffs[curr_file].append((diff_start, diff_count))
611
612 return line_diffs
613
614
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000615def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000616 """Checks if a yapf file is in any parent directory of fpath until top_dir.
617
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000618 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000619 is found returns None. Uses yapf_config_cache as a cache for previously found
620 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 # Return result if we've already computed it.
624 if fpath in yapf_config_cache:
625 return yapf_config_cache[fpath]
626
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000627 parent_dir = os.path.dirname(fpath)
628 if os.path.isfile(fpath):
629 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000631 # Otherwise fpath is a directory
632 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
633 if os.path.isfile(yapf_file):
634 ret = yapf_file
635 elif fpath == top_dir or parent_dir == fpath:
636 # If we're at the top level directory, or if we're at root
637 # there is no provided style.
638 ret = None
639 else:
640 # Otherwise recurse on the current directory.
641 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000642 yapf_config_cache[fpath] = ret
643 return ret
644
645
Brian Sheedyb4307d52019-12-02 19:18:17 +0000646def _GetYapfIgnorePatterns(top_dir):
647 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000648
649 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
650 but this functionality appears to break when explicitly passing files to
651 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000652 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000653 the .yapfignore file should be in the directory that yapf is invoked from,
654 which we assume to be the top level directory in this case.
655
656 Args:
657 top_dir: The top level directory for the repository being formatted.
658
659 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000660 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000661 """
662 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000663 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000664 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000665 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000666
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 with open(yapfignore_file) as f:
668 for line in f.readlines():
669 stripped_line = line.strip()
670 # Comments and blank lines should be ignored.
671 if stripped_line.startswith('#') or stripped_line == '':
672 continue
673 ignore_patterns.add(stripped_line)
674 return ignore_patterns
675
676
677def _FilterYapfIgnoredFiles(filepaths, patterns):
678 """Filters out any filepaths that match any of the given patterns.
679
680 Args:
681 filepaths: An iterable of strings containing filepaths to filter.
682 patterns: An iterable of strings containing fnmatch patterns to filter on.
683
684 Returns:
685 A list of strings containing all the elements of |filepaths| that did not
686 match any of the patterns in |patterns|.
687 """
688 # Not inlined so that tests can use the same implementation.
689 return [f for f in filepaths
690 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000691
692
Aaron Gable13101a62018-02-09 13:20:41 -0800693def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000694 """Prints statistics about the change to the user."""
695 # --no-ext-diff is broken in some versions of Git, so try to work around
696 # this by overriding the environment (but there is still a problem if the
697 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000698 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000699 if 'GIT_EXTERNAL_DIFF' in env:
700 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000701
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000702 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800703 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000704 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705
706
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000707class BuildbucketResponseException(Exception):
708 pass
709
710
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711class Settings(object):
712 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000713 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000714 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000715 self.tree_status_url = None
716 self.viewvc_url = None
717 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000718 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000719 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000720 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000721 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000722 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000723
Edward Lemur26964072020-02-19 19:18:51 +0000724 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000725 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000726 if self.updated:
727 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000728
Edward Lemur26964072020-02-19 19:18:51 +0000729 # The only value that actually changes the behavior is
730 # autoupdate = "false". Everything else means "true".
731 autoupdate = (
732 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
733
734 cr_settings_file = FindCodereviewSettingsFile()
735 if autoupdate != 'false' and cr_settings_file:
736 LoadCodereviewSettingsFromFile(cr_settings_file)
737 cr_settings_file.close()
738
739 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000740
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000741 @staticmethod
742 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000743 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000746 if self.root is None:
747 self.root = os.path.abspath(self.GetRelativeRoot())
748 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000749
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750 def GetTreeStatusUrl(self, error_ok=False):
751 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000752 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
753 if self.tree_status_url is None and not error_ok:
754 DieWithError(
755 'You must configure your tree status URL by running '
756 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 return self.tree_status_url
758
759 def GetViewVCUrl(self):
760 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000761 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 return self.viewvc_url
763
rmistry@google.com90752582014-01-14 21:04:50 +0000764 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000765 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000766
rmistry@google.com5626a922015-02-26 14:03:30 +0000767 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000768 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000769 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000770 return run_post_upload_hook == "True"
771
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000772 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000773 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000774
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000776 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000777 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000778 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
779 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000780 # Default is squash now (http://crbug.com/611892#c23).
781 self.squash_gerrit_uploads = self._GetConfig(
782 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000783 return self.squash_gerrit_uploads
784
Edward Lesmes4de54132020-05-05 19:41:33 +0000785 def GetSquashGerritUploadsOverride(self):
786 """Return True or False if codereview.settings should be overridden.
787
788 Returns None if no override has been defined.
789 """
790 # See also http://crbug.com/611892#c23
791 result = self._GetConfig('gerrit.override-squash-uploads').lower()
792 if result == 'true':
793 return True
794 if result == 'false':
795 return False
796 return None
797
tandrii@chromium.org28253532016-04-14 13:46:56 +0000798 def GetGerritSkipEnsureAuthenticated(self):
799 """Return True if EnsureAuthenticated should not be done for Gerrit
800 uploads."""
801 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.gerrit_skip_ensure_authenticated = self._GetConfig(
803 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000804 return self.gerrit_skip_ensure_authenticated
805
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000806 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000807 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000808 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000809 # Git requires single quotes for paths with spaces. We need to replace
810 # them with double quotes for Windows to treat such paths as a single
811 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000813 return self.git_editor or None
814
thestig@chromium.org44202a22014-03-11 19:22:18 +0000815 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000816 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000817
818 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000819 return self._GetConfig(
820 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000821
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000822 def GetFormatFullByDefault(self):
823 if self.format_full_by_default is None:
824 result = (
825 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
826 error_ok=True).strip())
827 self.format_full_by_default = (result == 'true')
828 return self.format_full_by_default
829
Edward Lemur26964072020-02-19 19:18:51 +0000830 def _GetConfig(self, key, default=''):
831 self._LazyUpdateIfNeeded()
832 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833
834
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000835class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000836 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000837 NONE = 'none'
838 DRY_RUN = 'dry_run'
839 COMMIT = 'commit'
840
841 ALL_STATES = [NONE, DRY_RUN, COMMIT]
842
843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000844class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000845 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000846 self.issue = issue
847 self.patchset = patchset
848 self.hostname = hostname
849
850 @property
851 def valid(self):
852 return self.issue is not None
853
854
Edward Lemurf38bc172019-09-03 21:02:13 +0000855def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000856 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
857 fail_result = _ParsedIssueNumberArgument()
858
Edward Lemur678a6842019-10-03 22:25:05 +0000859 if isinstance(arg, int):
860 return _ParsedIssueNumberArgument(issue=arg)
861 if not isinstance(arg, basestring):
862 return fail_result
863
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000864 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000865 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000866 if not arg.startswith('http'):
867 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -0700868
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000869 url = gclient_utils.UpgradeToHttps(arg)
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000870 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
871 if url.startswith(short_url):
872 url = gerrit_url + url[len(short_url):]
873 break
874
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000875 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000876 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000877 except ValueError:
878 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200879
Edward Lemur678a6842019-10-03 22:25:05 +0000880 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
881 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
882 # Short urls like https://domain/<issue_number> can be used, but don't allow
883 # specifying the patchset (you'd 404), but we allow that here.
884 if parsed_url.path == '/':
885 part = parsed_url.fragment
886 else:
887 part = parsed_url.path
888
889 match = re.match(
890 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
891 if not match:
892 return fail_result
893
894 issue = int(match.group('issue'))
895 patchset = match.group('patchset')
896 return _ParsedIssueNumberArgument(
897 issue=issue,
898 patchset=int(patchset) if patchset else None,
899 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000900
901
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000902def _create_description_from_log(args):
903 """Pulls out the commit log to use as a base for the CL description."""
904 log_args = []
905 if len(args) == 1 and not args[0].endswith('.'):
906 log_args = [args[0] + '..']
907 elif len(args) == 1 and args[0].endswith('...'):
908 log_args = [args[0][:-1]]
909 elif len(args) == 2:
910 log_args = [args[0] + '..' + args[1]]
911 else:
912 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000913 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000914
915
Aaron Gablea45ee112016-11-22 15:14:38 -0800916class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700917 def __init__(self, issue, url):
918 self.issue = issue
919 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800920 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700921
922 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800923 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700924 self.issue, self.url)
925
926
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100927_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000928 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100929 # TODO(tandrii): these two aren't known in Gerrit.
930 'approval', 'disapproval'])
931
932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000934 """Changelist works with one changelist in local branch.
935
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000936 Notes:
937 * Not safe for concurrent multi-{thread,process} use.
938 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700939 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000940 """
941
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000942 def __init__(self,
943 branchref=None,
944 issue=None,
945 codereview_host=None,
946 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000947 """Create a new ChangeList instance.
948
Edward Lemurf38bc172019-09-03 21:02:13 +0000949 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000950 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000952 global settings
953 if not settings:
954 # Happens when git_cl.py is used as a utility library.
955 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000956
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000957 self.branchref = branchref
958 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000959 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000960 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000961 else:
962 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000963 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000964 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000965 self.lookedup_issue = False
966 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000967 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000968 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000969 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000970 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800971 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000972 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000973 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000974
Edward Lemur125d60a2019-09-13 18:25:41 +0000975 # Lazily cached values.
976 self._gerrit_host = None # e.g. chromium-review.googlesource.com
977 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
978 # Map from change number (issue) to its detail cache.
979 self._detail_cache = {}
980
981 if codereview_host is not None:
982 assert not codereview_host.startswith('https://'), codereview_host
983 self._gerrit_host = codereview_host
984 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000985
986 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700987 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700989 The return value is a string suitable for passing to git cl with the --cc
990 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000991 """
992 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000993 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -0800994 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000995 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
996 return self.cc
997
Daniel Cheng7227d212017-11-17 08:12:37 -0800998 def ExtendCC(self, more_cc):
999 """Extends the list of users to cc on this CL based on the changed files."""
1000 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001001
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001002 def GetCommitDate(self):
1003 """Returns the commit date as provided in the constructor"""
1004 return self.commit_date
1005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001007 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001009 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001010 if not branchref:
1011 return None
1012 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001013 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 return self.branch
1015
1016 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001017 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.GetBranch() # Poke the lazy loader.
1019 return self.branchref
1020
Edward Lemur85153282020-02-14 22:06:29 +00001021 def _GitGetBranchConfigValue(self, key, default=None):
1022 return scm.GIT.GetBranchConfig(
1023 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001024
Edward Lemur85153282020-02-14 22:06:29 +00001025 def _GitSetBranchConfigValue(self, key, value):
1026 action = 'set %s to %r' % (key, value)
1027 if not value:
1028 action = 'unset %s' % key
1029 assert self.GetBranch(), 'a branch is needed to ' + action
1030 return scm.GIT.SetBranchConfig(
1031 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001032
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001033 @staticmethod
1034 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001035 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001036 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001038 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1039 settings.GetRoot(), branch)
1040 if not remote or not upstream_branch:
1041 DieWithError(
1042 'Unable to determine default branch to diff against.\n'
1043 'Either pass complete "git diff"-style arguments, like\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001044 ' git cl upload origin/main\n'
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001045 'or verify this branch is set up to track another \n'
1046 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047
1048 return remote, upstream_branch
1049
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001050 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001051 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001052 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001053 DieWithError('The upstream for the current branch (%s) does not exist '
1054 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001055 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001056 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001057
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001058 def GetUpstreamBranch(self):
1059 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001060 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001061 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001062 upstream_branch = upstream_branch.replace('refs/heads/',
1063 'refs/remotes/%s/' % remote)
1064 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1065 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066 self.upstream_branch = upstream_branch
1067 return self.upstream_branch
1068
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001069 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001070 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001071 remote, branch = None, self.GetBranch()
1072 seen_branches = set()
1073 while branch not in seen_branches:
1074 seen_branches.add(branch)
1075 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001076 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001077 if remote != '.' or branch.startswith('refs/remotes'):
1078 break
1079 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001080 remotes = RunGit(['remote'], error_ok=True).split()
1081 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001082 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001083 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001084 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001085 logging.warn('Could not determine which remote this change is '
1086 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001087 else:
1088 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001089 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001090 branch = 'HEAD'
1091 if branch.startswith('refs/remotes'):
1092 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001093 elif branch.startswith('refs/branch-heads/'):
1094 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001095 else:
1096 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001097 return self._remote
1098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 def GetRemoteUrl(self):
1100 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1101
1102 Returns None if there is no remote.
1103 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001104 is_cached, value = self._cached_remote_url
1105 if is_cached:
1106 return value
1107
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001108 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001109 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001110
Edward Lemur298f2cf2019-02-22 21:40:39 +00001111 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001112 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001113 if host:
1114 self._cached_remote_url = (True, url)
1115 return url
1116
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001117 # If it cannot be parsed as an url, assume it is a local directory,
1118 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001119 logging.warning('"%s" doesn\'t appear to point to a git host. '
1120 'Interpreting it as a local directory.', url)
1121 if not os.path.isdir(url):
1122 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001123 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1124 'but it doesn\'t exist.',
1125 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001126 return None
1127
1128 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001129 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001130
Edward Lemur79d4f992019-11-11 23:49:02 +00001131 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001132 if not host:
1133 logging.error(
1134 'Remote "%(remote)s" for branch "%(branch)s" points to '
1135 '"%(cache_path)s", but it is misconfigured.\n'
1136 '"%(cache_path)s" must be a git repo and must have a remote named '
1137 '"%(remote)s" pointing to the git host.', {
1138 'remote': remote,
1139 'cache_path': cache_path,
1140 'branch': self.GetBranch()})
1141 return None
1142
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001143 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001144 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001146 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001147 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001148 if self.issue is None and not self.lookedup_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00001149 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001150 if self.issue is not None:
1151 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001152 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 return self.issue
1154
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001155 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001157 issue = self.GetIssue()
1158 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001159 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001160 server = self.GetCodereviewServer()
1161 if short:
1162 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1163 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001164
Edward Lemur6c6827c2020-02-06 21:15:18 +00001165 def FetchDescription(self, pretty=False):
1166 assert self.GetIssue(), 'issue is required to query Gerrit'
1167
Edward Lemur9aa1a962020-02-25 00:58:38 +00001168 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001169 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1170 current_rev = data['current_revision']
1171 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001172
1173 if not pretty:
1174 return self.description
1175
1176 # Set width to 72 columns + 2 space indent.
1177 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1178 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1179 lines = self.description.splitlines()
1180 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181
1182 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001183 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001184 if self.patchset is None and not self.lookedup_patchset:
Edward Lesmes50da7702020-03-30 19:23:43 +00001185 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001186 if self.patchset is not None:
1187 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001188 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001189 return self.patchset
1190
Edward Lemur9aa1a962020-02-25 00:58:38 +00001191 def GetAuthor(self):
1192 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1193
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001194 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001195 """Set this branch's patchset. If patchset=0, clears the patchset."""
1196 assert self.GetBranch()
1197 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001198 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001199 else:
1200 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001201 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001203 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001204 """Set this branch's issue. If issue isn't given, clears the issue."""
1205 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001206 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001207 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001208 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001209 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001210 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001211 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001212 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001213 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001214 else:
tandrii5d48c322016-08-18 16:19:37 -07001215 # Reset all of these just to be clean.
1216 reset_suffixes = [
1217 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001218 ISSUE_CONFIG_KEY,
1219 PATCHSET_CONFIG_KEY,
1220 CODEREVIEW_SERVER_CONFIG_KEY,
1221 'gerritsquashhash',
1222 ]
tandrii5d48c322016-08-18 16:19:37 -07001223 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001224 try:
1225 self._GitSetBranchConfigValue(prop, None)
1226 except subprocess2.CalledProcessError:
1227 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001228 msg = RunGit(['log', '-1', '--format=%B']).strip()
1229 if msg and git_footers.get_footer_change_id(msg):
1230 print('WARNING: The change patched into this branch has a Change-Id. '
1231 'Removing it.')
1232 RunGit(['commit', '--amend', '-m',
1233 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001234 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001235 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001236 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
Edward Lemur2c62b332020-03-12 22:12:33 +00001238 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001239 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001240 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001241 except subprocess2.CalledProcessError:
1242 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001243 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001244 'This branch probably doesn\'t exist anymore. To reset the\n'
1245 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001246 ' git branch --set-upstream-to origin/main %s\n'
1247 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001248 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001249
dsansomee2d6fd92016-09-08 00:10:47 -07001250 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001251 assert self.GetIssue(), 'issue is required to update description'
1252
1253 if gerrit_util.HasPendingChangeEdit(
1254 self._GetGerritHost(), self._GerritChangeIdentifier()):
1255 if not force:
1256 confirm_or_exit(
1257 'The description cannot be modified while the issue has a pending '
1258 'unpublished edit. Either publish the edit in the Gerrit web UI '
1259 'or delete it.\n\n', action='delete the unpublished edit')
1260
1261 gerrit_util.DeletePendingChangeEdit(
1262 self._GetGerritHost(), self._GerritChangeIdentifier())
1263 gerrit_util.SetCommitMessage(
1264 self._GetGerritHost(), self._GerritChangeIdentifier(),
1265 description, notify='NONE')
1266
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001267 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001268
Edward Lemur75526302020-02-27 22:31:05 +00001269 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001270 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001271 '--root', settings.GetRoot(),
1272 '--upstream', upstream,
1273 ]
1274
1275 args.extend(['--verbose'] * verbose)
1276
Edward Lemur99df04e2020-03-05 19:39:43 +00001277 author = self.GetAuthor()
1278 gerrit_url = self.GetCodereviewServer()
Edward Lemur227d5102020-02-25 23:45:35 +00001279 issue = self.GetIssue()
1280 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001281 if author:
1282 args.extend(['--author', author])
1283 if gerrit_url:
1284 args.extend(['--gerrit_url', gerrit_url])
Edward Lemur227d5102020-02-25 23:45:35 +00001285 if issue:
1286 args.extend(['--issue', str(issue)])
1287 if patchset:
1288 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001289
Edward Lemur75526302020-02-27 22:31:05 +00001290 return args
1291
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001292 def RunHook(self, committing, may_prompt, verbose, parallel, upstream,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001293 description, all_files, resultdb=False, realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001294 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1295 args = self._GetCommonPresubmitArgs(verbose, upstream)
1296 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001297 if may_prompt:
1298 args.append('--may_prompt')
1299 if parallel:
1300 args.append('--parallel')
1301 if all_files:
1302 args.append('--all_files')
1303
1304 with gclient_utils.temporary_file() as description_file:
1305 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001306
1307 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001308 args.extend(['--json_output', json_output])
1309 args.extend(['--description_file', description_file])
Saagar Sanghavi531d9922020-08-10 20:14:01 +00001310 args.extend(['--gerrit_project', self._GetGerritProject()])
Edward Lemur227d5102020-02-25 23:45:35 +00001311
1312 start = time_time()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001313 cmd = ['vpython', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001314 if resultdb and realm:
1315 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
1316 elif resultdb:
1317 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1318 # it is not required to pass the realm flag
1319 print('Note: ResultDB reporting will NOT be performed because --realm'
1320 ' was not specified. To enable ResultDB, please run the command'
1321 ' again with the --realm argument to specify the LUCI realm.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001322
1323 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001324 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001325
Edward Lemur227d5102020-02-25 23:45:35 +00001326 metrics.collector.add_repeated('sub_commands', {
1327 'command': 'presubmit',
1328 'execution_time': time_time() - start,
1329 'exit_code': exit_code,
1330 })
1331
1332 if exit_code:
1333 sys.exit(exit_code)
1334
1335 json_results = gclient_utils.FileRead(json_output)
1336 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001337
Edward Lemur75526302020-02-27 22:31:05 +00001338 def RunPostUploadHook(self, verbose, upstream, description):
1339 args = self._GetCommonPresubmitArgs(verbose, upstream)
1340 args.append('--post_upload')
1341
1342 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001343 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001344 args.extend(['--description_file', description_file])
1345 p = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1346 p.wait()
1347
Edward Lemur5a644f82020-03-18 16:44:57 +00001348 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1349 # Get description message for upload.
1350 if self.GetIssue():
1351 description = self.FetchDescription()
1352 elif options.message:
1353 description = options.message
1354 else:
1355 description = _create_description_from_log(git_diff_args)
1356 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001357 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001358
1359 # Extract bug number from branch name.
1360 bug = options.bug
1361 fixed = options.fixed
1362 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
1363 self.GetBranch())
1364 if not bug and not fixed and match:
1365 if match.group('type') == 'bug':
1366 bug = match.group('bugnum')
1367 else:
1368 fixed = match.group('bugnum')
1369
1370 change_description = ChangeDescription(description, bug, fixed)
1371
1372 # Set the reviewer list now so that presubmit checks can access it.
1373 if options.reviewers or options.tbrs or options.add_owners_to:
1374 change_description.update_reviewers(
1375 options.reviewers, options.tbrs, options.add_owners_to, files,
1376 self.GetAuthor())
1377
1378 return change_description
1379
1380 def _GetTitleForUpload(self, options):
1381 # When not squashing, just return options.title.
1382 if not options.squash:
1383 return options.title
1384
1385 # On first upload, patchset title is always this string, while options.title
1386 # gets converted to first line of message.
1387 if not self.GetIssue():
1388 return 'Initial upload'
1389
1390 # When uploading subsequent patchsets, options.message is taken as the title
1391 # if options.title is not provided.
1392 if options.title:
1393 return options.title
1394 if options.message:
1395 return options.message.strip()
1396
1397 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001398 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001399 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001400 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001401 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
1402 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001403
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001404 def CMDUpload(self, options, git_diff_args, orig_args):
1405 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001406 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001407 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001408 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001409 else:
1410 if self.GetBranch() is None:
1411 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1412
1413 # Default to diffing against common ancestor of upstream branch
1414 base_branch = self.GetCommonAncestorWithUpstream()
1415 git_diff_args = [base_branch, 'HEAD']
1416
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001417 # Fast best-effort checks to abort before running potentially expensive
1418 # hooks if uploading is likely to fail anyway. Passing these checks does
1419 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001420 self.EnsureAuthenticated(force=options.force)
1421 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001422
1423 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001424 watchlist = watchlists.Watchlists(settings.GetRoot())
1425 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001426 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001427 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001428
Edward Lemur5a644f82020-03-18 16:44:57 +00001429 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001430 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001431 hook_results = self.RunHook(
1432 committing=False,
1433 may_prompt=not options.force,
1434 verbose=options.verbose,
1435 parallel=options.parallel,
1436 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001437 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001438 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001439 resultdb=options.resultdb,
1440 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001441 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001442
Aaron Gable13101a62018-02-09 13:20:41 -08001443 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001444 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001445 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001446 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001447 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001448 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001449 # Run post upload hooks, if specified.
1450 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001451 self.RunPostUploadHook(
1452 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001453
1454 # Upload all dependencies if specified.
1455 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001456 print()
1457 print('--dependencies has been specified.')
1458 print('All dependent local branches will be re-uploaded.')
1459 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001460 # Remove the dependencies flag from args so that we do not end up in a
1461 # loop.
1462 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001463 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001464 return ret
1465
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001466 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001467 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001468
1469 Issue must have been already uploaded and known.
1470 """
1471 assert new_state in _CQState.ALL_STATES
1472 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001473 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001474 vote_map = {
1475 _CQState.NONE: 0,
1476 _CQState.DRY_RUN: 1,
1477 _CQState.COMMIT: 2,
1478 }
1479 labels = {'Commit-Queue': vote_map[new_state]}
1480 notify = False if new_state == _CQState.DRY_RUN else None
1481 gerrit_util.SetReview(
1482 self._GetGerritHost(), self._GerritChangeIdentifier(),
1483 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001484 return 0
1485 except KeyboardInterrupt:
1486 raise
1487 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001488 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001489 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001490 ' * Your project has no CQ,\n'
1491 ' * You don\'t have permission to change the CQ state,\n'
1492 ' * There\'s a bug in this code (see stack trace below).\n'
1493 'Consider specifying which bots to trigger manually or asking your '
1494 'project owners for permissions or contacting Chrome Infra at:\n'
1495 'https://www.chromium.org/infra\n\n' %
1496 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001497 # Still raise exception so that stack trace is printed.
1498 raise
1499
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001500 def _GetGerritHost(self):
1501 # Lazy load of configs.
1502 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001503 if self._gerrit_host and '.' not in self._gerrit_host:
1504 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1505 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001506 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001507 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001508 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001509 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001510 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1511 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001512 return self._gerrit_host
1513
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001514 def _GetGitHost(self):
1515 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001516 remote_url = self.GetRemoteUrl()
1517 if not remote_url:
1518 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001519 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001520
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001521 def GetCodereviewServer(self):
1522 if not self._gerrit_server:
1523 # If we're on a branch then get the server potentially associated
1524 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001525 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001526 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001527 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001528 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001529 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001530 if not self._gerrit_server:
1531 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1532 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001533 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001534 parts[0] = parts[0] + '-review'
1535 self._gerrit_host = '.'.join(parts)
1536 self._gerrit_server = 'https://%s' % self._gerrit_host
1537 return self._gerrit_server
1538
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001539 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001540 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001541 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001542 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001543 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001544 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001545 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001546 if project.endswith('.git'):
1547 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001548 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1549 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1550 # gitiles/git-over-https protocol. E.g.,
1551 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1552 # as
1553 # https://chromium.googlesource.com/v8/v8
1554 if project.startswith('a/'):
1555 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001556 return project
1557
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001558 def _GerritChangeIdentifier(self):
1559 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1560
1561 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001562 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001563 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001564 project = self._GetGerritProject()
1565 if project:
1566 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1567 # Fall back on still unique, but less efficient change number.
1568 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001569
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001570 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001571 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001572 if settings.GetGerritSkipEnsureAuthenticated():
1573 # For projects with unusual authentication schemes.
1574 # See http://crbug.com/603378.
1575 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001576
1577 # Check presence of cookies only if using cookies-based auth method.
1578 cookie_auth = gerrit_util.Authenticator.get()
1579 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001580 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001581
Florian Mayerae510e82020-01-30 21:04:48 +00001582 remote_url = self.GetRemoteUrl()
1583 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001584 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001585 return
1586 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001587 logging.warning('Ignoring branch %(branch)s with non-https remote '
1588 '%(remote)s', {
1589 'branch': self.branch,
1590 'remote': self.GetRemoteUrl()
1591 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001592 return
1593
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001594 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001595 self.GetCodereviewServer()
1596 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001597 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598
1599 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1600 git_auth = cookie_auth.get_auth_header(git_host)
1601 if gerrit_auth and git_auth:
1602 if gerrit_auth == git_auth:
1603 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001604 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001605 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001606 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001607 ' %s\n'
1608 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001609 ' Consider running the following command:\n'
1610 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001611 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001612 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001613 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001614 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001615 cookie_auth.get_new_password_message(git_host)))
1616 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001617 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001618 return
1619 else:
1620 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001621 ([] if gerrit_auth else [self._gerrit_host]) +
1622 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001623 DieWithError('Credentials for the following hosts are required:\n'
1624 ' %s\n'
1625 'These are read from %s (or legacy %s)\n'
1626 '%s' % (
1627 '\n '.join(missing),
1628 cookie_auth.get_gitcookies_path(),
1629 cookie_auth.get_netrc_path(),
1630 cookie_auth.get_new_password_message(git_host)))
1631
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001632 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001633 if not self.GetIssue():
1634 return
1635
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001636 status = self._GetChangeDetail()['status']
1637 if status in ('MERGED', 'ABANDONED'):
1638 DieWithError('Change %s has been %s, new uploads are not allowed' %
1639 (self.GetIssueURL(),
1640 'submitted' if status == 'MERGED' else 'abandoned'))
1641
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001642 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1643 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1644 # Apparently this check is not very important? Otherwise get_auth_email
1645 # could have been added to other implementations of Authenticator.
1646 cookies_auth = gerrit_util.Authenticator.get()
1647 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001648 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001649
1650 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001651 if self.GetIssueOwner() == cookies_user:
1652 return
1653 logging.debug('change %s owner is %s, cookies user is %s',
1654 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001655 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001656 # so ask what Gerrit thinks of this user.
1657 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1658 if details['email'] == self.GetIssueOwner():
1659 return
1660 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001661 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001662 'as %s.\n'
1663 'Uploading may fail due to lack of permissions.' %
1664 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1665 confirm_or_exit(action='upload')
1666
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001667 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001668 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001669 or CQ status, assuming adherence to a common workflow.
1670
1671 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001672 * 'error' - error from review tool (including deleted issues)
1673 * 'unsent' - no reviewers added
1674 * 'waiting' - waiting for review
1675 * 'reply' - waiting for uploader to reply to review
1676 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001677 * 'dry-run' - dry-running in the CQ
1678 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001679 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001680 """
1681 if not self.GetIssue():
1682 return None
1683
1684 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001685 data = self._GetChangeDetail([
1686 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001687 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001688 return 'error'
1689
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001690 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001691 return 'closed'
1692
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001693 cq_label = data['labels'].get('Commit-Queue', {})
1694 max_cq_vote = 0
1695 for vote in cq_label.get('all', []):
1696 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1697 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001698 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001699 if max_cq_vote == 1:
1700 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001701
Aaron Gable9ab38c62017-04-06 14:36:33 -07001702 if data['labels'].get('Code-Review', {}).get('approved'):
1703 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001704
1705 if not data.get('reviewers', {}).get('REVIEWER', []):
1706 return 'unsent'
1707
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001708 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001709 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001710 while messages:
1711 m = messages.pop()
1712 if m.get('tag', '').startswith('autogenerated:cq:'):
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001713 # Ignore replies from CQ.
1714 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001715 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001716 # Most recent message was by owner.
1717 return 'waiting'
1718 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001719 # Some reply from non-owner.
1720 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001721
1722 # Somehow there are no messages even though there are reviewers.
1723 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001724
1725 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001726 if not self.GetIssue():
1727 return None
1728
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001729 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001730 patchset = data['revisions'][data['current_revision']]['_number']
1731 self.SetPatchset(patchset)
1732 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733
Gavin Make61ccc52020-11-13 00:12:57 +00001734 def GetMostRecentDryRunPatchset(self):
1735 """Get patchsets equivalent to the most recent patchset and return
1736 the patchset with the latest dry run. If none have been dry run, return
1737 the latest patchset."""
1738 if not self.GetIssue():
1739 return None
1740
1741 data = self._GetChangeDetail(['ALL_REVISIONS'])
1742 patchset = data['revisions'][data['current_revision']]['_number']
1743 dry_run = set([int(m['_revision_number'])
1744 for m in data.get('messages', [])
1745 if m.get('tag', '').endswith('dry-run')])
1746
1747 for revision_info in sorted(data.get('revisions', {}).values(),
1748 key=lambda c: c['_number'], reverse=True):
1749 if revision_info['_number'] in dry_run:
1750 patchset = revision_info['_number']
1751 break
1752 if revision_info.get('kind', '') not in \
1753 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1754 break
1755 self.SetPatchset(patchset)
1756 return patchset
1757
Aaron Gable636b13f2017-07-14 10:42:48 -07001758 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001759 gerrit_util.SetReview(
1760 self._GetGerritHost(), self._GerritChangeIdentifier(),
1761 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001762
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001763 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001764 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001765 # CURRENT_REVISION is included to get the latest patchset so that
1766 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001767 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001768 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1769 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001770 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001771 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001772 robot_file_comments = gerrit_util.GetChangeRobotComments(
1773 self._GetGerritHost(), self._GerritChangeIdentifier())
1774
1775 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001776 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001777 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001778 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001779 line_comments = file_comments.setdefault(path, [])
1780 line_comments.extend(
1781 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001782
1783 # Build dictionary of file comments for easy access and sorting later.
1784 # {author+date: {path: {patchset: {line: url+message}}}}
1785 comments = collections.defaultdict(
1786 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001787 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001788 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001789 tag = comment.get('tag', '')
1790 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001791 continue
1792 key = (comment['author']['email'], comment['updated'])
1793 if comment.get('side', 'REVISION') == 'PARENT':
1794 patchset = 'Base'
1795 else:
1796 patchset = 'PS%d' % comment['patch_set']
1797 line = comment.get('line', 0)
1798 url = ('https://%s/c/%s/%s/%s#%s%s' %
1799 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1800 'b' if comment.get('side') == 'PARENT' else '',
1801 str(line) if line else ''))
1802 comments[key][path][patchset][line] = (url, comment['message'])
1803
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001804 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001805 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001806 summary = self._BuildCommentSummary(msg, comments, readable)
1807 if summary:
1808 summaries.append(summary)
1809 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001810
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001811 @staticmethod
1812 def _BuildCommentSummary(msg, comments, readable):
1813 key = (msg['author']['email'], msg['date'])
1814 # Don't bother showing autogenerated messages that don't have associated
1815 # file or line comments. this will filter out most autogenerated
1816 # messages, but will keep robot comments like those from Tricium.
1817 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1818 if is_autogenerated and not comments.get(key):
1819 return None
1820 message = msg['message']
1821 # Gerrit spits out nanoseconds.
1822 assert len(msg['date'].split('.')[-1]) == 9
1823 date = datetime.datetime.strptime(msg['date'][:-3],
1824 '%Y-%m-%d %H:%M:%S.%f')
1825 if key in comments:
1826 message += '\n'
1827 for path, patchsets in sorted(comments.get(key, {}).items()):
1828 if readable:
1829 message += '\n%s' % path
1830 for patchset, lines in sorted(patchsets.items()):
1831 for line, (url, content) in sorted(lines.items()):
1832 if line:
1833 line_str = 'Line %d' % line
1834 path_str = '%s:%d:' % (path, line)
1835 else:
1836 line_str = 'File comment'
1837 path_str = '%s:0:' % path
1838 if readable:
1839 message += '\n %s, %s: %s' % (patchset, line_str, url)
1840 message += '\n %s\n' % content
1841 else:
1842 message += '\n%s ' % path_str
1843 message += '\n%s\n' % content
1844
1845 return _CommentSummary(
1846 date=date,
1847 message=message,
1848 sender=msg['author']['email'],
1849 autogenerated=is_autogenerated,
1850 # These could be inferred from the text messages and correlated with
1851 # Code-Review label maximum, however this is not reliable.
1852 # Leaving as is until the need arises.
1853 approval=False,
1854 disapproval=False,
1855 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001856
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001857 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001858 gerrit_util.AbandonChange(
1859 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001860
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001861 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001862 gerrit_util.SubmitChange(
1863 self._GetGerritHost(), self._GerritChangeIdentifier(),
1864 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001865
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001866 def _GetChangeDetail(self, options=None):
1867 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001868 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001869 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001870
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001871 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001872 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001873 options.append('CURRENT_COMMIT')
1874
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001875 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001876 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001877 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001878
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001879 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1880 # Assumption: data fetched before with extra options is suitable
1881 # for return for a smaller set of options.
1882 # For example, if we cached data for
1883 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1884 # and request is for options=[CURRENT_REVISION],
1885 # THEN we can return prior cached data.
1886 if options_set.issubset(cached_options_set):
1887 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001888
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001889 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001890 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001891 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001892 except gerrit_util.GerritError as e:
1893 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001894 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001895 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001896
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001897 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001898 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001899
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001900 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001901 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001902 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001903 data = gerrit_util.GetChangeCommit(
1904 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001905 except gerrit_util.GerritError as e:
1906 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001907 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001908 raise
agable32978d92016-11-01 12:55:02 -07001909 return data
1910
Karen Qian40c19422019-03-13 21:28:29 +00001911 def _IsCqConfigured(self):
1912 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001913 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001914
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001915 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001916 if git_common.is_dirty_git_tree('land'):
1917 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001918
tandriid60367b2016-06-22 05:25:12 -07001919 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001920 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001921 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001922 'which can test and land changes for you. '
1923 'Are you sure you wish to bypass it?\n',
1924 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001925 differs = True
tandriic4344b52016-08-29 06:04:54 -07001926 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001927 # Note: git diff outputs nothing if there is no diff.
1928 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001929 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001930 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001931 if detail['current_revision'] == last_upload:
1932 differs = False
1933 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001934 print('WARNING: Local branch contents differ from latest uploaded '
1935 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001936 if differs:
1937 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001938 confirm_or_exit(
1939 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1940 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001941 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001942 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001943 upstream = self.GetCommonAncestorWithUpstream()
1944 if self.GetIssue():
1945 description = self.FetchDescription()
1946 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001947 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001948 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001949 committing=True,
1950 may_prompt=not force,
1951 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001952 parallel=parallel,
1953 upstream=upstream,
1954 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001955 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001956 resultdb=resultdb,
1957 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001958
1959 self.SubmitIssue(wait_for_merge=True)
1960 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001961 links = self._GetChangeCommit().get('web_links', [])
1962 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001963 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001964 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001965 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001966 return 0
1967
Edward Lemurf38bc172019-09-03 21:02:13 +00001968 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001969 assert parsed_issue_arg.valid
1970
Edward Lemur125d60a2019-09-13 18:25:41 +00001971 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001972
1973 if parsed_issue_arg.hostname:
1974 self._gerrit_host = parsed_issue_arg.hostname
1975 self._gerrit_server = 'https://%s' % self._gerrit_host
1976
tandriic2405f52016-10-10 08:13:15 -07001977 try:
1978 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001979 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001980 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001981
1982 if not parsed_issue_arg.patchset:
1983 # Use current revision by default.
1984 revision_info = detail['revisions'][detail['current_revision']]
1985 patchset = int(revision_info['_number'])
1986 else:
1987 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001988 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001989 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1990 break
1991 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001992 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001993 (parsed_issue_arg.patchset, self.GetIssue()))
1994
Edward Lemur125d60a2019-09-13 18:25:41 +00001995 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001996 if remote_url.endswith('.git'):
1997 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001998 remote_url = remote_url.rstrip('/')
1999
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002001 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002002
2003 if remote_url != fetch_info['url']:
2004 DieWithError('Trying to patch a change from %s but this repo appears '
2005 'to be %s.' % (fetch_info['url'], remote_url))
2006
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002007 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002008
Aaron Gable62619a32017-06-16 08:22:09 -07002009 if force:
2010 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2011 print('Checked out commit for change %i patchset %i locally' %
2012 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002013 elif nocommit:
2014 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2015 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002016 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002017 RunGit(['cherry-pick', 'FETCH_HEAD'])
2018 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002019 (parsed_issue_arg.issue, patchset))
2020 print('Note: this created a local commit which does not have '
2021 'the same hash as the one uploaded for review. This will make '
2022 'uploading changes based on top of this branch difficult.\n'
2023 'If you want to do that, use "git cl patch --force" instead.')
2024
Stefan Zagerd08043c2017-10-12 12:07:02 -07002025 if self.GetBranch():
2026 self.SetIssue(parsed_issue_arg.issue)
2027 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002028 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002029 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2030 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2031 else:
2032 print('WARNING: You are in detached HEAD state.\n'
2033 'The patch has been applied to your checkout, but you will not be '
2034 'able to upload a new patch set to the gerrit issue.\n'
2035 'Try using the \'-b\' option if you would like to work on a '
2036 'branch and/or upload a new patch set.')
2037
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002038 return 0
2039
tandrii16e0b4e2016-06-07 10:34:28 -07002040 def _GerritCommitMsgHookCheck(self, offer_removal):
2041 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2042 if not os.path.exists(hook):
2043 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002044 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2045 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002046 data = gclient_utils.FileRead(hook)
2047 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2048 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002049 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002050 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002051 'and may interfere with it in subtle ways.\n'
2052 'We recommend you remove the commit-msg hook.')
2053 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002054 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002055 gclient_utils.rm_file_or_tree(hook)
2056 print('Gerrit commit-msg hook removed.')
2057 else:
2058 print('OK, will keep Gerrit commit-msg hook in place.')
2059
Edward Lemur1b52d872019-05-09 21:12:12 +00002060 def _CleanUpOldTraces(self):
2061 """Keep only the last |MAX_TRACES| traces."""
2062 try:
2063 traces = sorted([
2064 os.path.join(TRACES_DIR, f)
2065 for f in os.listdir(TRACES_DIR)
2066 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2067 and not f.startswith('tmp'))
2068 ])
2069 traces_to_delete = traces[:-MAX_TRACES]
2070 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002071 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002072 except OSError:
2073 print('WARNING: Failed to remove old git traces from\n'
2074 ' %s'
2075 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002076
Edward Lemur5737f022019-05-17 01:24:00 +00002077 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002078 """Zip and write the git push traces stored in traces_dir."""
2079 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002080 traces_zip = trace_name + '-traces'
2081 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002082 # Create a temporary dir to store git config and gitcookies in. It will be
2083 # compressed and stored next to the traces.
2084 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002085 git_info_zip = trace_name + '-git-info'
2086
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002087 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002088
Edward Lemur1b52d872019-05-09 21:12:12 +00002089 git_push_metadata['trace_name'] = trace_name
2090 gclient_utils.FileWrite(
2091 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2092
2093 # Keep only the first 6 characters of the git hashes on the packet
2094 # trace. This greatly decreases size after compression.
2095 packet_traces = os.path.join(traces_dir, 'trace-packet')
2096 if os.path.isfile(packet_traces):
2097 contents = gclient_utils.FileRead(packet_traces)
2098 gclient_utils.FileWrite(
2099 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2100 shutil.make_archive(traces_zip, 'zip', traces_dir)
2101
2102 # Collect and compress the git config and gitcookies.
2103 git_config = RunGit(['config', '-l'])
2104 gclient_utils.FileWrite(
2105 os.path.join(git_info_dir, 'git-config'),
2106 git_config)
2107
2108 cookie_auth = gerrit_util.Authenticator.get()
2109 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2110 gitcookies_path = cookie_auth.get_gitcookies_path()
2111 if os.path.isfile(gitcookies_path):
2112 gitcookies = gclient_utils.FileRead(gitcookies_path)
2113 gclient_utils.FileWrite(
2114 os.path.join(git_info_dir, 'gitcookies'),
2115 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2116 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2117
Edward Lemur1b52d872019-05-09 21:12:12 +00002118 gclient_utils.rmtree(git_info_dir)
2119
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002120 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002121 """Run git push and collect the traces resulting from the execution."""
2122 # Create a temporary directory to store traces in. Traces will be compressed
2123 # and stored in a 'traces' dir inside depot_tools.
2124 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002125 trace_name = os.path.join(
2126 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002127
2128 env = os.environ.copy()
2129 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2130 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002131 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002132 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2133 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2134 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2135
2136 try:
2137 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002138 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002139 before_push = time_time()
2140 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002141 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002142 env=env,
2143 print_stdout=True,
2144 # Flush after every line: useful for seeing progress when running as
2145 # recipe.
2146 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002147 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002148 except subprocess2.CalledProcessError as e:
2149 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002150 raise GitPushError(
2151 'Failed to create a change. Please examine output above for the '
2152 'reason of the failure.\n'
2153 'Hint: run command below to diagnose common Git/Gerrit '
2154 'credential problems:\n'
2155 ' git cl creds-check\n'
2156 '\n'
2157 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2158 'component including the files below.\n'
2159 'Review the files before upload, since they might contain sensitive '
2160 'information.\n'
2161 'Set the Restrict-View-Google label so that they are not publicly '
2162 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002163 finally:
2164 execution_time = time_time() - before_push
2165 metrics.collector.add_repeated('sub_commands', {
2166 'command': 'git push',
2167 'execution_time': execution_time,
2168 'exit_code': push_returncode,
2169 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2170 })
2171
Edward Lemur1b52d872019-05-09 21:12:12 +00002172 git_push_metadata['execution_time'] = execution_time
2173 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002174 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002175
Edward Lemur1b52d872019-05-09 21:12:12 +00002176 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002177 gclient_utils.rmtree(traces_dir)
2178
2179 return push_stdout
2180
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002181 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2182 change_desc):
2183 """Upload the current branch to Gerrit, retry if new remote HEAD is
2184 found. options and change_desc may be mutated."""
2185 try:
2186 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2187 change_desc)
2188 except GitPushError as e:
2189 remote, remote_branch = self.GetRemoteBranch()
2190 should_retry = remote_branch == DEFAULT_OLD_BRANCH and \
2191 gerrit_util.GetProjectHead(
2192 self._gerrit_host, self._GetGerritProject()) == 'refs/heads/main'
2193 if not should_retry:
2194 DieWithError(str(e), change_desc)
2195
2196 print("WARNING: Detected HEAD change in upstream, fetching remote state")
2197 RunGit(['fetch', remote])
2198 options.edit_description = False
2199 options.force = True
2200 try:
2201 self._CMDUploadChange(options, git_diff_args, custom_cl_base, change_desc)
2202 except GitPushError as e:
2203 DieWithError(str(e), change_desc)
2204
2205 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2206 change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002207 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002209 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002210
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002211 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002212 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002213 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002214 # User requested to change description
2215 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002216 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002217 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002218 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002219 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002220 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002221 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002222 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002223 if len(change_ids) == 1:
2224 change_id = change_ids[0]
2225 else:
2226 change_id = GenerateGerritChangeId(change_desc.description)
2227 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002229 if options.preserve_tryjobs:
2230 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002231
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002233 parent = self._ComputeParent(
2234 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002235 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002236 with gclient_utils.temporary_file() as desc_tempfile:
2237 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2238 ref_to_push = RunGit(
2239 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002240 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241 if not git_footers.get_footer_change_id(change_desc.description):
2242 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002243 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002244 self._AddChangeIdToCommitMessage(
2245 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002246 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002247 # For no-squash mode, we assume the remote called "origin" is the one we
2248 # want. It is not worthwhile to support different workflows for
2249 # no-squash mode.
2250 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002251 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2252
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002253 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002254 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2255 ref_to_push)]).splitlines()
2256 if len(commits) > 1:
2257 print('WARNING: This will upload %d commits. Run the following command '
2258 'to see which commits will be uploaded: ' % len(commits))
2259 print('git log %s..%s' % (parent, ref_to_push))
2260 print('You can also use `git squash-branch` to squash these into a '
2261 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002262 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002263
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002264 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002265 cc = []
2266 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2267 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2268 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002269 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002270 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002271 if options.cc:
2272 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002273 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002274 if change_desc.get_cced():
2275 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002276 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2277 valid_accounts = set(reviewers + cc)
2278 # TODO(crbug/877717): relax this for all hosts.
2279 else:
2280 valid_accounts = gerrit_util.ValidAccounts(
2281 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002282 logging.info('accounts %s are recognized, %s invalid',
2283 sorted(valid_accounts),
2284 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002285
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002286 # Extra options that can be specified at push time. Doc:
2287 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002288 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002289
Aaron Gable844cf292017-06-28 11:32:59 -07002290 # By default, new changes are started in WIP mode, and subsequent patchsets
2291 # don't send email. At any time, passing --send-mail will mark the change
2292 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002293 if options.send_mail:
2294 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002295 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002296 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002297 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002298 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002299 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002300
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002301 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002302 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002303
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002304 # Set options.title in case user was prompted in _GetTitleForUpload and
2305 # _CMDUploadChange needs to be called again.
2306 options.title = self._GetTitleForUpload(options)
2307 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002308 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002309 refspec_opts.append(
2310 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002311
agablec6787972016-09-09 16:13:34 -07002312 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002313 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002314
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002315 for r in sorted(reviewers):
2316 if r in valid_accounts:
2317 refspec_opts.append('r=%s' % r)
2318 reviewers.remove(r)
2319 else:
2320 # TODO(tandrii): this should probably be a hard failure.
2321 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2322 % r)
2323 for c in sorted(cc):
2324 # refspec option will be rejected if cc doesn't correspond to an
2325 # account, even though REST call to add such arbitrary cc may succeed.
2326 if c in valid_accounts:
2327 refspec_opts.append('cc=%s' % c)
2328 cc.remove(c)
2329
rmistry9eadede2016-09-19 11:22:43 -07002330 if options.topic:
2331 # Documentation on Gerrit topics is here:
2332 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002333 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002334
Edward Lemur687ca902018-12-05 02:30:30 +00002335 if options.enable_auto_submit:
2336 refspec_opts.append('l=Auto-Submit+1')
2337 if options.use_commit_queue:
2338 refspec_opts.append('l=Commit-Queue+2')
2339 elif options.cq_dry_run:
2340 refspec_opts.append('l=Commit-Queue+1')
2341
2342 if change_desc.get_reviewers(tbr_only=True):
2343 score = gerrit_util.GetCodeReviewTbrScore(
2344 self._GetGerritHost(),
2345 self._GetGerritProject())
2346 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002347
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002348 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002349 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002350 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002351 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002352 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2353
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002354 refspec_suffix = ''
2355 if refspec_opts:
2356 refspec_suffix = '%' + ','.join(refspec_opts)
2357 assert ' ' not in refspec_suffix, (
2358 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2359 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2360
Edward Lemur1b52d872019-05-09 21:12:12 +00002361 git_push_metadata = {
2362 'gerrit_host': self._GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002363 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002364 'change_id': change_id,
2365 'description': change_desc.description,
2366 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002367 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2368 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002369
2370 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002371 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 change_numbers = [m.group(1)
2373 for m in map(regex.match, push_stdout.splitlines())
2374 if m]
2375 if len(change_numbers) != 1:
2376 DieWithError(
2377 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002378 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002379 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002380 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002381
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002382 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002383 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002384 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002385 gerrit_util.AddReviewers(
2386 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002387 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002388 reviewers, cc,
2389 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002390
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 return 0
2392
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002393 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2394 change_desc):
2395 """Computes parent of the generated commit to be uploaded to Gerrit.
2396
2397 Returns revision or a ref name.
2398 """
2399 if custom_cl_base:
2400 # Try to avoid creating additional unintended CLs when uploading, unless
2401 # user wants to take this risk.
2402 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2403 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2404 local_ref_of_target_remote])
2405 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002406 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002407 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2408 'If you proceed with upload, more than 1 CL may be created by '
2409 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2410 'If you are certain that specified base `%s` has already been '
2411 'uploaded to Gerrit as another CL, you may proceed.\n' %
2412 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2413 if not force:
2414 confirm_or_exit(
2415 'Do you take responsibility for cleaning up potential mess '
2416 'resulting from proceeding with upload?',
2417 action='upload')
2418 return custom_cl_base
2419
Aaron Gablef97e33d2017-03-30 15:44:27 -07002420 if remote != '.':
2421 return self.GetCommonAncestorWithUpstream()
2422
2423 # If our upstream branch is local, we base our squashed commit on its
2424 # squashed version.
2425 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2426
Aaron Gablef97e33d2017-03-30 15:44:27 -07002427 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002428 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002429 if upstream_branch_name == 'main':
2430 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002431
2432 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002433 # TODO(tandrii): consider checking parent change in Gerrit and using its
2434 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2435 # the tree hash of the parent branch. The upside is less likely bogus
2436 # requests to reupload parent change just because it's uploadhash is
2437 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002438 parent = scm.GIT.GetBranchConfig(
2439 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002440 # Verify that the upstream branch has been uploaded too, otherwise
2441 # Gerrit will create additional CLs when uploading.
2442 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2443 RunGitSilent(['rev-parse', parent + ':'])):
2444 DieWithError(
2445 '\nUpload upstream branch %s first.\n'
2446 'It is likely that this branch has been rebased since its last '
2447 'upload, so you just need to upload it again.\n'
2448 '(If you uploaded it with --no-squash, then branch dependencies '
2449 'are not supported, and you should reupload with --squash.)'
2450 % upstream_branch_name,
2451 change_desc)
2452 return parent
2453
Edward Lemura12175c2020-03-09 16:58:26 +00002454 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002455 """Re-commits using the current message, assumes the commit hook is in
2456 place.
2457 """
Edward Lemura12175c2020-03-09 16:58:26 +00002458 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002459 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002460 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002461 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002462 return new_log_desc
2463 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002464 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002465
tandriie113dfd2016-10-11 10:20:12 -07002466 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002467 try:
2468 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002469 except GerritChangeNotExists:
2470 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002471
2472 if data['status'] in ('ABANDONED', 'MERGED'):
2473 return 'CL %s is closed' % self.GetIssue()
2474
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002475 def GetGerritChange(self, patchset=None):
2476 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002477 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002478 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002479 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002480 data = self._GetChangeDetail(['ALL_REVISIONS'])
2481
2482 assert host and issue and patchset, 'CL must be uploaded first'
2483
2484 has_patchset = any(
2485 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002486 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002487 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002488 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002489 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002490
tandrii8c5a3532016-11-04 07:52:02 -07002491 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002492 'host': host,
2493 'change': issue,
2494 'project': data['project'],
2495 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002496 }
tandriie113dfd2016-10-11 10:20:12 -07002497
tandriide281ae2016-10-12 06:02:30 -07002498 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002499 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002500
Edward Lemur707d70b2018-02-07 00:50:14 +01002501 def GetReviewers(self):
2502 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002503 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002504
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002505
Lei Zhang8a0efc12020-08-05 19:58:45 +00002506def _get_bug_line_values(default_project_prefix, bugs):
2507 """Given default_project_prefix and comma separated list of bugs, yields bug
2508 line values.
tandriif9aefb72016-07-01 09:06:51 -07002509
2510 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002511 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002512 * string, which is left as is.
2513
2514 This function may produce more than one line, because bugdroid expects one
2515 project per line.
2516
Lei Zhang8a0efc12020-08-05 19:58:45 +00002517 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002518 ['v8:123', 'chromium:789']
2519 """
2520 default_bugs = []
2521 others = []
2522 for bug in bugs.split(','):
2523 bug = bug.strip()
2524 if bug:
2525 try:
2526 default_bugs.append(int(bug))
2527 except ValueError:
2528 others.append(bug)
2529
2530 if default_bugs:
2531 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002532 if default_project_prefix:
2533 if not default_project_prefix.endswith(':'):
2534 default_project_prefix += ':'
2535 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002536 else:
2537 yield default_bugs
2538 for other in sorted(others):
2539 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2540 yield other
2541
2542
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002543class ChangeDescription(object):
2544 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002545 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002546 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002547 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002548 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002549 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002550 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2551 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002552 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002553 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002554
Dan Beamd8b04ca2019-10-10 21:23:26 +00002555 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002556 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002557 if bug:
2558 regexp = re.compile(self.BUG_LINE)
2559 prefix = settings.GetBugPrefix()
2560 if not any((regexp.match(line) for line in self._description_lines)):
2561 values = list(_get_bug_line_values(prefix, bug))
2562 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002563 if fixed:
2564 regexp = re.compile(self.FIXED_LINE)
2565 prefix = settings.GetBugPrefix()
2566 if not any((regexp.match(line) for line in self._description_lines)):
2567 values = list(_get_bug_line_values(prefix, fixed))
2568 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002569
agable@chromium.org42c20792013-09-12 17:34:49 +00002570 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002571 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002572 return '\n'.join(self._description_lines)
2573
2574 def set_description(self, desc):
2575 if isinstance(desc, basestring):
2576 lines = desc.splitlines()
2577 else:
2578 lines = [line.rstrip() for line in desc]
2579 while lines and not lines[0]:
2580 lines.pop(0)
2581 while lines and not lines[-1]:
2582 lines.pop(-1)
2583 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002584
Edward Lemur5a644f82020-03-18 16:44:57 +00002585 def ensure_change_id(self, change_id):
2586 description = self.description
2587 footer_change_ids = git_footers.get_footer_change_id(description)
2588 # Make sure that the Change-Id in the description matches the given one.
2589 if footer_change_ids != [change_id]:
2590 if footer_change_ids:
2591 # Remove any existing Change-Id footers since they don't match the
2592 # expected change_id footer.
2593 description = git_footers.remove_footer(description, 'Change-Id')
2594 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2595 'if you want to set a new one.')
2596 # Add the expected Change-Id footer.
2597 description = git_footers.add_footer_change_id(description, change_id)
2598 self.set_description(description)
2599
Edward Lemur2c62b332020-03-12 22:12:33 +00002600 def update_reviewers(
2601 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002602 """Rewrites the R=/TBR= line(s) as a single line each.
2603
2604 Args:
2605 reviewers (list(str)) - list of additional emails to use for reviewers.
2606 tbrs (list(str)) - list of additional emails to use for TBRs.
2607 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2608 the change that are missing OWNER coverage. If this is not None, you
2609 must also pass a value for `change`.
2610 change (Change) - The Change that should be used for OWNERS lookups.
2611 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002612 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002613 assert isinstance(tbrs, list), tbrs
2614
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002615 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002616 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002617
2618 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002619 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002620
2621 reviewers = set(reviewers)
2622 tbrs = set(tbrs)
2623 LOOKUP = {
2624 'TBR': tbrs,
2625 'R': reviewers,
2626 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002627
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002628 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002629 regexp = re.compile(self.R_LINE)
2630 matches = [regexp.match(line) for line in self._description_lines]
2631 new_desc = [l for i, l in enumerate(self._description_lines)
2632 if not matches[i]]
2633 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002634
agable@chromium.org42c20792013-09-12 17:34:49 +00002635 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002636
2637 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002638 for match in matches:
2639 if not match:
2640 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002641 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2642
2643 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002644 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002645 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002646 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002647 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002648 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002649 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002650 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002651
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002652 # If any folks ended up in both groups, remove them from tbrs.
2653 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002654
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002655 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2656 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002657
2658 # Put the new lines in the description where the old first R= line was.
2659 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2660 if 0 <= line_loc < len(self._description_lines):
2661 if new_tbr_line:
2662 self._description_lines.insert(line_loc, new_tbr_line)
2663 if new_r_line:
2664 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002665 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002666 if new_r_line:
2667 self.append_footer(new_r_line)
2668 if new_tbr_line:
2669 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002670
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002671 def set_preserve_tryjobs(self):
2672 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2673 footers = git_footers.parse_footers(self.description)
2674 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2675 if v.lower() == 'true':
2676 return
2677 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2678
Anthony Polito8b955342019-09-24 19:01:36 +00002679 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002680 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002681 self.set_description([
2682 '# Enter a description of the change.',
2683 '# This will be displayed on the codereview site.',
2684 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002685 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 '--------------------',
2687 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002688 bug_regexp = re.compile(self.BUG_LINE)
2689 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002690 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002691 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002692
Dan Beamd8b04ca2019-10-10 21:23:26 +00002693 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002694 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002695
Bruce Dawsonfc487042020-10-27 19:11:37 +00002696 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002697 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002698 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002699 if not content:
2700 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002701 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002702
Bruce Dawson2377b012018-01-11 16:46:49 -08002703 # Strip off comments and default inserted "Bug:" line.
2704 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002705 (line.startswith('#') or
2706 line.rstrip() == "Bug:" or
2707 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002708 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002709 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002710 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002711
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002712 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002713 """Adds a footer line to the description.
2714
2715 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2716 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2717 that Gerrit footers are always at the end.
2718 """
2719 parsed_footer_line = git_footers.parse_footer(line)
2720 if parsed_footer_line:
2721 # Line is a gerrit footer in the form: Footer-Key: any value.
2722 # Thus, must be appended observing Gerrit footer rules.
2723 self.set_description(
2724 git_footers.add_footer(self.description,
2725 key=parsed_footer_line[0],
2726 value=parsed_footer_line[1]))
2727 return
2728
2729 if not self._description_lines:
2730 self._description_lines.append(line)
2731 return
2732
2733 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2734 if gerrit_footers:
2735 # git_footers.split_footers ensures that there is an empty line before
2736 # actual (gerrit) footers, if any. We have to keep it that way.
2737 assert top_lines and top_lines[-1] == ''
2738 top_lines, separator = top_lines[:-1], top_lines[-1:]
2739 else:
2740 separator = [] # No need for separator if there are no gerrit_footers.
2741
2742 prev_line = top_lines[-1] if top_lines else ''
2743 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2744 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2745 top_lines.append('')
2746 top_lines.append(line)
2747 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002748
tandrii99a72f22016-08-17 14:33:24 -07002749 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002750 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002751 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002752 reviewers = [match.group(2).strip()
2753 for match in matches
2754 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002755 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002756
bradnelsond975b302016-10-23 12:20:23 -07002757 def get_cced(self):
2758 """Retrieves the list of reviewers."""
2759 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2760 cced = [match.group(2).strip() for match in matches if match]
2761 return cleanup_list(cced)
2762
Nodir Turakulov23b82142017-11-16 11:04:25 -08002763 def get_hash_tags(self):
2764 """Extracts and sanitizes a list of Gerrit hashtags."""
2765 subject = (self._description_lines or ('',))[0]
2766 subject = re.sub(
2767 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2768
2769 tags = []
2770 start = 0
2771 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2772 while True:
2773 m = bracket_exp.match(subject, start)
2774 if not m:
2775 break
2776 tags.append(self.sanitize_hash_tag(m.group(1)))
2777 start = m.end()
2778
2779 if not tags:
2780 # Try "Tag: " prefix.
2781 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2782 if m:
2783 tags.append(self.sanitize_hash_tag(m.group(1)))
2784 return tags
2785
2786 @classmethod
2787 def sanitize_hash_tag(cls, tag):
2788 """Returns a sanitized Gerrit hash tag.
2789
2790 A sanitized hashtag can be used as a git push refspec parameter value.
2791 """
2792 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2793
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002795def FindCodereviewSettingsFile(filename='codereview.settings'):
2796 """Finds the given file starting in the cwd and going up.
2797
2798 Only looks up to the top of the repository unless an
2799 'inherit-review-settings-ok' file exists in the root of the repository.
2800 """
2801 inherit_ok_file = 'inherit-review-settings-ok'
2802 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002803 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002804 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2805 root = '/'
2806 while True:
2807 if filename in os.listdir(cwd):
2808 if os.path.isfile(os.path.join(cwd, filename)):
2809 return open(os.path.join(cwd, filename))
2810 if cwd == root:
2811 break
2812 cwd = os.path.dirname(cwd)
2813
2814
2815def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002816 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002817 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002818
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002819 def SetProperty(name, setting, unset_error_ok=False):
2820 fullname = 'rietveld.' + name
2821 if setting in keyvals:
2822 RunGit(['config', fullname, keyvals[setting]])
2823 else:
2824 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2825
tandrii48df5812016-10-17 03:55:37 -07002826 if not keyvals.get('GERRIT_HOST', False):
2827 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002828 # Only server setting is required. Other settings can be absent.
2829 # In that case, we ignore errors raised during option deletion attempt.
2830 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2831 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2832 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002833 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002834 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2835 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002836 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2837 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002838 SetProperty(
2839 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002840
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002841 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002842 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002843
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002844 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002845 RunGit(['config', 'gerrit.squash-uploads',
2846 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002847
tandrii@chromium.org28253532016-04-14 13:46:56 +00002848 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002849 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002850 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2851
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002852 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002853 # should be of the form
2854 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2855 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002856 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2857 keyvals['ORIGIN_URL_CONFIG']])
2858
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002859
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002860def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002861 """Downloads a network object to a local file, like urllib.urlretrieve.
2862
2863 This is necessary because urllib is broken for SSL connections via a proxy.
2864 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002865 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002866 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002867
2868
ukai@chromium.org712d6102013-11-27 00:52:58 +00002869def hasSheBang(fname):
2870 """Checks fname is a #! script."""
2871 with open(fname) as f:
2872 return f.read(2).startswith('#!')
2873
2874
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002875def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002876 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002877
2878 Args:
2879 force: True to update hooks. False to install hooks if not present.
2880 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002881 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002882 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2883 if not os.access(dst, os.X_OK):
2884 if os.path.exists(dst):
2885 if not force:
2886 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002887 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002888 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002889 if not hasSheBang(dst):
2890 DieWithError('Not a script: %s\n'
2891 'You need to download from\n%s\n'
2892 'into .git/hooks/commit-msg and '
2893 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002894 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2895 except Exception:
2896 if os.path.exists(dst):
2897 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002898 DieWithError('\nFailed to download hooks.\n'
2899 'You need to download from\n%s\n'
2900 'into .git/hooks/commit-msg and '
2901 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002902
2903
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002904class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002905 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002906
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002907 _GOOGLESOURCE = 'googlesource.com'
2908
2909 def __init__(self):
2910 # Cached list of [host, identity, source], where source is either
2911 # .gitcookies or .netrc.
2912 self._all_hosts = None
2913
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002914 def ensure_configured_gitcookies(self):
2915 """Runs checks and suggests fixes to make git use .gitcookies from default
2916 path."""
2917 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2918 configured_path = RunGitSilent(
2919 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002920 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002921 if configured_path:
2922 self._ensure_default_gitcookies_path(configured_path, default)
2923 else:
2924 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002925
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002926 @staticmethod
2927 def _ensure_default_gitcookies_path(configured_path, default_path):
2928 assert configured_path
2929 if configured_path == default_path:
2930 print('git is already configured to use your .gitcookies from %s' %
2931 configured_path)
2932 return
2933
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002934 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002935 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2936 (configured_path, default_path))
2937
2938 if not os.path.exists(configured_path):
2939 print('However, your configured .gitcookies file is missing.')
2940 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2941 action='reconfigure')
2942 RunGit(['config', '--global', 'http.cookiefile', default_path])
2943 return
2944
2945 if os.path.exists(default_path):
2946 print('WARNING: default .gitcookies file already exists %s' %
2947 default_path)
2948 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2949 default_path)
2950
2951 confirm_or_exit('Move existing .gitcookies to default location?',
2952 action='move')
2953 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002954 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002955 print('Moved and reconfigured git to use .gitcookies from %s' %
2956 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002957
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002958 @staticmethod
2959 def _configure_gitcookies_path(default_path):
2960 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2961 if os.path.exists(netrc_path):
2962 print('You seem to be using outdated .netrc for git credentials: %s' %
2963 netrc_path)
2964 print('This tool will guide you through setting up recommended '
2965 '.gitcookies store for git credentials.\n'
2966 '\n'
2967 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2968 ' git config --global --unset http.cookiefile\n'
2969 ' mv %s %s.backup\n\n' % (default_path, default_path))
2970 confirm_or_exit(action='setup .gitcookies')
2971 RunGit(['config', '--global', 'http.cookiefile', default_path])
2972 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002973
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002974 def get_hosts_with_creds(self, include_netrc=False):
2975 if self._all_hosts is None:
2976 a = gerrit_util.CookiesAuthenticator()
2977 self._all_hosts = [
2978 (h, u, s)
2979 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002980 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2981 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002982 )
2983 if h.endswith(self._GOOGLESOURCE)
2984 ]
2985
2986 if include_netrc:
2987 return self._all_hosts
2988 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2989
2990 def print_current_creds(self, include_netrc=False):
2991 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2992 if not hosts:
2993 print('No Git/Gerrit credentials found')
2994 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002995 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002996 header = [('Host', 'User', 'Which file'),
2997 ['=' * l for l in lengths]]
2998 for row in (header + hosts):
2999 print('\t'.join((('%%+%ds' % l) % s)
3000 for l, s in zip(lengths, row)))
3001
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003002 @staticmethod
3003 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003004 """Parses identity "git-<username>.domain" into <username> and domain."""
3005 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003006 # distinguishable from sub-domains. But we do know typical domains:
3007 if identity.endswith('.chromium.org'):
3008 domain = 'chromium.org'
3009 username = identity[:-len('.chromium.org')]
3010 else:
3011 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003012 if username.startswith('git-'):
3013 username = username[len('git-'):]
3014 return username, domain
3015
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003016 def _canonical_git_googlesource_host(self, host):
3017 """Normalizes Gerrit hosts (with '-review') to Git host."""
3018 assert host.endswith(self._GOOGLESOURCE)
3019 # Prefix doesn't include '.' at the end.
3020 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3021 if prefix.endswith('-review'):
3022 prefix = prefix[:-len('-review')]
3023 return prefix + '.' + self._GOOGLESOURCE
3024
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003025 def _canonical_gerrit_googlesource_host(self, host):
3026 git_host = self._canonical_git_googlesource_host(host)
3027 prefix = git_host.split('.', 1)[0]
3028 return prefix + '-review.' + self._GOOGLESOURCE
3029
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003030 def _get_counterpart_host(self, host):
3031 assert host.endswith(self._GOOGLESOURCE)
3032 git = self._canonical_git_googlesource_host(host)
3033 gerrit = self._canonical_gerrit_googlesource_host(git)
3034 return git if gerrit == host else gerrit
3035
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003036 def has_generic_host(self):
3037 """Returns whether generic .googlesource.com has been configured.
3038
3039 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3040 """
3041 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3042 if host == '.' + self._GOOGLESOURCE:
3043 return True
3044 return False
3045
3046 def _get_git_gerrit_identity_pairs(self):
3047 """Returns map from canonic host to pair of identities (Git, Gerrit).
3048
3049 One of identities might be None, meaning not configured.
3050 """
3051 host_to_identity_pairs = {}
3052 for host, identity, _ in self.get_hosts_with_creds():
3053 canonical = self._canonical_git_googlesource_host(host)
3054 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3055 idx = 0 if canonical == host else 1
3056 pair[idx] = identity
3057 return host_to_identity_pairs
3058
3059 def get_partially_configured_hosts(self):
3060 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003061 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003062 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003063 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003064
3065 def get_conflicting_hosts(self):
3066 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003067 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003068 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003069 if None not in (i1, i2) and i1 != i2)
3070
3071 def get_duplicated_hosts(self):
3072 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003073 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003074
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003075
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003076 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003077 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003078 hosts = sorted(hosts)
3079 assert hosts
3080 if extra_column_func is None:
3081 extras = [''] * len(hosts)
3082 else:
3083 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003084 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3085 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003086 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003087 lines.append(tmpl % he)
3088 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003089
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003090 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003091 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003092 yield ('.googlesource.com wildcard record detected',
3093 ['Chrome Infrastructure team recommends to list full host names '
3094 'explicitly.'],
3095 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003096
3097 dups = self.get_duplicated_hosts()
3098 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003099 yield ('The following hosts were defined twice',
3100 self._format_hosts(dups),
3101 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003102
3103 partial = self.get_partially_configured_hosts()
3104 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003105 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3106 'These hosts are missing',
3107 self._format_hosts(partial, lambda host: 'but %s defined' %
3108 self._get_counterpart_host(host)),
3109 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003110
3111 conflicting = self.get_conflicting_hosts()
3112 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003113 yield ('The following Git hosts have differing credentials from their '
3114 'Gerrit counterparts',
3115 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3116 tuple(self._get_git_gerrit_identity_pairs()[host])),
3117 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003118
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003119 def find_and_report_problems(self):
3120 """Returns True if there was at least one problem, else False."""
3121 found = False
3122 bad_hosts = set()
3123 for title, sublines, hosts in self._find_problems():
3124 if not found:
3125 found = True
3126 print('\n\n.gitcookies problem report:\n')
3127 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003128 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003129 if sublines:
3130 print()
3131 print(' %s' % '\n '.join(sublines))
3132 print()
3133
3134 if bad_hosts:
3135 assert found
3136 print(' You can manually remove corresponding lines in your %s file and '
3137 'visit the following URLs with correct account to generate '
3138 'correct credential lines:\n' %
3139 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3140 print(' %s' % '\n '.join(sorted(set(
3141 gerrit_util.CookiesAuthenticator().get_new_password_url(
3142 self._canonical_git_googlesource_host(host))
3143 for host in bad_hosts
3144 ))))
3145 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003146
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003147
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003148@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003149def CMDcreds_check(parser, args):
3150 """Checks credentials and suggests changes."""
3151 _, _ = parser.parse_args(args)
3152
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003153 # Code below checks .gitcookies. Abort if using something else.
3154 authn = gerrit_util.Authenticator.get()
3155 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003156 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003157 'This command is not designed for bot environment. It checks '
3158 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003159 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3160 if isinstance(authn, gerrit_util.GceAuthenticator):
3161 message += (
3162 '\n'
3163 'If you need to run this on GCE or a cloudtop instance, '
3164 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3165 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003166
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003167 checker = _GitCookiesChecker()
3168 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003169
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003170 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003171 checker.print_current_creds(include_netrc=True)
3172
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003173 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003174 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003175 return 0
3176 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003177
3178
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003179@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003180def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003181 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003182 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003183 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003184 _, args = parser.parse_args(args)
3185 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003186 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003187 return RunGit(['config', 'branch.%s.base-url' % branch],
3188 error_ok=False).strip()
3189 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003190 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003191 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3192 error_ok=False).strip()
3193
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003194
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003195def color_for_status(status):
3196 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003197 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003198 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003199 'unsent': BOLD + Fore.YELLOW,
3200 'waiting': BOLD + Fore.RED,
3201 'reply': BOLD + Fore.YELLOW,
3202 'not lgtm': BOLD + Fore.RED,
3203 'lgtm': BOLD + Fore.GREEN,
3204 'commit': BOLD + Fore.MAGENTA,
3205 'closed': BOLD + Fore.CYAN,
3206 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003207 }.get(status, Fore.WHITE)
3208
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003209
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003210def get_cl_statuses(changes, fine_grained, max_processes=None):
3211 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003212
3213 If fine_grained is true, this will fetch CL statuses from the server.
3214 Otherwise, simply indicate if there's a matching url for the given branches.
3215
3216 If max_processes is specified, it is used as the maximum number of processes
3217 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3218 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003219
3220 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003221 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003222 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003223 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003224
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003225 if not fine_grained:
3226 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003227 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003228 for cl in changes:
3229 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003230 return
3231
3232 # First, sort out authentication issues.
3233 logging.debug('ensuring credentials exist')
3234 for cl in changes:
3235 cl.EnsureAuthenticated(force=False, refresh=True)
3236
3237 def fetch(cl):
3238 try:
3239 return (cl, cl.GetStatus())
3240 except:
3241 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003242 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003243 raise
3244
3245 threads_count = len(changes)
3246 if max_processes:
3247 threads_count = max(1, min(threads_count, max_processes))
3248 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3249
Edward Lemur61bf4172020-02-24 23:22:37 +00003250 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003251 fetched_cls = set()
3252 try:
3253 it = pool.imap_unordered(fetch, changes).__iter__()
3254 while True:
3255 try:
3256 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003257 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003258 break
3259 fetched_cls.add(cl)
3260 yield cl, status
3261 finally:
3262 pool.close()
3263
3264 # Add any branches that failed to fetch.
3265 for cl in set(changes) - fetched_cls:
3266 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003267
rmistry@google.com2dd99862015-06-22 12:22:18 +00003268
Jose Lopes3863fc52020-04-07 17:00:25 +00003269def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003270 """Uploads CLs of local branches that are dependents of the current branch.
3271
3272 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003273
3274 test1 -> test2.1 -> test3.1
3275 -> test3.2
3276 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003277
3278 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3279 run on the dependent branches in this order:
3280 test2.1, test3.1, test3.2, test2.2, test3.3
3281
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003282 Note: This function does not rebase your local dependent branches. Use it
3283 when you make a change to the parent branch that will not conflict
3284 with its dependent branches, and you would like their dependencies
3285 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003286 """
3287 if git_common.is_dirty_git_tree('upload-branch-deps'):
3288 return 1
3289
3290 root_branch = cl.GetBranch()
3291 if root_branch is None:
3292 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3293 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003294 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003295 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3296 'patchset dependencies without an uploaded CL.')
3297
3298 branches = RunGit(['for-each-ref',
3299 '--format=%(refname:short) %(upstream:short)',
3300 'refs/heads'])
3301 if not branches:
3302 print('No local branches found.')
3303 return 0
3304
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003305 # Create a dictionary of all local branches to the branches that are
3306 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003307 tracked_to_dependents = collections.defaultdict(list)
3308 for b in branches.splitlines():
3309 tokens = b.split()
3310 if len(tokens) == 2:
3311 branch_name, tracked = tokens
3312 tracked_to_dependents[tracked].append(branch_name)
3313
vapiera7fbd5a2016-06-16 09:17:49 -07003314 print()
3315 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003316 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003317
rmistry@google.com2dd99862015-06-22 12:22:18 +00003318 def traverse_dependents_preorder(branch, padding=''):
3319 dependents_to_process = tracked_to_dependents.get(branch, [])
3320 padding += ' '
3321 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003322 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003323 dependents.append(dependent)
3324 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003325
rmistry@google.com2dd99862015-06-22 12:22:18 +00003326 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003327 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003328
3329 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003330 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003331 return 0
3332
Jose Lopes3863fc52020-04-07 17:00:25 +00003333 if not force:
3334 confirm_or_exit('This command will checkout all dependent branches and run '
3335 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003336
rmistry@google.com2dd99862015-06-22 12:22:18 +00003337 # Record all dependents that failed to upload.
3338 failures = {}
3339 # Go through all dependents, checkout the branch and upload.
3340 try:
3341 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003342 print()
3343 print('--------------------------------------')
3344 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003345 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003346 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003347 try:
3348 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003349 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003350 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003351 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003352 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003353 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003354 finally:
3355 # Swap back to the original root branch.
3356 RunGit(['checkout', '-q', root_branch])
3357
vapiera7fbd5a2016-06-16 09:17:49 -07003358 print()
3359 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003360 for dependent_branch in dependents:
3361 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003362 print(' %s : %s' % (dependent_branch, upload_status))
3363 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003364
3365 return 0
3366
3367
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003368def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003369 """Given a proposed tag name, returns a tag name that is guaranteed to be
3370 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3371 or 'foo-3', and so on."""
3372
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003373 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003374 for suffix_num in itertools.count(1):
3375 if suffix_num == 1:
3376 to_check = proposed_tag
3377 else:
3378 to_check = '%s-%d' % (proposed_tag, suffix_num)
3379
3380 if to_check not in existing_tags:
3381 return to_check
3382
3383
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003384@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003385def CMDarchive(parser, args):
3386 """Archives and deletes branches associated with closed changelists."""
3387 parser.add_option(
3388 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003389 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003390 parser.add_option(
3391 '-f', '--force', action='store_true',
3392 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003393 parser.add_option(
3394 '-d', '--dry-run', action='store_true',
3395 help='Skip the branch tagging and removal steps.')
3396 parser.add_option(
3397 '-t', '--notags', action='store_true',
3398 help='Do not tag archived branches. '
3399 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003400 parser.add_option(
3401 '-p',
3402 '--pattern',
3403 default='git-cl-archived-{issue}-{branch}',
3404 help='Format string for archive tags. '
3405 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003406
kmarshall3bff56b2016-06-06 18:31:47 -07003407 options, args = parser.parse_args(args)
3408 if args:
3409 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003410
3411 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3412 if not branches:
3413 return 0
3414
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003415 tags = RunGit(['for-each-ref', '--format=%(refname)',
3416 'refs/tags']).splitlines() or []
3417 tags = [t.split('/')[-1] for t in tags]
3418
vapiera7fbd5a2016-06-16 09:17:49 -07003419 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003420 changes = [Changelist(branchref=b)
3421 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003422 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3423 statuses = get_cl_statuses(changes,
3424 fine_grained=True,
3425 max_processes=options.maxjobs)
3426 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003427 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3428 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003429 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003430 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003431 proposal.sort()
3432
3433 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003434 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003435 return 0
3436
Edward Lemur85153282020-02-14 22:06:29 +00003437 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003438
vapiera7fbd5a2016-06-16 09:17:49 -07003439 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003440 if options.notags:
3441 for next_item in proposal:
3442 print(' ' + next_item[0])
3443 else:
3444 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3445 for next_item in proposal:
3446 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003447
kmarshall9249e012016-08-23 12:02:16 -07003448 # Quit now on precondition failure or if instructed by the user, either
3449 # via an interactive prompt or by command line flags.
3450 if options.dry_run:
3451 print('\nNo changes were made (dry run).\n')
3452 return 0
3453 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003454 print('You are currently on a branch \'%s\' which is associated with a '
3455 'closed codereview issue, so archive cannot proceed. Please '
3456 'checkout another branch and run this command again.' %
3457 current_branch)
3458 return 1
kmarshall9249e012016-08-23 12:02:16 -07003459 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003460 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003461 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003462 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003463 return 1
3464
3465 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003466 if not options.notags:
3467 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003468
3469 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3470 # Clean up the tag if we failed to delete the branch.
3471 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003472
vapiera7fbd5a2016-06-16 09:17:49 -07003473 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003474
3475 return 0
3476
3477
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003478@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003479def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003480 """Show status of changelists.
3481
3482 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003483 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003484 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003485 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003486 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003487 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003488 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003489 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003490
3491 Also see 'git cl comments'.
3492 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003493 parser.add_option(
3494 '--no-branch-color',
3495 action='store_true',
3496 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003497 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003498 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003499 parser.add_option('-f', '--fast', action='store_true',
3500 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003501 parser.add_option(
3502 '-j', '--maxjobs', action='store', type=int,
3503 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003504 parser.add_option(
3505 '-i', '--issue', type=int,
3506 help='Operate on this issue instead of the current branch\'s implicit '
3507 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003508 parser.add_option('-d',
3509 '--date-order',
3510 action='store_true',
3511 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003512 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003513 if args:
3514 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003515
iannuccie53c9352016-08-17 14:40:40 -07003516 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003517 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003518
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003519 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003520 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003521 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003522 if cl.GetIssue():
3523 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003524 elif options.field == 'id':
3525 issueid = cl.GetIssue()
3526 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003528 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003529 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003530 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003531 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003532 elif options.field == 'status':
3533 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003534 elif options.field == 'url':
3535 url = cl.GetIssueURL()
3536 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003537 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003538 return 0
3539
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003540 branches = RunGit([
3541 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3542 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003543 if not branches:
3544 print('No local branch found.')
3545 return 0
3546
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003547 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003548 Changelist(branchref=b, commit_date=ct)
3549 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3550 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003551 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003552 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003553 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003554 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003555
Edward Lemur85153282020-02-14 22:06:29 +00003556 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003557
3558 def FormatBranchName(branch, colorize=False):
3559 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3560 an asterisk when it is the current branch."""
3561
3562 asterisk = ""
3563 color = Fore.RESET
3564 if branch == current_branch:
3565 asterisk = "* "
3566 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003567 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003568
3569 if colorize:
3570 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003571 return asterisk + branch_name
3572
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003573 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003574
3575 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003576 if options.date_order:
3577 sorted_changes = sorted(changes,
3578 key=lambda c: c.GetCommitDate(),
3579 reverse=True)
3580 else:
3581 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3582 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003583 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003584 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003585 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003586 branch_statuses[c.GetBranch()] = status
3587 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003588 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003589 if url and (not status or status == 'error'):
3590 # The issue probably doesn't exist anymore.
3591 url += ' (broken)'
3592
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003593 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003594 # Turn off bold as well as colors.
3595 END = '\033[0m'
3596 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003597 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003598 color = ''
3599 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003600 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003601
Alan Cuttera3be9a52019-03-04 18:50:33 +00003602 branch_display = FormatBranchName(branch)
3603 padding = ' ' * (alignment - len(branch_display))
3604 if not options.no_branch_color:
3605 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003606
Alan Cuttera3be9a52019-03-04 18:50:33 +00003607 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3608 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003609
vapiera7fbd5a2016-06-16 09:17:49 -07003610 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003611 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003612 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003613 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003614 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003615 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003616 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003617 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003618 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003619 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003620 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003621 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003622 return 0
3623
3624
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003625def colorize_CMDstatus_doc():
3626 """To be called once in main() to add colors to git cl status help."""
3627 colors = [i for i in dir(Fore) if i[0].isupper()]
3628
3629 def colorize_line(line):
3630 for color in colors:
3631 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003632 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003633 indent = len(line) - len(line.lstrip(' ')) + 1
3634 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3635 return line
3636
3637 lines = CMDstatus.__doc__.splitlines()
3638 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3639
3640
phajdan.jre328cf92016-08-22 04:12:17 -07003641def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003642 if path == '-':
3643 json.dump(contents, sys.stdout)
3644 else:
3645 with open(path, 'w') as f:
3646 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003647
3648
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003649@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003650@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003651def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003652 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003653
3654 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003655 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003656 parser.add_option('-r', '--reverse', action='store_true',
3657 help='Lookup the branch(es) for the specified issues. If '
3658 'no issues are specified, all branches with mapped '
3659 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003660 parser.add_option('--json',
3661 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003662 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003663
dnj@chromium.org406c4402015-03-03 17:22:28 +00003664 if options.reverse:
3665 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003666 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003667 # Reverse issue lookup.
3668 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003669
3670 git_config = {}
3671 for config in RunGit(['config', '--get-regexp',
3672 r'branch\..*issue']).splitlines():
3673 name, _space, val = config.partition(' ')
3674 git_config[name] = val
3675
dnj@chromium.org406c4402015-03-03 17:22:28 +00003676 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003677 issue = git_config.get(
3678 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003679 if issue:
3680 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003681 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003682 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003683 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003684 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003685 try:
3686 issue_num = int(issue)
3687 except ValueError:
3688 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003689 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003690 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003691 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003692 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003693 if options.json:
3694 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003695 return 0
3696
3697 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003698 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003699 if not issue.valid:
3700 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3701 'or no argument to list it.\n'
3702 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003703 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003704 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003705 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003706 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003707 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3708 if options.json:
3709 write_json(options.json, {
3710 'issue': cl.GetIssue(),
3711 'issue_url': cl.GetIssueURL(),
3712 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003713 return 0
3714
3715
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003716@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003717def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003718 """Shows or posts review comments for any changelist."""
3719 parser.add_option('-a', '--add-comment', dest='comment',
3720 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003721 parser.add_option('-p', '--publish', action='store_true',
3722 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003723 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003724 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003725 parser.add_option('-m', '--machine-readable', dest='readable',
3726 action='store_false', default=True,
3727 help='output comments in a format compatible with '
3728 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003729 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003730 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003731 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003732
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003733 issue = None
3734 if options.issue:
3735 try:
3736 issue = int(options.issue)
3737 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003738 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003739
Edward Lemur934836a2019-09-09 20:16:54 +00003740 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003741
3742 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003743 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003744 return 0
3745
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003746 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3747 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003748 for comment in summary:
3749 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003750 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003751 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003752 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003753 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003754 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003755 elif comment.autogenerated:
3756 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003757 else:
3758 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003759 print('\n%s%s %s%s\n%s' % (
3760 color,
3761 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3762 comment.sender,
3763 Fore.RESET,
3764 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3765
smut@google.comc85ac942015-09-15 16:34:43 +00003766 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003767 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003768 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003769 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3770 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003771 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003772 return 0
3773
3774
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003775@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003776@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003777def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003778 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003779 parser.add_option('-d', '--display', action='store_true',
3780 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003781 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003782 help='New description to set for this issue (- for stdin, '
3783 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003784 parser.add_option('-f', '--force', action='store_true',
3785 help='Delete any unpublished Gerrit edits for this issue '
3786 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003787
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003788 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003789
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003790 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003791 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003792 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003793 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003794 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003795
Edward Lemur934836a2019-09-09 20:16:54 +00003796 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003797 if target_issue_arg:
3798 kwargs['issue'] = target_issue_arg.issue
3799 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003800
3801 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003802 if not cl.GetIssue():
3803 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003804
Edward Lemur678a6842019-10-03 22:25:05 +00003805 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003806 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003807
Edward Lemur6c6827c2020-02-06 21:15:18 +00003808 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003809
smut@google.com34fb6b12015-07-13 20:03:26 +00003810 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003811 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003812 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003813
3814 if options.new_description:
3815 text = options.new_description
3816 if text == '-':
3817 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003818 elif text == '+':
3819 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003820 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003821
3822 description.set_description(text)
3823 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003824 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003825 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003826 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003827 return 0
3828
3829
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003830@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003831def CMDlint(parser, args):
3832 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003833 parser.add_option('--filter', action='append', metavar='-x,+y',
3834 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003835 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003836
3837 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003838 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003839 try:
3840 import cpplint
3841 import cpplint_chromium
3842 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003844 return 1
3845
3846 # Change the current working directory before calling lint so that it
3847 # shows the correct base.
3848 previous_cwd = os.getcwd()
3849 os.chdir(settings.GetRoot())
3850 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003851 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003852 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003853 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003854 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003855 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003856
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003857 # Process cpplint arguments, if any.
3858 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3859 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003860 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003861
Lei Zhang379d1ad2020-07-15 19:40:06 +00003862 include_regex = re.compile(settings.GetLintRegex())
3863 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003864 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3865 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003866 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003868 continue
3869
3870 if ignore_regex.match(filename):
3871 print('Ignoring file %s' % filename)
3872 continue
3873
3874 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3875 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003876 finally:
3877 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003878 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003879 if cpplint._cpplint_state.error_count != 0:
3880 return 1
3881 return 0
3882
3883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003884@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003885def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003886 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003887 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003888 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003889 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003890 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003891 parser.add_option('--all', action='store_true',
3892 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003893 parser.add_option('--parallel', action='store_true',
3894 help='Run all tests specified by input_api.RunTests in all '
3895 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003896 parser.add_option('--resultdb', action='store_true',
3897 help='Run presubmit checks in the ResultSink environment '
3898 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003899 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003900 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003901
sbc@chromium.org71437c02015-04-09 19:29:40 +00003902 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003904 return 1
3905
Edward Lemur934836a2019-09-09 20:16:54 +00003906 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003907 if args:
3908 base_branch = args[0]
3909 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003910 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003911 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003912
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003913 if cl.GetIssue():
3914 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003915 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003916 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003917
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003918 cl.RunHook(
3919 committing=not options.upload,
3920 may_prompt=False,
3921 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003922 parallel=options.parallel,
3923 upstream=base_branch,
3924 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003925 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003926 resultdb=options.resultdb,
3927 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003928 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003929
3930
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003931def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003932 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003933
3934 Works the same way as
3935 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3936 but can be called on demand on all platforms.
3937
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003938 The basic idea is to generate git hash of a state of the tree, original
3939 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003940 """
3941 lines = []
3942 tree_hash = RunGitSilent(['write-tree'])
3943 lines.append('tree %s' % tree_hash.strip())
3944 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3945 if code == 0:
3946 lines.append('parent %s' % parent.strip())
3947 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3948 lines.append('author %s' % author.strip())
3949 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3950 lines.append('committer %s' % committer.strip())
3951 lines.append('')
3952 # Note: Gerrit's commit-hook actually cleans message of some lines and
3953 # whitespace. This code is not doing this, but it clearly won't decrease
3954 # entropy.
3955 lines.append(message)
3956 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003957 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003958 return 'I%s' % change_hash.strip()
3959
3960
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003961def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003962 """Computes the remote branch ref to use for the CL.
3963
3964 Args:
3965 remote (str): The git remote for the CL.
3966 remote_branch (str): The git remote branch for the CL.
3967 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003968 """
3969 if not (remote and remote_branch):
3970 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003971
wittman@chromium.org455dc922015-01-26 20:15:50 +00003972 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003973 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003974 # refs, which are then translated into the remote full symbolic refs
3975 # below.
3976 if '/' not in target_branch:
3977 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3978 else:
3979 prefix_replacements = (
3980 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3981 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3982 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3983 )
3984 match = None
3985 for regex, replacement in prefix_replacements:
3986 match = re.search(regex, target_branch)
3987 if match:
3988 remote_branch = target_branch.replace(match.group(0), replacement)
3989 break
3990 if not match:
3991 # This is a branch path but not one we recognize; use as-is.
3992 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003993 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3994 # Handle the refs that need to land in different refs.
3995 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003996
Josip Sokcevicc39ab992020-09-24 20:09:15 +00003997 # Migration to new default branch, only if available on remote.
3998 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
3999 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4000 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4001 stderr=subprocess2.PIPE):
4002 # TODO(crbug.com/ID): Print location to local git migration script.
4003 print("WARNING: Using new branch name %s instead of %s" % (
4004 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4005 remote_branch = DEFAULT_NEW_BRANCH
4006
wittman@chromium.org455dc922015-01-26 20:15:50 +00004007 # Create the true path to the remote branch.
4008 # Does the following translation:
4009 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004010 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004011 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4012 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4013 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4014 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4015 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4016 'refs/heads/')
4017 elif remote_branch.startswith('refs/remotes/branch-heads'):
4018 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004019
wittman@chromium.org455dc922015-01-26 20:15:50 +00004020 return remote_branch
4021
4022
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004023def cleanup_list(l):
4024 """Fixes a list so that comma separated items are put as individual items.
4025
4026 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4027 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4028 """
4029 items = sum((i.split(',') for i in l), [])
4030 stripped_items = (i.strip() for i in items)
4031 return sorted(filter(None, stripped_items))
4032
4033
Aaron Gable4db38df2017-11-03 14:59:07 -07004034@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004035@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004036def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004037 """Uploads the current changelist to codereview.
4038
4039 Can skip dependency patchset uploads for a branch by running:
4040 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004041 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004042 git config --unset branch.branch_name.skip-deps-uploads
4043 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004044
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004045 If the name of the checked out branch starts with "bug-" or "fix-" followed
4046 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004047 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004048
4049 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004050 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004051 [git-cl] add support for hashtags
4052 Foo bar: implement foo
4053 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004054 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004055 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4056 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004057 parser.add_option('--bypass-watchlists', action='store_true',
4058 dest='bypass_watchlists',
4059 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004060 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004061 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004062 parser.add_option('--message', '-m', dest='message',
4063 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004064 parser.add_option('-b', '--bug',
4065 help='pre-populate the bug number(s) for this issue. '
4066 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004067 parser.add_option('--message-file', dest='message_file',
4068 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004069 parser.add_option('--title', '-t', dest='title',
4070 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004071 parser.add_option('-T', '--skip-title', action='store_true',
4072 dest='skip_title',
4073 help='Use the most recent commit message as the title of '
4074 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004075 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004076 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004077 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004078 parser.add_option('--tbrs',
4079 action='append', default=[],
4080 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004081 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004082 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004083 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004084 parser.add_option('--hashtag', dest='hashtags',
4085 action='append', default=[],
4086 help=('Gerrit hashtag for new CL; '
4087 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004088 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004089 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004090 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004091 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004092 metavar='TARGET',
4093 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004094 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004095 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004096 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004097 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004098 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004099 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004100 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004101 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4102 const='TBR', help='add a set of OWNERS to TBR')
4103 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4104 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004105 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004106 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004107 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004108 'implies --send-mail')
4109 parser.add_option('-d', '--cq-dry-run',
4110 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004111 help='Send the patchset to do a CQ dry run right after '
4112 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004113 parser.add_option('--preserve-tryjobs', action='store_true',
4114 help='instruct the CQ to let tryjobs running even after '
4115 'new patchsets are uploaded instead of canceling '
4116 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004117 parser.add_option('--dependencies', action='store_true',
4118 help='Uploads CLs of all the local branches that depend on '
4119 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004120 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4121 help='Sends your change to the CQ after an approval. Only '
4122 'works on repos that have the Auto-Submit label '
4123 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004124 parser.add_option('--parallel', action='store_true',
4125 help='Run all tests specified by input_api.RunTests in all '
4126 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004127 parser.add_option('--no-autocc', action='store_true',
4128 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004129 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004130 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004131 parser.add_option('-R', '--retry-failed', action='store_true',
4132 help='Retry failed tryjobs from old patchset immediately '
4133 'after uploading new patchset. Cannot be used with '
4134 '--use-commit-queue or --cq-dry-run.')
4135 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4136 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004137 parser.add_option('--fixed', '-x',
4138 help='List of bugs that will be commented on and marked '
4139 'fixed (pre-populates "Fixed:" tag). Same format as '
4140 '-b option / "Bug:" tag. If fixing several issues, '
4141 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004142 parser.add_option('--edit-description', action='store_true', default=False,
4143 help='Modify description before upload. Cannot be used '
4144 'with --force. It is a noop when --no-squash is set '
4145 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004146 parser.add_option('--git-completion-helper', action="store_true",
4147 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004148 parser.add_option('--resultdb', action='store_true',
4149 help='Run presubmit checks in the ResultSink environment '
4150 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004151 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004152
rmistry@google.com2dd99862015-06-22 12:22:18 +00004153 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004154 (options, args) = parser.parse_args(args)
4155
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004156 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004157 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4158 if opt.help != optparse.SUPPRESS_HELP))
4159 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004160
sbc@chromium.org71437c02015-04-09 19:29:40 +00004161 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004162 return 1
4163
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004164 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004165 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004166 options.cc = cleanup_list(options.cc)
4167
Josipe827b0f2020-01-30 00:07:20 +00004168 if options.edit_description and options.force:
4169 parser.error('Only one of --force and --edit-description allowed')
4170
tandriib80458a2016-06-23 12:20:07 -07004171 if options.message_file:
4172 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004173 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004174 options.message = gclient_utils.FileRead(options.message_file)
4175 options.message_file = None
4176
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004177 if ([options.cq_dry_run,
4178 options.use_commit_queue,
4179 options.retry_failed].count(True) > 1):
4180 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4181 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004182
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004183 if options.skip_title and options.title:
4184 parser.error('Only one of --title and --skip-title allowed.')
4185
Aaron Gableedbc4132017-09-11 13:22:28 -07004186 if options.use_commit_queue:
4187 options.send_mail = True
4188
Edward Lesmes0dd54822020-03-26 18:24:25 +00004189 if options.squash is None:
4190 # Load default for user, repo, squash=true, in this order.
4191 options.squash = settings.GetSquashGerritUploads()
4192
Edward Lemur934836a2019-09-09 20:16:54 +00004193 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004194 # Warm change details cache now to avoid RPCs later, reducing latency for
4195 # developers.
4196 if cl.GetIssue():
4197 cl._GetChangeDetail(
4198 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4199
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004200 if options.retry_failed and not cl.GetIssue():
4201 print('No previous patchsets, so --retry-failed has no effect.')
4202 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004203
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004204 # cl.GetMostRecentPatchset uses cached information, and can return the last
4205 # patchset before upload. Calling it here makes it clear that it's the
4206 # last patchset before upload. Note that GetMostRecentPatchset will fail
4207 # if no CL has been uploaded yet.
4208 if options.retry_failed:
4209 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004210
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004211 ret = cl.CMDUpload(options, args, orig_args)
4212
4213 if options.retry_failed:
4214 if ret != 0:
4215 print('Upload failed, so --retry-failed has no effect.')
4216 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004217 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004218 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004219 jobs = _filter_failed_for_retry(builds)
4220 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004221 print('No failed tryjobs, so --retry-failed has no effect.')
4222 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004223 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004224
4225 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004226
4227
Francois Dorayd42c6812017-05-30 15:10:20 -04004228@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004229@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004230def CMDsplit(parser, args):
4231 """Splits a branch into smaller branches and uploads CLs.
4232
4233 Creates a branch and uploads a CL for each group of files modified in the
4234 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004235 comment, the string '$directory', is replaced with the directory containing
4236 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004237 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004238 parser.add_option('-d', '--description', dest='description_file',
4239 help='A text file containing a CL description in which '
4240 '$directory will be replaced by each CL\'s directory.')
4241 parser.add_option('-c', '--comment', dest='comment_file',
4242 help='A text file containing a CL comment.')
4243 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004244 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004245 help='List the files and reviewers for each CL that would '
4246 'be created, but don\'t create branches or CLs.')
4247 parser.add_option('--cq-dry-run', action='store_true',
4248 help='If set, will do a cq dry run for each uploaded CL. '
4249 'Please be careful when doing this; more than ~10 CLs '
4250 'has the potential to overload our build '
4251 'infrastructure. Try to upload these not during high '
4252 'load times (usually 11-3 Mountain View time). Email '
4253 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004254 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4255 default=True,
4256 help='Sends your change to the CQ after an approval. Only '
4257 'works on repos that have the Auto-Submit label '
4258 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004259 options, _ = parser.parse_args(args)
4260
4261 if not options.description_file:
4262 parser.error('No --description flag specified.')
4263
4264 def WrappedCMDupload(args):
4265 return CMDupload(OptionParser(), args)
4266
Edward Lemur2c62b332020-03-12 22:12:33 +00004267 return split_cl.SplitCl(
4268 options.description_file, options.comment_file, Changelist,
4269 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4270 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004271
4272
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004273@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004274@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004275def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004276 """DEPRECATED: Used to commit the current changelist via git-svn."""
4277 message = ('git-cl no longer supports committing to SVN repositories via '
4278 'git-svn. You probably want to use `git cl land` instead.')
4279 print(message)
4280 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004281
4282
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004283@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004284@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004285def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004286 """Commits the current changelist via git.
4287
4288 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4289 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004290 """
4291 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4292 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004293 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004294 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004295 parser.add_option('--parallel', action='store_true',
4296 help='Run all tests specified by input_api.RunTests in all '
4297 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004298 parser.add_option('--resultdb', action='store_true',
4299 help='Run presubmit checks in the ResultSink environment '
4300 'and send results to the ResultDB database.')
4301 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004302 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004303
Edward Lemur934836a2019-09-09 20:16:54 +00004304 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004305
Robert Iannucci2e73d432018-03-14 01:10:47 -07004306 if not cl.GetIssue():
4307 DieWithError('You must upload the change first to Gerrit.\n'
4308 ' If you would rather have `git cl land` upload '
4309 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004310 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4311 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004312
4313
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004314@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004315@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004316def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004317 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004318 parser.add_option('-b', dest='newbranch',
4319 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004320 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004321 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004322 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004323 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004324
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004325 group = optparse.OptionGroup(
4326 parser,
4327 'Options for continuing work on the current issue uploaded from a '
4328 'different clone (e.g. different machine). Must be used independently '
4329 'from the other options. No issue number should be specified, and the '
4330 'branch must have an issue number associated with it')
4331 group.add_option('--reapply', action='store_true', dest='reapply',
4332 help='Reset the branch and reapply the issue.\n'
4333 'CAUTION: This will undo any local changes in this '
4334 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004335
4336 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004337 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004338 parser.add_option_group(group)
4339
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004340 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004341
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004342 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004343 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004344 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004345 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004346 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004347
Edward Lemur934836a2019-09-09 20:16:54 +00004348 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004349 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004350 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004351
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004352 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004353 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004354 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004355
4356 RunGit(['reset', '--hard', upstream])
4357 if options.pull:
4358 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004359
Edward Lemur678a6842019-10-03 22:25:05 +00004360 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4361 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004362
4363 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004364 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004365
Edward Lemurf38bc172019-09-03 21:02:13 +00004366 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004367 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004368 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004369
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004370 # We don't want uncommitted changes mixed up with the patch.
4371 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004372 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004373
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004374 if options.newbranch:
4375 if options.force:
4376 RunGit(['branch', '-D', options.newbranch],
4377 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004378 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004379
Edward Lemur678a6842019-10-03 22:25:05 +00004380 cl = Changelist(
4381 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004382
Edward Lemur678a6842019-10-03 22:25:05 +00004383 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004384 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004385
Edward Lemurf38bc172019-09-03 21:02:13 +00004386 return cl.CMDPatchWithParsedIssue(
4387 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004388
4389
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004390def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004391 """Fetches the tree status and returns either 'open', 'closed',
4392 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004393 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004394 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004395 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004396 if status.find('closed') != -1 or status == '0':
4397 return 'closed'
4398 elif status.find('open') != -1 or status == '1':
4399 return 'open'
4400 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004401 return 'unset'
4402
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004403
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004404def GetTreeStatusReason():
4405 """Fetches the tree status from a json url and returns the message
4406 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004407 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004408 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004409 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004410 status = json.loads(connection.read())
4411 connection.close()
4412 return status['message']
4413
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004414
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004415@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004416def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004417 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004418 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004419 status = GetTreeStatus()
4420 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004421 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004422 return 2
4423
vapiera7fbd5a2016-06-16 09:17:49 -07004424 print('The tree is %s' % status)
4425 print()
4426 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427 if status != 'open':
4428 return 1
4429 return 0
4430
4431
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004432@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004433def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004434 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4435 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004436 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004437 '-b', '--bot', action='append',
4438 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4439 'times to specify multiple builders. ex: '
4440 '"-b win_rel -b win_layout". See '
4441 'the try server waterfall for the builders name and the tests '
4442 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004443 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004444 '-B', '--bucket', default='',
4445 help=('Buildbucket bucket to send the try requests.'))
4446 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004447 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004448 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004449 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004450 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004451 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004452 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004453 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004454 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004455 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004456 '--category', default='git_cl_try', help='Specify custom build category.')
4457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004458 '--project',
4459 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004460 'in recipe to determine to which repository or directory to '
4461 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004462 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004463 '-p', '--property', dest='properties', action='append', default=[],
4464 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004465 'key2=value2 etc. The value will be treated as '
4466 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004467 'NOTE: using this may make your tryjob not usable for CQ, '
4468 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004469 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004470 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4471 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004472 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004473 parser.add_option(
4474 '-R', '--retry-failed', action='store_true', default=False,
4475 help='Retry failed jobs from the latest set of tryjobs. '
4476 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004477 parser.add_option(
4478 '-i', '--issue', type=int,
4479 help='Operate on this issue instead of the current branch\'s implicit '
4480 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004481 options, args = parser.parse_args(args)
4482
machenbach@chromium.org45453142015-09-15 08:45:22 +00004483 # Make sure that all properties are prop=value pairs.
4484 bad_params = [x for x in options.properties if '=' not in x]
4485 if bad_params:
4486 parser.error('Got properties with missing "=": %s' % bad_params)
4487
maruel@chromium.org15192402012-09-06 12:38:29 +00004488 if args:
4489 parser.error('Unknown arguments: %s' % args)
4490
Edward Lemur934836a2019-09-09 20:16:54 +00004491 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004492 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004493 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004494
Edward Lemurf38bc172019-09-03 21:02:13 +00004495 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004496 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004497
tandriie113dfd2016-10-11 10:20:12 -07004498 error_message = cl.CannotTriggerTryJobReason()
4499 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004500 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004501
Edward Lemur45768512020-03-02 19:03:14 +00004502 if options.bot:
4503 if options.retry_failed:
4504 parser.error('--bot is not compatible with --retry-failed.')
4505 if not options.bucket:
4506 parser.error('A bucket (e.g. "chromium/try") is required.')
4507
4508 triggered = [b for b in options.bot if 'triggered' in b]
4509 if triggered:
4510 parser.error(
4511 'Cannot schedule builds on triggered bots: %s.\n'
4512 'This type of bot requires an initial job from a parent (usually a '
4513 'builder). Schedule a job on the parent instead.\n' % triggered)
4514
4515 if options.bucket.startswith('.master'):
4516 parser.error('Buildbot masters are not supported.')
4517
4518 project, bucket = _parse_bucket(options.bucket)
4519 if project is None or bucket is None:
4520 parser.error('Invalid bucket: %s.' % options.bucket)
4521 jobs = sorted((project, bucket, bot) for bot in options.bot)
4522 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004523 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004524 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004525 if options.verbose:
4526 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004527 jobs = _filter_failed_for_retry(builds)
4528 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004529 print('There are no failed jobs in the latest set of jobs '
4530 '(patchset #%d), doing nothing.' % patchset)
4531 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004532 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004533 if num_builders > 10:
4534 confirm_or_exit('There are %d builders with failed builds.'
4535 % num_builders, action='continue')
4536 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004537 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004538 print('git cl try with no bots now defaults to CQ dry run.')
4539 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4540 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004541
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004542 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004543 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004544 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004545 except BuildbucketResponseException as ex:
4546 print('ERROR: %s' % ex)
4547 return 1
4548 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004549
4550
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004551@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004552def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004553 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004554 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004555 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004556 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004557 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004558 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004559 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004560 '--color', action='store_true', default=setup_color.IS_TTY,
4561 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004562 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004563 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4564 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004565 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004566 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004567 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004568 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004569 parser.add_option(
4570 '-i', '--issue', type=int,
4571 help='Operate on this issue instead of the current branch\'s implicit '
4572 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004573 options, args = parser.parse_args(args)
4574 if args:
4575 parser.error('Unrecognized args: %s' % ' '.join(args))
4576
Edward Lemur934836a2019-09-09 20:16:54 +00004577 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004578 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004580
tandrii221ab252016-10-06 08:12:04 -07004581 patchset = options.patchset
4582 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004583 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004584 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004585 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004586 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004587 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004588 cl.GetIssue())
4589
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004590 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004591 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004592 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004593 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004594 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004595 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004596 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004597 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004598 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004599 return 0
4600
4601
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004602@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004603@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004605 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004606 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004607 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004608 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004609
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004611 if args:
4612 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004613 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004614 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004615 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004616 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004617
4618 # Clear configured merge-base, if there is one.
4619 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004620 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004621 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004622 return 0
4623
4624
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004625@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004626def CMDweb(parser, args):
4627 """Opens the current CL in the web browser."""
4628 _, args = parser.parse_args(args)
4629 if args:
4630 parser.error('Unrecognized args: %s' % ' '.join(args))
4631
4632 issue_url = Changelist().GetIssueURL()
4633 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004634 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004635 return 1
4636
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004637 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004638 # allows us to hide the "Created new window in existing browser session."
4639 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004640 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004641 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004642 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004643 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004644 os.open(os.devnull, os.O_RDWR)
4645 try:
4646 webbrowser.open(issue_url)
4647 finally:
4648 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004649 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004650 return 0
4651
4652
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004653@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004654def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004655 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004656 parser.add_option('-d', '--dry-run', action='store_true',
4657 help='trigger in dry run mode')
4658 parser.add_option('-c', '--clear', action='store_true',
4659 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004660 parser.add_option(
4661 '-i', '--issue', type=int,
4662 help='Operate on this issue instead of the current branch\'s implicit '
4663 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004664 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004665 if args:
4666 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004667 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004668 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004669
Edward Lemur934836a2019-09-09 20:16:54 +00004670 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004671 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004672 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004673 elif options.dry_run:
4674 state = _CQState.DRY_RUN
4675 else:
4676 state = _CQState.COMMIT
4677 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004678 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004679 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004680 return 0
4681
4682
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004683@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004684def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004685 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004686 parser.add_option(
4687 '-i', '--issue', type=int,
4688 help='Operate on this issue instead of the current branch\'s implicit '
4689 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004690 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004691 if args:
4692 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004693 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004694 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004695 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004696 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004697 cl.CloseIssue()
4698 return 0
4699
4700
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004701@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004702def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004703 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004704 parser.add_option(
4705 '--stat',
4706 action='store_true',
4707 dest='stat',
4708 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004709 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004710 if args:
4711 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004712
Edward Lemur934836a2019-09-09 20:16:54 +00004713 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004714 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004715 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004716 if not issue:
4717 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004718
Aaron Gablea718c3e2017-08-28 17:47:28 -07004719 base = cl._GitGetBranchConfigValue('last-upload-hash')
4720 if not base:
4721 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4722 if not base:
4723 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4724 revision_info = detail['revisions'][detail['current_revision']]
4725 fetch_info = revision_info['fetch']['http']
4726 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4727 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004728
Aaron Gablea718c3e2017-08-28 17:47:28 -07004729 cmd = ['git', 'diff']
4730 if options.stat:
4731 cmd.append('--stat')
4732 cmd.append(base)
4733 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004734
4735 return 0
4736
4737
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004738@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004739def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004740 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004741 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004742 '--ignore-current',
4743 action='store_true',
4744 help='Ignore the CL\'s current reviewers and start from scratch.')
4745 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004746 '--ignore-self',
4747 action='store_true',
4748 help='Do not consider CL\'s author as an owners.')
4749 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004750 '--no-color',
4751 action='store_true',
4752 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004753 parser.add_option(
4754 '--batch',
4755 action='store_true',
4756 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004757 # TODO: Consider moving this to another command, since other
4758 # git-cl owners commands deal with owners for a given CL.
4759 parser.add_option(
4760 '--show-all',
4761 action='store_true',
4762 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004763 options, args = parser.parse_args(args)
4764
Edward Lemur934836a2019-09-09 20:16:54 +00004765 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004766 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004767
Yang Guo6e269a02019-06-26 11:17:02 +00004768 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004769 if len(args) == 0:
4770 print('No files specified for --show-all. Nothing to do.')
4771 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004772 for arg in args:
4773 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004774 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004775 database.load_data_needed_for([arg])
4776 print('Owners for %s:' % arg)
4777 for owner in sorted(database.all_possible_owners([arg], None)):
4778 print(' - %s' % owner)
4779 return 0
4780
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004781 if args:
4782 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004783 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004784 base_branch = args[0]
4785 else:
4786 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004787 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004788
Edward Lemur2c62b332020-03-12 22:12:33 +00004789 root = settings.GetRoot()
4790 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004791
4792 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004793 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004794 print('\n'.join(db.reviewers_for(affected_files, author)))
4795 return 0
4796
Edward Lemur2c62b332020-03-12 22:12:33 +00004797 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4798 original_owner_files = {
4799 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4800 for f in owner_files}
4801
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004802 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004803 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004804 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004805 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004806 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004807 fopen=open,
4808 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004809 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004810 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004811 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004812
4813
Aiden Bennerc08566e2018-10-03 17:52:42 +00004814def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004815 """Generates a diff command."""
4816 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004817 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4818
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004819 if allow_prefix:
4820 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4821 # case that diff.noprefix is set in the user's git config.
4822 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4823 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004824 diff_cmd += ['--no-prefix']
4825
4826 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004827
4828 if args:
4829 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004830 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004831 diff_cmd.append(arg)
4832 else:
4833 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004834
4835 return diff_cmd
4836
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004837
Jamie Madill5e96ad12020-01-13 16:08:35 +00004838def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4839 """Runs clang-format-diff and sets a return value if necessary."""
4840
4841 if not clang_diff_files:
4842 return 0
4843
4844 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4845 # formatted. This is used to block during the presubmit.
4846 return_value = 0
4847
4848 # Locate the clang-format binary in the checkout
4849 try:
4850 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4851 except clang_format.NotFoundError as e:
4852 DieWithError(e)
4853
4854 if opts.full or settings.GetFormatFullByDefault():
4855 cmd = [clang_format_tool]
4856 if not opts.dry_run and not opts.diff:
4857 cmd.append('-i')
4858 if opts.dry_run:
4859 for diff_file in clang_diff_files:
4860 with open(diff_file, 'r') as myfile:
4861 code = myfile.read().replace('\r\n', '\n')
4862 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4863 stdout = stdout.replace('\r\n', '\n')
4864 if opts.diff:
4865 sys.stdout.write(stdout)
4866 if code != stdout:
4867 return_value = 2
4868 else:
4869 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4870 if opts.diff:
4871 sys.stdout.write(stdout)
4872 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004873 try:
4874 script = clang_format.FindClangFormatScriptInChromiumTree(
4875 'clang-format-diff.py')
4876 except clang_format.NotFoundError as e:
4877 DieWithError(e)
4878
Edward Lesmes89624cd2020-04-06 17:51:56 +00004879 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004880 if not opts.dry_run and not opts.diff:
4881 cmd.append('-i')
4882
4883 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004884 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004885
Edward Lesmes89624cd2020-04-06 17:51:56 +00004886 env = os.environ.copy()
4887 env['PATH'] = (
4888 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4889 stdout = RunCommand(
4890 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004891 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004892 if opts.diff:
4893 sys.stdout.write(stdout)
4894 if opts.dry_run and len(stdout) > 0:
4895 return_value = 2
4896
4897 return return_value
4898
4899
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004900def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004901 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004902 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004903
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004904
enne@chromium.org555cfe42014-01-29 18:21:39 +00004905@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004906@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004907def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004908 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004909 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004910 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004911 parser.add_option('--full', action='store_true',
4912 help='Reformat the full content of all touched files')
4913 parser.add_option('--dry-run', action='store_true',
4914 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004915 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004916 '--no-clang-format',
4917 dest='clang_format',
4918 action='store_false',
4919 default=True,
4920 help='Disables formatting of various file types using clang-format.')
4921 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004922 '--python',
4923 action='store_true',
4924 default=None,
4925 help='Enables python formatting on all python files.')
4926 parser.add_option(
4927 '--no-python',
4928 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004929 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004930 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004931 'If neither --python or --no-python are set, python files that have a '
4932 '.style.yapf file in an ancestor directory will be formatted. '
4933 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004934 parser.add_option(
4935 '--js',
4936 action='store_true',
4937 help='Format javascript code with clang-format. '
4938 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004939 parser.add_option('--diff', action='store_true',
4940 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004941 parser.add_option('--presubmit', action='store_true',
4942 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004943 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004944
Garrett Beaty91a6f332020-01-06 16:57:24 +00004945 if opts.python is not None and opts.no_python:
4946 raise parser.error('Cannot set both --python and --no-python')
4947 if opts.no_python:
4948 opts.python = False
4949
Daniel Chengc55eecf2016-12-30 03:11:02 -08004950 # Normalize any remaining args against the current path, so paths relative to
4951 # the current directory are still resolved as expected.
4952 args = [os.path.join(os.getcwd(), arg) for arg in args]
4953
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004954 # git diff generates paths against the root of the repository. Change
4955 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004956 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004957 if rel_base_path:
4958 os.chdir(rel_base_path)
4959
digit@chromium.org29e47272013-05-17 17:01:46 +00004960 # Grab the merge-base commit, i.e. the upstream commit of the current
4961 # branch when it was created or the last time it was rebased. This is
4962 # to cover the case where the user may have called "git fetch origin",
4963 # moving the origin branch to a newer commit, but hasn't rebased yet.
4964 upstream_commit = None
4965 cl = Changelist()
4966 upstream_branch = cl.GetUpstreamBranch()
4967 if upstream_branch:
4968 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4969 upstream_commit = upstream_commit.strip()
4970
4971 if not upstream_commit:
4972 DieWithError('Could not find base commit for this branch. '
4973 'Are you in detached state?')
4974
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004975 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4976 diff_output = RunGit(changed_files_cmd)
4977 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004978 # Filter out files deleted by this CL
4979 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004980
Andreas Haas417d89c2020-02-06 10:24:27 +00004981 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004982 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004983
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004984 clang_diff_files = []
4985 if opts.clang_format:
4986 clang_diff_files = [
4987 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4988 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004989 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004990 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004991
Edward Lesmes50da7702020-03-30 19:23:43 +00004992 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004993
Jamie Madill5e96ad12020-01-13 16:08:35 +00004994 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4995 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004996
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004997 # Similar code to above, but using yapf on .py files rather than clang-format
4998 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004999 py_explicitly_disabled = opts.python is not None and not opts.python
5000 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005001 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5002 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005003
Aiden Bennerc08566e2018-10-03 17:52:42 +00005004 # Used for caching.
5005 yapf_configs = {}
5006 for f in python_diff_files:
5007 # Find the yapf style config for the current file, defaults to depot
5008 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005009 _FindYapfConfigFile(f, yapf_configs, top_dir)
5010
5011 # Turn on python formatting by default if a yapf config is specified.
5012 # This breaks in the case of this repo though since the specified
5013 # style file is also the global default.
5014 if opts.python is None:
5015 filtered_py_files = []
5016 for f in python_diff_files:
5017 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5018 filtered_py_files.append(f)
5019 else:
5020 filtered_py_files = python_diff_files
5021
5022 # Note: yapf still seems to fix indentation of the entire file
5023 # even if line ranges are specified.
5024 # See https://github.com/google/yapf/issues/499
5025 if not opts.full and filtered_py_files:
5026 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5027
Brian Sheedyb4307d52019-12-02 19:18:17 +00005028 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5029 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5030 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005031
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005032 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005033 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5034 # Default to pep8 if not .style.yapf is found.
5035 if not yapf_style:
5036 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005037
Peter Wend9399922020-06-17 17:33:49 +00005038 with open(f, 'r') as py_f:
5039 if 'python3' in py_f.readline():
5040 vpython_script = 'vpython3'
5041 else:
5042 vpython_script = 'vpython'
5043
5044 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005045
5046 has_formattable_lines = False
5047 if not opts.full:
5048 # Only run yapf over changed line ranges.
5049 for diff_start, diff_len in py_line_diffs[f]:
5050 diff_end = diff_start + diff_len - 1
5051 # Yapf errors out if diff_end < diff_start but this
5052 # is a valid line range diff for a removal.
5053 if diff_end >= diff_start:
5054 has_formattable_lines = True
5055 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5056 # If all line diffs were removals we have nothing to format.
5057 if not has_formattable_lines:
5058 continue
5059
5060 if opts.diff or opts.dry_run:
5061 cmd += ['--diff']
5062 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005063 stdout = RunCommand(cmd,
5064 error_ok=True,
5065 cwd=top_dir,
5066 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005067 if opts.diff:
5068 sys.stdout.write(stdout)
5069 elif len(stdout) > 0:
5070 return_value = 2
5071 else:
5072 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005073 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005074
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005075 # Format GN build files. Always run on full build files for canonical form.
5076 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005077 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005078 if opts.dry_run or opts.diff:
5079 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005080 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005081 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005082 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005083 cwd=top_dir)
5084 if opts.dry_run and gn_ret == 2:
5085 return_value = 2 # Not formatted.
5086 elif opts.diff and gn_ret == 2:
5087 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005088 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005089 elif gn_ret != 0:
5090 # For non-dry run cases (and non-2 return values for dry-run), a
5091 # nonzero error code indicates a failure, probably because the file
5092 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005093 DieWithError('gn format failed on ' + gn_diff_file +
5094 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005095
Ilya Shermane081cbe2017-08-15 17:51:04 -07005096 # Skip the metrics formatting from the global presubmit hook. These files have
5097 # a separate presubmit hook that issues an error if the files need formatting,
5098 # whereas the top-level presubmit script merely issues a warning. Formatting
5099 # these files is somewhat slow, so it's important not to duplicate the work.
5100 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005101 for diff_xml in GetDiffXMLs(diff_files):
5102 xml_dir = GetMetricsDir(diff_xml)
5103 if not xml_dir:
5104 continue
5105
Ilya Shermane081cbe2017-08-15 17:51:04 -07005106 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005107 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5108 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005109
5110 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5111 # command as histograms/pretty_print.py now needs a relative path argument
5112 # after splitting the histograms into multiple directories.
5113 # For example, in tools/metrics/ukm, pretty-print could be run using:
5114 # $ python pretty_print.py
5115 # But in tools/metrics/histogrmas, pretty-print should be run with an
5116 # additional relative path argument, like:
5117 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5118 # $ python pretty_print.py enums.xml
5119
5120 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5121 # version of histograms/pretty_print.py is released.
5122 filepath_required = os.path.exists(
5123 os.path.join(tool_dir, 'validate_prefix.py'))
5124
Weilun Shib92c4b72020-08-27 17:45:11 +00005125 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5126 or diff_xml.endswith('histogram_suffixes_list.xml')
5127 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005128 cmd.append(diff_xml)
5129
Ilya Shermane081cbe2017-08-15 17:51:04 -07005130 if opts.dry_run or opts.diff:
5131 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005132
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005133 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5134 # `shell` param and instead replace `'vpython'` with
5135 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005136 stdout = RunCommand(cmd,
5137 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005138 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005139 if opts.diff:
5140 sys.stdout.write(stdout)
5141 if opts.dry_run and stdout:
5142 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005143
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005144 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005145
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005146
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005147def GetDiffXMLs(diff_files):
5148 return [
5149 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5150 ]
5151
5152
5153def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005154 metrics_xml_dirs = [
5155 os.path.join('tools', 'metrics', 'actions'),
5156 os.path.join('tools', 'metrics', 'histograms'),
5157 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005158 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005159 os.path.join('tools', 'metrics', 'ukm'),
5160 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005161 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005162 if diff_xml.startswith(xml_dir):
5163 return xml_dir
5164 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005165
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005166
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005167@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005168@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005169def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005170 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005171 _, args = parser.parse_args(args)
5172
5173 if len(args) != 1:
5174 parser.print_help()
5175 return 1
5176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005177 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005178 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005179 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005180
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005181 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005182
Edward Lemur52969c92020-02-06 18:15:28 +00005183 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005184 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005185 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005186
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005187 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005188 for key, issue in [x.split() for x in output.splitlines()]:
5189 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005190 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005191
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005192 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005193 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005194 return 1
5195 if len(branches) == 1:
5196 RunGit(['checkout', branches[0]])
5197 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005198 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005199 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005200 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005201 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005202 try:
5203 RunGit(['checkout', branches[int(which)]])
5204 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005205 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005206 return 1
5207
5208 return 0
5209
5210
maruel@chromium.org29404b52014-09-08 22:58:00 +00005211def CMDlol(parser, args):
5212 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005213 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005214 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5215 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5216 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005217 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005218 return 0
5219
5220
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005221class OptionParser(optparse.OptionParser):
5222 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005223
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005224 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005225 optparse.OptionParser.__init__(
5226 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005227 self.add_option(
5228 '-v', '--verbose', action='count', default=0,
5229 help='Use 2 times for more debugging info')
5230
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005231 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005232 try:
5233 return self._parse_args(args)
5234 finally:
5235 # Regardless of success or failure of args parsing, we want to report
5236 # metrics, but only after logging has been initialized (if parsing
5237 # succeeded).
5238 global settings
5239 settings = Settings()
5240
5241 if not metrics.DISABLE_METRICS_COLLECTION:
5242 # GetViewVCUrl ultimately calls logging method.
5243 project_url = settings.GetViewVCUrl().strip('/+')
5244 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5245 metrics.collector.add('project_urls', [project_url])
5246
5247 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005248 # Create an optparse.Values object that will store only the actual passed
5249 # options, without the defaults.
5250 actual_options = optparse.Values()
5251 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5252 # Create an optparse.Values object with the default options.
5253 options = optparse.Values(self.get_default_values().__dict__)
5254 # Update it with the options passed by the user.
5255 options._update_careful(actual_options.__dict__)
5256 # Store the options passed by the user in an _actual_options attribute.
5257 # We store only the keys, and not the values, since the values can contain
5258 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005259 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005260
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005261 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005262 logging.basicConfig(
5263 level=levels[min(options.verbose, len(levels) - 1)],
5264 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5265 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005266
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005267 return options, args
5268
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005269
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005270def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005271 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005272 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005273 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005274 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005275
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005276 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005277 dispatcher = subcommand.CommandDispatcher(__name__)
5278 try:
5279 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005280 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005281 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005282 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005283 if e.code != 500:
5284 raise
5285 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005286 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005287 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005288 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289
5290
5291if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005292 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5293 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005294 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005295 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005296 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005297 sys.exit(main(sys.argv[1:]))