blob: cec411881232a75dfef4399f44d6cfc7e6b20200 [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 Schneider9ca89ac2020-11-11 09:03:57 +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 Schneider9ca89ac2020-11-11 09:03:57 +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 Schneider9ca89ac2020-11-11 09:03:57 +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
Aaron Gable636b13f2017-07-14 10:42:48 -07001734 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001735 gerrit_util.SetReview(
1736 self._GetGerritHost(), self._GerritChangeIdentifier(),
1737 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001738
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001739 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001740 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001741 # CURRENT_REVISION is included to get the latest patchset so that
1742 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001743 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001744 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1745 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001746 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001747 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001748 robot_file_comments = gerrit_util.GetChangeRobotComments(
1749 self._GetGerritHost(), self._GerritChangeIdentifier())
1750
1751 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001752 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001753 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001754 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001755 line_comments = file_comments.setdefault(path, [])
1756 line_comments.extend(
1757 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001758
1759 # Build dictionary of file comments for easy access and sorting later.
1760 # {author+date: {path: {patchset: {line: url+message}}}}
1761 comments = collections.defaultdict(
1762 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001763 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001764 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001765 tag = comment.get('tag', '')
1766 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001767 continue
1768 key = (comment['author']['email'], comment['updated'])
1769 if comment.get('side', 'REVISION') == 'PARENT':
1770 patchset = 'Base'
1771 else:
1772 patchset = 'PS%d' % comment['patch_set']
1773 line = comment.get('line', 0)
1774 url = ('https://%s/c/%s/%s/%s#%s%s' %
1775 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1776 'b' if comment.get('side') == 'PARENT' else '',
1777 str(line) if line else ''))
1778 comments[key][path][patchset][line] = (url, comment['message'])
1779
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001780 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001781 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001782 summary = self._BuildCommentSummary(msg, comments, readable)
1783 if summary:
1784 summaries.append(summary)
1785 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001786
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001787 @staticmethod
1788 def _BuildCommentSummary(msg, comments, readable):
1789 key = (msg['author']['email'], msg['date'])
1790 # Don't bother showing autogenerated messages that don't have associated
1791 # file or line comments. this will filter out most autogenerated
1792 # messages, but will keep robot comments like those from Tricium.
1793 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1794 if is_autogenerated and not comments.get(key):
1795 return None
1796 message = msg['message']
1797 # Gerrit spits out nanoseconds.
1798 assert len(msg['date'].split('.')[-1]) == 9
1799 date = datetime.datetime.strptime(msg['date'][:-3],
1800 '%Y-%m-%d %H:%M:%S.%f')
1801 if key in comments:
1802 message += '\n'
1803 for path, patchsets in sorted(comments.get(key, {}).items()):
1804 if readable:
1805 message += '\n%s' % path
1806 for patchset, lines in sorted(patchsets.items()):
1807 for line, (url, content) in sorted(lines.items()):
1808 if line:
1809 line_str = 'Line %d' % line
1810 path_str = '%s:%d:' % (path, line)
1811 else:
1812 line_str = 'File comment'
1813 path_str = '%s:0:' % path
1814 if readable:
1815 message += '\n %s, %s: %s' % (patchset, line_str, url)
1816 message += '\n %s\n' % content
1817 else:
1818 message += '\n%s ' % path_str
1819 message += '\n%s\n' % content
1820
1821 return _CommentSummary(
1822 date=date,
1823 message=message,
1824 sender=msg['author']['email'],
1825 autogenerated=is_autogenerated,
1826 # These could be inferred from the text messages and correlated with
1827 # Code-Review label maximum, however this is not reliable.
1828 # Leaving as is until the need arises.
1829 approval=False,
1830 disapproval=False,
1831 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001832
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001834 gerrit_util.AbandonChange(
1835 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001837 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001838 gerrit_util.SubmitChange(
1839 self._GetGerritHost(), self._GerritChangeIdentifier(),
1840 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001841
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001842 def _GetChangeDetail(self, options=None):
1843 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001844 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001845 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001846
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001847 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001848 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001849 options.append('CURRENT_COMMIT')
1850
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001851 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001852 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001853 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001854
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001855 for cached_options_set, data in self._detail_cache.get(cache_key, []):
1856 # Assumption: data fetched before with extra options is suitable
1857 # for return for a smaller set of options.
1858 # For example, if we cached data for
1859 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
1860 # and request is for options=[CURRENT_REVISION],
1861 # THEN we can return prior cached data.
1862 if options_set.issubset(cached_options_set):
1863 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001864
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001865 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001866 data = gerrit_util.GetChangeDetail(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001867 self._GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001868 except gerrit_util.GerritError as e:
1869 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001870 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001871 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01001872
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001873 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07001874 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001875
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00001876 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001877 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001878 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001879 data = gerrit_util.GetChangeCommit(
1880 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001881 except gerrit_util.GerritError as e:
1882 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00001883 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07001884 raise
agable32978d92016-11-01 12:55:02 -07001885 return data
1886
Karen Qian40c19422019-03-13 21:28:29 +00001887 def _IsCqConfigured(self):
1888 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00001889 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00001890
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001891 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001892 if git_common.is_dirty_git_tree('land'):
1893 return 1
Karen Qian40c19422019-03-13 21:28:29 +00001894
tandriid60367b2016-06-22 05:25:12 -07001895 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00001896 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001897 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001898 'which can test and land changes for you. '
1899 'Are you sure you wish to bypass it?\n',
1900 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001901 differs = True
tandriic4344b52016-08-29 06:04:54 -07001902 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001903 # Note: git diff outputs nothing if there is no diff.
1904 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001905 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001906 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001907 if detail['current_revision'] == last_upload:
1908 differs = False
1909 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001910 print('WARNING: Local branch contents differ from latest uploaded '
1911 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001912 if differs:
1913 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001914 confirm_or_exit(
1915 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
1916 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001917 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001918 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00001919 upstream = self.GetCommonAncestorWithUpstream()
1920 if self.GetIssue():
1921 description = self.FetchDescription()
1922 else:
Edward Lemura12175c2020-03-09 16:58:26 +00001923 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00001924 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001925 committing=True,
1926 may_prompt=not force,
1927 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00001928 parallel=parallel,
1929 upstream=upstream,
1930 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001931 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001932 resultdb=resultdb,
1933 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001934
1935 self.SubmitIssue(wait_for_merge=True)
1936 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07001937 links = self._GetChangeCommit().get('web_links', [])
1938 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08001939 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001940 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07001941 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001942 return 0
1943
Edward Lemurf38bc172019-09-03 21:02:13 +00001944 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 assert parsed_issue_arg.valid
1946
Edward Lemur125d60a2019-09-13 18:25:41 +00001947 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001948
1949 if parsed_issue_arg.hostname:
1950 self._gerrit_host = parsed_issue_arg.hostname
1951 self._gerrit_server = 'https://%s' % self._gerrit_host
1952
tandriic2405f52016-10-10 08:13:15 -07001953 try:
1954 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001955 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07001956 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001957
1958 if not parsed_issue_arg.patchset:
1959 # Use current revision by default.
1960 revision_info = detail['revisions'][detail['current_revision']]
1961 patchset = int(revision_info['_number'])
1962 else:
1963 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001964 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965 if int(revision_info['_number']) == parsed_issue_arg.patchset:
1966 break
1967 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08001968 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001969 (parsed_issue_arg.patchset, self.GetIssue()))
1970
Edward Lemur125d60a2019-09-13 18:25:41 +00001971 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08001972 if remote_url.endswith('.git'):
1973 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00001974 remote_url = remote_url.rstrip('/')
1975
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001976 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00001977 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08001978
1979 if remote_url != fetch_info['url']:
1980 DieWithError('Trying to patch a change from %s but this repo appears '
1981 'to be %s.' % (fetch_info['url'], remote_url))
1982
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001983 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07001984
Aaron Gable62619a32017-06-16 08:22:09 -07001985 if force:
1986 RunGit(['reset', '--hard', 'FETCH_HEAD'])
1987 print('Checked out commit for change %i patchset %i locally' %
1988 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07001989 elif nocommit:
1990 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
1991 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07001992 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07001993 RunGit(['cherry-pick', 'FETCH_HEAD'])
1994 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07001995 (parsed_issue_arg.issue, patchset))
1996 print('Note: this created a local commit which does not have '
1997 'the same hash as the one uploaded for review. This will make '
1998 'uploading changes based on top of this branch difficult.\n'
1999 'If you want to do that, use "git cl patch --force" instead.')
2000
Stefan Zagerd08043c2017-10-12 12:07:02 -07002001 if self.GetBranch():
2002 self.SetIssue(parsed_issue_arg.issue)
2003 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002004 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002005 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2006 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2007 else:
2008 print('WARNING: You are in detached HEAD state.\n'
2009 'The patch has been applied to your checkout, but you will not be '
2010 'able to upload a new patch set to the gerrit issue.\n'
2011 'Try using the \'-b\' option if you would like to work on a '
2012 'branch and/or upload a new patch set.')
2013
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002014 return 0
2015
tandrii16e0b4e2016-06-07 10:34:28 -07002016 def _GerritCommitMsgHookCheck(self, offer_removal):
2017 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2018 if not os.path.exists(hook):
2019 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002020 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2021 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002022 data = gclient_utils.FileRead(hook)
2023 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2024 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002025 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002026 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002027 'and may interfere with it in subtle ways.\n'
2028 'We recommend you remove the commit-msg hook.')
2029 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002030 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002031 gclient_utils.rm_file_or_tree(hook)
2032 print('Gerrit commit-msg hook removed.')
2033 else:
2034 print('OK, will keep Gerrit commit-msg hook in place.')
2035
Edward Lemur1b52d872019-05-09 21:12:12 +00002036 def _CleanUpOldTraces(self):
2037 """Keep only the last |MAX_TRACES| traces."""
2038 try:
2039 traces = sorted([
2040 os.path.join(TRACES_DIR, f)
2041 for f in os.listdir(TRACES_DIR)
2042 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2043 and not f.startswith('tmp'))
2044 ])
2045 traces_to_delete = traces[:-MAX_TRACES]
2046 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002047 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002048 except OSError:
2049 print('WARNING: Failed to remove old git traces from\n'
2050 ' %s'
2051 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002052
Edward Lemur5737f022019-05-17 01:24:00 +00002053 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002054 """Zip and write the git push traces stored in traces_dir."""
2055 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002056 traces_zip = trace_name + '-traces'
2057 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002058 # Create a temporary dir to store git config and gitcookies in. It will be
2059 # compressed and stored next to the traces.
2060 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002061 git_info_zip = trace_name + '-git-info'
2062
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002063 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002064
Edward Lemur1b52d872019-05-09 21:12:12 +00002065 git_push_metadata['trace_name'] = trace_name
2066 gclient_utils.FileWrite(
2067 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2068
2069 # Keep only the first 6 characters of the git hashes on the packet
2070 # trace. This greatly decreases size after compression.
2071 packet_traces = os.path.join(traces_dir, 'trace-packet')
2072 if os.path.isfile(packet_traces):
2073 contents = gclient_utils.FileRead(packet_traces)
2074 gclient_utils.FileWrite(
2075 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2076 shutil.make_archive(traces_zip, 'zip', traces_dir)
2077
2078 # Collect and compress the git config and gitcookies.
2079 git_config = RunGit(['config', '-l'])
2080 gclient_utils.FileWrite(
2081 os.path.join(git_info_dir, 'git-config'),
2082 git_config)
2083
2084 cookie_auth = gerrit_util.Authenticator.get()
2085 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2086 gitcookies_path = cookie_auth.get_gitcookies_path()
2087 if os.path.isfile(gitcookies_path):
2088 gitcookies = gclient_utils.FileRead(gitcookies_path)
2089 gclient_utils.FileWrite(
2090 os.path.join(git_info_dir, 'gitcookies'),
2091 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2092 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2093
Edward Lemur1b52d872019-05-09 21:12:12 +00002094 gclient_utils.rmtree(git_info_dir)
2095
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002096 def _RunGitPushWithTraces(self, refspec, refspec_opts, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002097 """Run git push and collect the traces resulting from the execution."""
2098 # Create a temporary directory to store traces in. Traces will be compressed
2099 # and stored in a 'traces' dir inside depot_tools.
2100 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002101 trace_name = os.path.join(
2102 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002103
2104 env = os.environ.copy()
2105 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2106 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002107 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002108 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2109 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2110 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2111
2112 try:
2113 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002114 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002115 before_push = time_time()
2116 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002117 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002118 env=env,
2119 print_stdout=True,
2120 # Flush after every line: useful for seeing progress when running as
2121 # recipe.
2122 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002123 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002124 except subprocess2.CalledProcessError as e:
2125 push_returncode = e.returncode
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002126 raise GitPushError(
2127 'Failed to create a change. Please examine output above for the '
2128 'reason of the failure.\n'
2129 'Hint: run command below to diagnose common Git/Gerrit '
2130 'credential problems:\n'
2131 ' git cl creds-check\n'
2132 '\n'
2133 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2134 'component including the files below.\n'
2135 'Review the files before upload, since they might contain sensitive '
2136 'information.\n'
2137 'Set the Restrict-View-Google label so that they are not publicly '
2138 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002139 finally:
2140 execution_time = time_time() - before_push
2141 metrics.collector.add_repeated('sub_commands', {
2142 'command': 'git push',
2143 'execution_time': execution_time,
2144 'exit_code': push_returncode,
2145 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2146 })
2147
Edward Lemur1b52d872019-05-09 21:12:12 +00002148 git_push_metadata['execution_time'] = execution_time
2149 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002150 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002151
Edward Lemur1b52d872019-05-09 21:12:12 +00002152 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002153 gclient_utils.rmtree(traces_dir)
2154
2155 return push_stdout
2156
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002157 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2158 change_desc):
2159 """Upload the current branch to Gerrit, retry if new remote HEAD is
2160 found. options and change_desc may be mutated."""
2161 try:
2162 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2163 change_desc)
2164 except GitPushError as e:
2165 remote, remote_branch = self.GetRemoteBranch()
2166 should_retry = remote_branch == DEFAULT_OLD_BRANCH and \
2167 gerrit_util.GetProjectHead(
2168 self._gerrit_host, self._GetGerritProject()) == 'refs/heads/main'
2169 if not should_retry:
2170 DieWithError(str(e), change_desc)
2171
2172 print("WARNING: Detected HEAD change in upstream, fetching remote state")
2173 RunGit(['fetch', remote])
2174 options.edit_description = False
2175 options.force = True
2176 try:
2177 self._CMDUploadChange(options, git_diff_args, custom_cl_base, change_desc)
2178 except GitPushError as e:
2179 DieWithError(str(e), change_desc)
2180
2181 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2182 change_desc):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002183 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002184 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002185 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002186
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002187 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002188 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002189 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002190 # User requested to change description
2191 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002192 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002193 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002194 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002195 else: # if not self.GetIssue()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002196 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002197 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002198 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002199 if len(change_ids) == 1:
2200 change_id = change_ids[0]
2201 else:
2202 change_id = GenerateGerritChangeId(change_desc.description)
2203 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002205 if options.preserve_tryjobs:
2206 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002207
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002209 parent = self._ComputeParent(
2210 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002211 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002212 with gclient_utils.temporary_file() as desc_tempfile:
2213 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2214 ref_to_push = RunGit(
2215 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002216 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002217 if not git_footers.get_footer_change_id(change_desc.description):
2218 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002219 change_desc.set_description(
Edward Lemur5a644f82020-03-18 16:44:57 +00002220 self._AddChangeIdToCommitMessage(
2221 change_desc.description, git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002222 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002223 # For no-squash mode, we assume the remote called "origin" is the one we
2224 # want. It is not worthwhile to support different workflows for
2225 # no-squash mode.
2226 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002227 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2228
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002229 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002230 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2231 ref_to_push)]).splitlines()
2232 if len(commits) > 1:
2233 print('WARNING: This will upload %d commits. Run the following command '
2234 'to see which commits will be uploaded: ' % len(commits))
2235 print('git log %s..%s' % (parent, ref_to_push))
2236 print('You can also use `git squash-branch` to squash these into a '
2237 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002238 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002239
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002240 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002241 cc = []
2242 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2243 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2244 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002245 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002246 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002247 if options.cc:
2248 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002249 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002250 if change_desc.get_cced():
2251 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002252 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2253 valid_accounts = set(reviewers + cc)
2254 # TODO(crbug/877717): relax this for all hosts.
2255 else:
2256 valid_accounts = gerrit_util.ValidAccounts(
2257 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002258 logging.info('accounts %s are recognized, %s invalid',
2259 sorted(valid_accounts),
2260 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002261
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002262 # Extra options that can be specified at push time. Doc:
2263 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002264 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002265
Aaron Gable844cf292017-06-28 11:32:59 -07002266 # By default, new changes are started in WIP mode, and subsequent patchsets
2267 # don't send email. At any time, passing --send-mail will mark the change
2268 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002269 if options.send_mail:
2270 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002271 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002272 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002273 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002274 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002275 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002276
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002277 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002278 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002279
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002280 # Set options.title in case user was prompted in _GetTitleForUpload and
2281 # _CMDUploadChange needs to be called again.
2282 options.title = self._GetTitleForUpload(options)
2283 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002284 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002285 refspec_opts.append(
2286 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002287
agablec6787972016-09-09 16:13:34 -07002288 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002289 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002290
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002291 for r in sorted(reviewers):
2292 if r in valid_accounts:
2293 refspec_opts.append('r=%s' % r)
2294 reviewers.remove(r)
2295 else:
2296 # TODO(tandrii): this should probably be a hard failure.
2297 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2298 % r)
2299 for c in sorted(cc):
2300 # refspec option will be rejected if cc doesn't correspond to an
2301 # account, even though REST call to add such arbitrary cc may succeed.
2302 if c in valid_accounts:
2303 refspec_opts.append('cc=%s' % c)
2304 cc.remove(c)
2305
rmistry9eadede2016-09-19 11:22:43 -07002306 if options.topic:
2307 # Documentation on Gerrit topics is here:
2308 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002309 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002310
Edward Lemur687ca902018-12-05 02:30:30 +00002311 if options.enable_auto_submit:
2312 refspec_opts.append('l=Auto-Submit+1')
2313 if options.use_commit_queue:
2314 refspec_opts.append('l=Commit-Queue+2')
2315 elif options.cq_dry_run:
2316 refspec_opts.append('l=Commit-Queue+1')
2317
2318 if change_desc.get_reviewers(tbr_only=True):
2319 score = gerrit_util.GetCodeReviewTbrScore(
2320 self._GetGerritHost(),
2321 self._GetGerritProject())
2322 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002323
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002324 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002325 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002326 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002327 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002328 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2329
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002330 refspec_suffix = ''
2331 if refspec_opts:
2332 refspec_suffix = '%' + ','.join(refspec_opts)
2333 assert ' ' not in refspec_suffix, (
2334 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2335 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2336
Edward Lemur1b52d872019-05-09 21:12:12 +00002337 git_push_metadata = {
2338 'gerrit_host': self._GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002339 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002340 'change_id': change_id,
2341 'description': change_desc.description,
2342 }
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002343 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
2344 git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345
2346 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002347 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002348 change_numbers = [m.group(1)
2349 for m in map(regex.match, push_stdout.splitlines())
2350 if m]
2351 if len(change_numbers) != 1:
2352 DieWithError(
2353 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002354 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002356 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002357
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002358 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002359 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002360 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002361 gerrit_util.AddReviewers(
2362 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002363 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002364 reviewers, cc,
2365 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002366
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002367 return 0
2368
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002369 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2370 change_desc):
2371 """Computes parent of the generated commit to be uploaded to Gerrit.
2372
2373 Returns revision or a ref name.
2374 """
2375 if custom_cl_base:
2376 # Try to avoid creating additional unintended CLs when uploading, unless
2377 # user wants to take this risk.
2378 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2379 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2380 local_ref_of_target_remote])
2381 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002382 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002383 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2384 'If you proceed with upload, more than 1 CL may be created by '
2385 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2386 'If you are certain that specified base `%s` has already been '
2387 'uploaded to Gerrit as another CL, you may proceed.\n' %
2388 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2389 if not force:
2390 confirm_or_exit(
2391 'Do you take responsibility for cleaning up potential mess '
2392 'resulting from proceeding with upload?',
2393 action='upload')
2394 return custom_cl_base
2395
Aaron Gablef97e33d2017-03-30 15:44:27 -07002396 if remote != '.':
2397 return self.GetCommonAncestorWithUpstream()
2398
2399 # If our upstream branch is local, we base our squashed commit on its
2400 # squashed version.
2401 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2402
Aaron Gablef97e33d2017-03-30 15:44:27 -07002403 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002404 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002405 if upstream_branch_name == 'main':
2406 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002407
2408 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002409 # TODO(tandrii): consider checking parent change in Gerrit and using its
2410 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2411 # the tree hash of the parent branch. The upside is less likely bogus
2412 # requests to reupload parent change just because it's uploadhash is
2413 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002414 parent = scm.GIT.GetBranchConfig(
2415 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002416 # Verify that the upstream branch has been uploaded too, otherwise
2417 # Gerrit will create additional CLs when uploading.
2418 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2419 RunGitSilent(['rev-parse', parent + ':'])):
2420 DieWithError(
2421 '\nUpload upstream branch %s first.\n'
2422 'It is likely that this branch has been rebased since its last '
2423 'upload, so you just need to upload it again.\n'
2424 '(If you uploaded it with --no-squash, then branch dependencies '
2425 'are not supported, and you should reupload with --squash.)'
2426 % upstream_branch_name,
2427 change_desc)
2428 return parent
2429
Edward Lemura12175c2020-03-09 16:58:26 +00002430 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002431 """Re-commits using the current message, assumes the commit hook is in
2432 place.
2433 """
Edward Lemura12175c2020-03-09 16:58:26 +00002434 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002435 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002436 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002437 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002438 return new_log_desc
2439 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002440 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441
tandriie113dfd2016-10-11 10:20:12 -07002442 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002443 try:
2444 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002445 except GerritChangeNotExists:
2446 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002447
2448 if data['status'] in ('ABANDONED', 'MERGED'):
2449 return 'CL %s is closed' % self.GetIssue()
2450
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002451 def GetGerritChange(self, patchset=None):
2452 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002453 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002454 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002455 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002456 data = self._GetChangeDetail(['ALL_REVISIONS'])
2457
2458 assert host and issue and patchset, 'CL must be uploaded first'
2459
2460 has_patchset = any(
2461 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002462 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002463 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002464 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002465 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002466
tandrii8c5a3532016-11-04 07:52:02 -07002467 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002468 'host': host,
2469 'change': issue,
2470 'project': data['project'],
2471 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002472 }
tandriie113dfd2016-10-11 10:20:12 -07002473
tandriide281ae2016-10-12 06:02:30 -07002474 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002475 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002476
Edward Lemur707d70b2018-02-07 00:50:14 +01002477 def GetReviewers(self):
2478 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002479 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002480
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002481
Lei Zhang8a0efc12020-08-05 19:58:45 +00002482def _get_bug_line_values(default_project_prefix, bugs):
2483 """Given default_project_prefix and comma separated list of bugs, yields bug
2484 line values.
tandriif9aefb72016-07-01 09:06:51 -07002485
2486 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002487 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002488 * string, which is left as is.
2489
2490 This function may produce more than one line, because bugdroid expects one
2491 project per line.
2492
Lei Zhang8a0efc12020-08-05 19:58:45 +00002493 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002494 ['v8:123', 'chromium:789']
2495 """
2496 default_bugs = []
2497 others = []
2498 for bug in bugs.split(','):
2499 bug = bug.strip()
2500 if bug:
2501 try:
2502 default_bugs.append(int(bug))
2503 except ValueError:
2504 others.append(bug)
2505
2506 if default_bugs:
2507 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002508 if default_project_prefix:
2509 if not default_project_prefix.endswith(':'):
2510 default_project_prefix += ':'
2511 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002512 else:
2513 yield default_bugs
2514 for other in sorted(others):
2515 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2516 yield other
2517
2518
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002519class ChangeDescription(object):
2520 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002521 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002522 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002523 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002524 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002525 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002526 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2527 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002528 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002529 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002530
Dan Beamd8b04ca2019-10-10 21:23:26 +00002531 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002532 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002533 if bug:
2534 regexp = re.compile(self.BUG_LINE)
2535 prefix = settings.GetBugPrefix()
2536 if not any((regexp.match(line) for line in self._description_lines)):
2537 values = list(_get_bug_line_values(prefix, bug))
2538 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002539 if fixed:
2540 regexp = re.compile(self.FIXED_LINE)
2541 prefix = settings.GetBugPrefix()
2542 if not any((regexp.match(line) for line in self._description_lines)):
2543 values = list(_get_bug_line_values(prefix, fixed))
2544 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002545
agable@chromium.org42c20792013-09-12 17:34:49 +00002546 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002547 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002548 return '\n'.join(self._description_lines)
2549
2550 def set_description(self, desc):
2551 if isinstance(desc, basestring):
2552 lines = desc.splitlines()
2553 else:
2554 lines = [line.rstrip() for line in desc]
2555 while lines and not lines[0]:
2556 lines.pop(0)
2557 while lines and not lines[-1]:
2558 lines.pop(-1)
2559 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002560
Edward Lemur5a644f82020-03-18 16:44:57 +00002561 def ensure_change_id(self, change_id):
2562 description = self.description
2563 footer_change_ids = git_footers.get_footer_change_id(description)
2564 # Make sure that the Change-Id in the description matches the given one.
2565 if footer_change_ids != [change_id]:
2566 if footer_change_ids:
2567 # Remove any existing Change-Id footers since they don't match the
2568 # expected change_id footer.
2569 description = git_footers.remove_footer(description, 'Change-Id')
2570 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2571 'if you want to set a new one.')
2572 # Add the expected Change-Id footer.
2573 description = git_footers.add_footer_change_id(description, change_id)
2574 self.set_description(description)
2575
Edward Lemur2c62b332020-03-12 22:12:33 +00002576 def update_reviewers(
2577 self, reviewers, tbrs, add_owners_to, affected_files, author_email):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002578 """Rewrites the R=/TBR= line(s) as a single line each.
2579
2580 Args:
2581 reviewers (list(str)) - list of additional emails to use for reviewers.
2582 tbrs (list(str)) - list of additional emails to use for TBRs.
2583 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2584 the change that are missing OWNER coverage. If this is not None, you
2585 must also pass a value for `change`.
2586 change (Change) - The Change that should be used for OWNERS lookups.
2587 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002588 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002589 assert isinstance(tbrs, list), tbrs
2590
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002591 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Edward Lemur2c62b332020-03-12 22:12:33 +00002592 assert not add_owners_to or affected_files, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002593
2594 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002595 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002596
2597 reviewers = set(reviewers)
2598 tbrs = set(tbrs)
2599 LOOKUP = {
2600 'TBR': tbrs,
2601 'R': reviewers,
2602 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002603
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002604 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002605 regexp = re.compile(self.R_LINE)
2606 matches = [regexp.match(line) for line in self._description_lines]
2607 new_desc = [l for i, l in enumerate(self._description_lines)
2608 if not matches[i]]
2609 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002610
agable@chromium.org42c20792013-09-12 17:34:49 +00002611 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002612
2613 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002614 for match in matches:
2615 if not match:
2616 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002617 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2618
2619 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002620 if add_owners_to:
Edward Lemur2c62b332020-03-12 22:12:33 +00002621 owners_db = owners.Database(settings.GetRoot(),
Edward Lemurb7f759f2020-03-04 21:20:56 +00002622 fopen=open, os_path=os.path)
Edward Lemur2c62b332020-03-12 22:12:33 +00002623 missing_files = owners_db.files_not_covered_by(affected_files,
Robert Iannucci100aa212017-04-18 17:28:26 -07002624 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002625 LOOKUP[add_owners_to].update(
Edward Lemur2c62b332020-03-12 22:12:33 +00002626 owners_db.reviewers_for(missing_files, author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002627
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002628 # If any folks ended up in both groups, remove them from tbrs.
2629 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002630
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002631 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2632 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002633
2634 # Put the new lines in the description where the old first R= line was.
2635 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2636 if 0 <= line_loc < len(self._description_lines):
2637 if new_tbr_line:
2638 self._description_lines.insert(line_loc, new_tbr_line)
2639 if new_r_line:
2640 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002641 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002642 if new_r_line:
2643 self.append_footer(new_r_line)
2644 if new_tbr_line:
2645 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002646
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002647 def set_preserve_tryjobs(self):
2648 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2649 footers = git_footers.parse_footers(self.description)
2650 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2651 if v.lower() == 'true':
2652 return
2653 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2654
Anthony Polito8b955342019-09-24 19:01:36 +00002655 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002656 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002657 self.set_description([
2658 '# Enter a description of the change.',
2659 '# This will be displayed on the codereview site.',
2660 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002661 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002662 '--------------------',
2663 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002664 bug_regexp = re.compile(self.BUG_LINE)
2665 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002666 prefix = settings.GetBugPrefix()
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00002667
2668 def has_issue(l):
2669 return bug_regexp.match(l) or fixed_regexp.match(l)
2670
Dan Beamd8b04ca2019-10-10 21:23:26 +00002671 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002672 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002673
Bruce Dawsonfc487042020-10-27 19:11:37 +00002674 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002675 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002676 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002677 if not content:
2678 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002679 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002680
Bruce Dawson2377b012018-01-11 16:46:49 -08002681 # Strip off comments and default inserted "Bug:" line.
2682 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002683 (line.startswith('#') or
2684 line.rstrip() == "Bug:" or
2685 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002687 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002688 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002689
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002690 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002691 """Adds a footer line to the description.
2692
2693 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2694 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2695 that Gerrit footers are always at the end.
2696 """
2697 parsed_footer_line = git_footers.parse_footer(line)
2698 if parsed_footer_line:
2699 # Line is a gerrit footer in the form: Footer-Key: any value.
2700 # Thus, must be appended observing Gerrit footer rules.
2701 self.set_description(
2702 git_footers.add_footer(self.description,
2703 key=parsed_footer_line[0],
2704 value=parsed_footer_line[1]))
2705 return
2706
2707 if not self._description_lines:
2708 self._description_lines.append(line)
2709 return
2710
2711 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2712 if gerrit_footers:
2713 # git_footers.split_footers ensures that there is an empty line before
2714 # actual (gerrit) footers, if any. We have to keep it that way.
2715 assert top_lines and top_lines[-1] == ''
2716 top_lines, separator = top_lines[:-1], top_lines[-1:]
2717 else:
2718 separator = [] # No need for separator if there are no gerrit_footers.
2719
2720 prev_line = top_lines[-1] if top_lines else ''
2721 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2722 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2723 top_lines.append('')
2724 top_lines.append(line)
2725 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002726
tandrii99a72f22016-08-17 14:33:24 -07002727 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002728 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002729 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002730 reviewers = [match.group(2).strip()
2731 for match in matches
2732 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002733 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002734
bradnelsond975b302016-10-23 12:20:23 -07002735 def get_cced(self):
2736 """Retrieves the list of reviewers."""
2737 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2738 cced = [match.group(2).strip() for match in matches if match]
2739 return cleanup_list(cced)
2740
Nodir Turakulov23b82142017-11-16 11:04:25 -08002741 def get_hash_tags(self):
2742 """Extracts and sanitizes a list of Gerrit hashtags."""
2743 subject = (self._description_lines or ('',))[0]
2744 subject = re.sub(
2745 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2746
2747 tags = []
2748 start = 0
2749 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2750 while True:
2751 m = bracket_exp.match(subject, start)
2752 if not m:
2753 break
2754 tags.append(self.sanitize_hash_tag(m.group(1)))
2755 start = m.end()
2756
2757 if not tags:
2758 # Try "Tag: " prefix.
2759 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2760 if m:
2761 tags.append(self.sanitize_hash_tag(m.group(1)))
2762 return tags
2763
2764 @classmethod
2765 def sanitize_hash_tag(cls, tag):
2766 """Returns a sanitized Gerrit hash tag.
2767
2768 A sanitized hashtag can be used as a git push refspec parameter value.
2769 """
2770 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2771
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002772
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002773def FindCodereviewSettingsFile(filename='codereview.settings'):
2774 """Finds the given file starting in the cwd and going up.
2775
2776 Only looks up to the top of the repository unless an
2777 'inherit-review-settings-ok' file exists in the root of the repository.
2778 """
2779 inherit_ok_file = 'inherit-review-settings-ok'
2780 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002781 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002782 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2783 root = '/'
2784 while True:
2785 if filename in os.listdir(cwd):
2786 if os.path.isfile(os.path.join(cwd, filename)):
2787 return open(os.path.join(cwd, filename))
2788 if cwd == root:
2789 break
2790 cwd = os.path.dirname(cwd)
2791
2792
2793def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002794 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002795 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002797 def SetProperty(name, setting, unset_error_ok=False):
2798 fullname = 'rietveld.' + name
2799 if setting in keyvals:
2800 RunGit(['config', fullname, keyvals[setting]])
2801 else:
2802 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2803
tandrii48df5812016-10-17 03:55:37 -07002804 if not keyvals.get('GERRIT_HOST', False):
2805 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002806 # Only server setting is required. Other settings can be absent.
2807 # In that case, we ignore errors raised during option deletion attempt.
2808 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
2809 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2810 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002811 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002812 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
2813 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002814 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2815 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00002816 SetProperty(
2817 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002818
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002819 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002820 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002821
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002822 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00002823 RunGit(['config', 'gerrit.squash-uploads',
2824 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002825
tandrii@chromium.org28253532016-04-14 13:46:56 +00002826 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002827 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002828 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2829
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002830 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002831 # should be of the form
2832 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2833 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002834 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2835 keyvals['ORIGIN_URL_CONFIG']])
2836
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002837
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002838def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002839 """Downloads a network object to a local file, like urllib.urlretrieve.
2840
2841 This is necessary because urllib is broken for SSL connections via a proxy.
2842 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002843 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00002844 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002845
2846
ukai@chromium.org712d6102013-11-27 00:52:58 +00002847def hasSheBang(fname):
2848 """Checks fname is a #! script."""
2849 with open(fname) as f:
2850 return f.read(2).startswith('#!')
2851
2852
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002853def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002854 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002855
2856 Args:
2857 force: True to update hooks. False to install hooks if not present.
2858 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00002859 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002860 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2861 if not os.access(dst, os.X_OK):
2862 if os.path.exists(dst):
2863 if not force:
2864 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002865 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002866 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002867 if not hasSheBang(dst):
2868 DieWithError('Not a script: %s\n'
2869 'You need to download from\n%s\n'
2870 'into .git/hooks/commit-msg and '
2871 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002872 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2873 except Exception:
2874 if os.path.exists(dst):
2875 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002876 DieWithError('\nFailed to download hooks.\n'
2877 'You need to download from\n%s\n'
2878 'into .git/hooks/commit-msg and '
2879 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002880
2881
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002882class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002883 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002884
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002885 _GOOGLESOURCE = 'googlesource.com'
2886
2887 def __init__(self):
2888 # Cached list of [host, identity, source], where source is either
2889 # .gitcookies or .netrc.
2890 self._all_hosts = None
2891
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002892 def ensure_configured_gitcookies(self):
2893 """Runs checks and suggests fixes to make git use .gitcookies from default
2894 path."""
2895 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
2896 configured_path = RunGitSilent(
2897 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02002898 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002899 if configured_path:
2900 self._ensure_default_gitcookies_path(configured_path, default)
2901 else:
2902 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002903
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002904 @staticmethod
2905 def _ensure_default_gitcookies_path(configured_path, default_path):
2906 assert configured_path
2907 if configured_path == default_path:
2908 print('git is already configured to use your .gitcookies from %s' %
2909 configured_path)
2910 return
2911
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002912 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002913 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
2914 (configured_path, default_path))
2915
2916 if not os.path.exists(configured_path):
2917 print('However, your configured .gitcookies file is missing.')
2918 confirm_or_exit('Reconfigure git to use default .gitcookies?',
2919 action='reconfigure')
2920 RunGit(['config', '--global', 'http.cookiefile', default_path])
2921 return
2922
2923 if os.path.exists(default_path):
2924 print('WARNING: default .gitcookies file already exists %s' %
2925 default_path)
2926 DieWithError('Please delete %s manually and re-run git cl creds-check' %
2927 default_path)
2928
2929 confirm_or_exit('Move existing .gitcookies to default location?',
2930 action='move')
2931 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002932 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002933 print('Moved and reconfigured git to use .gitcookies from %s' %
2934 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002935
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01002936 @staticmethod
2937 def _configure_gitcookies_path(default_path):
2938 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
2939 if os.path.exists(netrc_path):
2940 print('You seem to be using outdated .netrc for git credentials: %s' %
2941 netrc_path)
2942 print('This tool will guide you through setting up recommended '
2943 '.gitcookies store for git credentials.\n'
2944 '\n'
2945 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
2946 ' git config --global --unset http.cookiefile\n'
2947 ' mv %s %s.backup\n\n' % (default_path, default_path))
2948 confirm_or_exit(action='setup .gitcookies')
2949 RunGit(['config', '--global', 'http.cookiefile', default_path])
2950 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002951
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002952 def get_hosts_with_creds(self, include_netrc=False):
2953 if self._all_hosts is None:
2954 a = gerrit_util.CookiesAuthenticator()
2955 self._all_hosts = [
2956 (h, u, s)
2957 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002958 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
2959 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002960 )
2961 if h.endswith(self._GOOGLESOURCE)
2962 ]
2963
2964 if include_netrc:
2965 return self._all_hosts
2966 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
2967
2968 def print_current_creds(self, include_netrc=False):
2969 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
2970 if not hosts:
2971 print('No Git/Gerrit credentials found')
2972 return
Edward Lemur79d4f992019-11-11 23:49:02 +00002973 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002974 header = [('Host', 'User', 'Which file'),
2975 ['=' * l for l in lengths]]
2976 for row in (header + hosts):
2977 print('\t'.join((('%%+%ds' % l) % s)
2978 for l, s in zip(lengths, row)))
2979
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002980 @staticmethod
2981 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08002982 """Parses identity "git-<username>.domain" into <username> and domain."""
2983 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002984 # distinguishable from sub-domains. But we do know typical domains:
2985 if identity.endswith('.chromium.org'):
2986 domain = 'chromium.org'
2987 username = identity[:-len('.chromium.org')]
2988 else:
2989 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002990 if username.startswith('git-'):
2991 username = username[len('git-'):]
2992 return username, domain
2993
Andrii Shyshkalov97800502017-03-16 16:04:32 +01002994 def _canonical_git_googlesource_host(self, host):
2995 """Normalizes Gerrit hosts (with '-review') to Git host."""
2996 assert host.endswith(self._GOOGLESOURCE)
2997 # Prefix doesn't include '.' at the end.
2998 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
2999 if prefix.endswith('-review'):
3000 prefix = prefix[:-len('-review')]
3001 return prefix + '.' + self._GOOGLESOURCE
3002
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003003 def _canonical_gerrit_googlesource_host(self, host):
3004 git_host = self._canonical_git_googlesource_host(host)
3005 prefix = git_host.split('.', 1)[0]
3006 return prefix + '-review.' + self._GOOGLESOURCE
3007
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003008 def _get_counterpart_host(self, host):
3009 assert host.endswith(self._GOOGLESOURCE)
3010 git = self._canonical_git_googlesource_host(host)
3011 gerrit = self._canonical_gerrit_googlesource_host(git)
3012 return git if gerrit == host else gerrit
3013
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003014 def has_generic_host(self):
3015 """Returns whether generic .googlesource.com has been configured.
3016
3017 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3018 """
3019 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3020 if host == '.' + self._GOOGLESOURCE:
3021 return True
3022 return False
3023
3024 def _get_git_gerrit_identity_pairs(self):
3025 """Returns map from canonic host to pair of identities (Git, Gerrit).
3026
3027 One of identities might be None, meaning not configured.
3028 """
3029 host_to_identity_pairs = {}
3030 for host, identity, _ in self.get_hosts_with_creds():
3031 canonical = self._canonical_git_googlesource_host(host)
3032 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3033 idx = 0 if canonical == host else 1
3034 pair[idx] = identity
3035 return host_to_identity_pairs
3036
3037 def get_partially_configured_hosts(self):
3038 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003039 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003040 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003041 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003042
3043 def get_conflicting_hosts(self):
3044 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003045 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003046 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003047 if None not in (i1, i2) and i1 != i2)
3048
3049 def get_duplicated_hosts(self):
3050 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003051 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003052
3053 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3054 'chromium.googlesource.com': 'chromium.org',
3055 'chrome-internal.googlesource.com': 'google.com',
3056 }
3057
3058 def get_hosts_with_wrong_identities(self):
3059 """Finds hosts which **likely** reference wrong identities.
3060
3061 Note: skips hosts which have conflicting identities for Git and Gerrit.
3062 """
3063 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003064 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003065 pair = self._get_git_gerrit_identity_pairs().get(host)
3066 if pair and pair[0] == pair[1]:
3067 _, domain = self._parse_identity(pair[0])
3068 if domain != expected:
3069 hosts.add(host)
3070 return hosts
3071
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003072 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003073 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003074 hosts = sorted(hosts)
3075 assert hosts
3076 if extra_column_func is None:
3077 extras = [''] * len(hosts)
3078 else:
3079 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003080 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3081 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003082 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003083 lines.append(tmpl % he)
3084 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003085
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003086 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003087 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003088 yield ('.googlesource.com wildcard record detected',
3089 ['Chrome Infrastructure team recommends to list full host names '
3090 'explicitly.'],
3091 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003092
3093 dups = self.get_duplicated_hosts()
3094 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003095 yield ('The following hosts were defined twice',
3096 self._format_hosts(dups),
3097 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003098
3099 partial = self.get_partially_configured_hosts()
3100 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003101 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3102 'These hosts are missing',
3103 self._format_hosts(partial, lambda host: 'but %s defined' %
3104 self._get_counterpart_host(host)),
3105 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003106
3107 conflicting = self.get_conflicting_hosts()
3108 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003109 yield ('The following Git hosts have differing credentials from their '
3110 'Gerrit counterparts',
3111 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3112 tuple(self._get_git_gerrit_identity_pairs()[host])),
3113 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003114
3115 wrong = self.get_hosts_with_wrong_identities()
3116 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003117 yield ('These hosts likely use wrong identity',
3118 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3119 (self._get_git_gerrit_identity_pairs()[host][0],
3120 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3121 wrong)
3122
3123 def find_and_report_problems(self):
3124 """Returns True if there was at least one problem, else False."""
3125 found = False
3126 bad_hosts = set()
3127 for title, sublines, hosts in self._find_problems():
3128 if not found:
3129 found = True
3130 print('\n\n.gitcookies problem report:\n')
3131 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003132 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003133 if sublines:
3134 print()
3135 print(' %s' % '\n '.join(sublines))
3136 print()
3137
3138 if bad_hosts:
3139 assert found
3140 print(' You can manually remove corresponding lines in your %s file and '
3141 'visit the following URLs with correct account to generate '
3142 'correct credential lines:\n' %
3143 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3144 print(' %s' % '\n '.join(sorted(set(
3145 gerrit_util.CookiesAuthenticator().get_new_password_url(
3146 self._canonical_git_googlesource_host(host))
3147 for host in bad_hosts
3148 ))))
3149 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003150
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003151
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003152@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003153def CMDcreds_check(parser, args):
3154 """Checks credentials and suggests changes."""
3155 _, _ = parser.parse_args(args)
3156
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003157 # Code below checks .gitcookies. Abort if using something else.
3158 authn = gerrit_util.Authenticator.get()
3159 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003160 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003161 'This command is not designed for bot environment. It checks '
3162 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003163 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3164 if isinstance(authn, gerrit_util.GceAuthenticator):
3165 message += (
3166 '\n'
3167 'If you need to run this on GCE or a cloudtop instance, '
3168 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3169 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003170
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003171 checker = _GitCookiesChecker()
3172 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003173
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003174 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003175 checker.print_current_creds(include_netrc=True)
3176
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003177 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003178 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003179 return 0
3180 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003181
3182
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003183@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003184def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003185 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003186 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003187 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003188 _, args = parser.parse_args(args)
3189 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003190 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003191 return RunGit(['config', 'branch.%s.base-url' % branch],
3192 error_ok=False).strip()
3193 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003194 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003195 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3196 error_ok=False).strip()
3197
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003198
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003199def color_for_status(status):
3200 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003201 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003202 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003203 'unsent': BOLD + Fore.YELLOW,
3204 'waiting': BOLD + Fore.RED,
3205 'reply': BOLD + Fore.YELLOW,
3206 'not lgtm': BOLD + Fore.RED,
3207 'lgtm': BOLD + Fore.GREEN,
3208 'commit': BOLD + Fore.MAGENTA,
3209 'closed': BOLD + Fore.CYAN,
3210 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003211 }.get(status, Fore.WHITE)
3212
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003213
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003214def get_cl_statuses(changes, fine_grained, max_processes=None):
3215 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003216
3217 If fine_grained is true, this will fetch CL statuses from the server.
3218 Otherwise, simply indicate if there's a matching url for the given branches.
3219
3220 If max_processes is specified, it is used as the maximum number of processes
3221 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3222 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003223
3224 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003225 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003226 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003227 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003228
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003229 if not fine_grained:
3230 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003231 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003232 for cl in changes:
3233 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003234 return
3235
3236 # First, sort out authentication issues.
3237 logging.debug('ensuring credentials exist')
3238 for cl in changes:
3239 cl.EnsureAuthenticated(force=False, refresh=True)
3240
3241 def fetch(cl):
3242 try:
3243 return (cl, cl.GetStatus())
3244 except:
3245 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003246 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003247 raise
3248
3249 threads_count = len(changes)
3250 if max_processes:
3251 threads_count = max(1, min(threads_count, max_processes))
3252 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3253
Edward Lemur61bf4172020-02-24 23:22:37 +00003254 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003255 fetched_cls = set()
3256 try:
3257 it = pool.imap_unordered(fetch, changes).__iter__()
3258 while True:
3259 try:
3260 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003261 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003262 break
3263 fetched_cls.add(cl)
3264 yield cl, status
3265 finally:
3266 pool.close()
3267
3268 # Add any branches that failed to fetch.
3269 for cl in set(changes) - fetched_cls:
3270 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003271
rmistry@google.com2dd99862015-06-22 12:22:18 +00003272
Jose Lopes3863fc52020-04-07 17:00:25 +00003273def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003274 """Uploads CLs of local branches that are dependents of the current branch.
3275
3276 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003277
3278 test1 -> test2.1 -> test3.1
3279 -> test3.2
3280 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003281
3282 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3283 run on the dependent branches in this order:
3284 test2.1, test3.1, test3.2, test2.2, test3.3
3285
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003286 Note: This function does not rebase your local dependent branches. Use it
3287 when you make a change to the parent branch that will not conflict
3288 with its dependent branches, and you would like their dependencies
3289 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003290 """
3291 if git_common.is_dirty_git_tree('upload-branch-deps'):
3292 return 1
3293
3294 root_branch = cl.GetBranch()
3295 if root_branch is None:
3296 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3297 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003298 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003299 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3300 'patchset dependencies without an uploaded CL.')
3301
3302 branches = RunGit(['for-each-ref',
3303 '--format=%(refname:short) %(upstream:short)',
3304 'refs/heads'])
3305 if not branches:
3306 print('No local branches found.')
3307 return 0
3308
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003309 # Create a dictionary of all local branches to the branches that are
3310 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003311 tracked_to_dependents = collections.defaultdict(list)
3312 for b in branches.splitlines():
3313 tokens = b.split()
3314 if len(tokens) == 2:
3315 branch_name, tracked = tokens
3316 tracked_to_dependents[tracked].append(branch_name)
3317
vapiera7fbd5a2016-06-16 09:17:49 -07003318 print()
3319 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003320 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003321
rmistry@google.com2dd99862015-06-22 12:22:18 +00003322 def traverse_dependents_preorder(branch, padding=''):
3323 dependents_to_process = tracked_to_dependents.get(branch, [])
3324 padding += ' '
3325 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003326 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003327 dependents.append(dependent)
3328 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003329
rmistry@google.com2dd99862015-06-22 12:22:18 +00003330 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003331 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003332
3333 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003334 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003335 return 0
3336
Jose Lopes3863fc52020-04-07 17:00:25 +00003337 if not force:
3338 confirm_or_exit('This command will checkout all dependent branches and run '
3339 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003340
rmistry@google.com2dd99862015-06-22 12:22:18 +00003341 # Record all dependents that failed to upload.
3342 failures = {}
3343 # Go through all dependents, checkout the branch and upload.
3344 try:
3345 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003346 print()
3347 print('--------------------------------------')
3348 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003349 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003350 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003351 try:
3352 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003353 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003354 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003355 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003356 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003357 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003358 finally:
3359 # Swap back to the original root branch.
3360 RunGit(['checkout', '-q', root_branch])
3361
vapiera7fbd5a2016-06-16 09:17:49 -07003362 print()
3363 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003364 for dependent_branch in dependents:
3365 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003366 print(' %s : %s' % (dependent_branch, upload_status))
3367 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003368
3369 return 0
3370
3371
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003372def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003373 """Given a proposed tag name, returns a tag name that is guaranteed to be
3374 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3375 or 'foo-3', and so on."""
3376
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003377 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003378 for suffix_num in itertools.count(1):
3379 if suffix_num == 1:
3380 to_check = proposed_tag
3381 else:
3382 to_check = '%s-%d' % (proposed_tag, suffix_num)
3383
3384 if to_check not in existing_tags:
3385 return to_check
3386
3387
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003388@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003389def CMDarchive(parser, args):
3390 """Archives and deletes branches associated with closed changelists."""
3391 parser.add_option(
3392 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003393 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003394 parser.add_option(
3395 '-f', '--force', action='store_true',
3396 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003397 parser.add_option(
3398 '-d', '--dry-run', action='store_true',
3399 help='Skip the branch tagging and removal steps.')
3400 parser.add_option(
3401 '-t', '--notags', action='store_true',
3402 help='Do not tag archived branches. '
3403 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003404 parser.add_option(
3405 '-p',
3406 '--pattern',
3407 default='git-cl-archived-{issue}-{branch}',
3408 help='Format string for archive tags. '
3409 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003410
kmarshall3bff56b2016-06-06 18:31:47 -07003411 options, args = parser.parse_args(args)
3412 if args:
3413 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003414
3415 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3416 if not branches:
3417 return 0
3418
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003419 tags = RunGit(['for-each-ref', '--format=%(refname)',
3420 'refs/tags']).splitlines() or []
3421 tags = [t.split('/')[-1] for t in tags]
3422
vapiera7fbd5a2016-06-16 09:17:49 -07003423 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003424 changes = [Changelist(branchref=b)
3425 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003426 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3427 statuses = get_cl_statuses(changes,
3428 fine_grained=True,
3429 max_processes=options.maxjobs)
3430 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003431 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3432 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003433 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003434 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003435 proposal.sort()
3436
3437 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003438 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003439 return 0
3440
Edward Lemur85153282020-02-14 22:06:29 +00003441 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003442
vapiera7fbd5a2016-06-16 09:17:49 -07003443 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003444 if options.notags:
3445 for next_item in proposal:
3446 print(' ' + next_item[0])
3447 else:
3448 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3449 for next_item in proposal:
3450 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003451
kmarshall9249e012016-08-23 12:02:16 -07003452 # Quit now on precondition failure or if instructed by the user, either
3453 # via an interactive prompt or by command line flags.
3454 if options.dry_run:
3455 print('\nNo changes were made (dry run).\n')
3456 return 0
3457 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003458 print('You are currently on a branch \'%s\' which is associated with a '
3459 'closed codereview issue, so archive cannot proceed. Please '
3460 'checkout another branch and run this command again.' %
3461 current_branch)
3462 return 1
kmarshall9249e012016-08-23 12:02:16 -07003463 elif not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003464 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003465 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003466 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003467 return 1
3468
3469 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003470 if not options.notags:
3471 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003472
3473 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3474 # Clean up the tag if we failed to delete the branch.
3475 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003476
vapiera7fbd5a2016-06-16 09:17:49 -07003477 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003478
3479 return 0
3480
3481
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003482@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003483def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003484 """Show status of changelists.
3485
3486 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003487 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003488 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003489 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003490 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003491 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003492 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003493 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003494
3495 Also see 'git cl comments'.
3496 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003497 parser.add_option(
3498 '--no-branch-color',
3499 action='store_true',
3500 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003501 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003502 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003503 parser.add_option('-f', '--fast', action='store_true',
3504 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003505 parser.add_option(
3506 '-j', '--maxjobs', action='store', type=int,
3507 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003508 parser.add_option(
3509 '-i', '--issue', type=int,
3510 help='Operate on this issue instead of the current branch\'s implicit '
3511 'issue. Requires --field to be set.')
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00003512 parser.add_option('-d',
3513 '--dateorder',
3514 action='store_true',
3515 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003516 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003517 if args:
3518 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003519
iannuccie53c9352016-08-17 14:40:40 -07003520 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003521 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003522
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003523 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003524 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003525 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003526 if cl.GetIssue():
3527 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003528 elif options.field == 'id':
3529 issueid = cl.GetIssue()
3530 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003531 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003532 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003533 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003534 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003535 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003536 elif options.field == 'status':
3537 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003538 elif options.field == 'url':
3539 url = cl.GetIssueURL()
3540 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003541 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003542 return 0
3543
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00003544 branches = RunGit([
3545 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3546 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003547 if not branches:
3548 print('No local branch found.')
3549 return 0
3550
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003551 changes = [
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00003552 Changelist(branchref=b, commit_date=ct)
3553 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3554 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003555 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003556 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003557 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003558 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003559
Edward Lemur85153282020-02-14 22:06:29 +00003560 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003561
3562 def FormatBranchName(branch, colorize=False):
3563 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3564 an asterisk when it is the current branch."""
3565
3566 asterisk = ""
3567 color = Fore.RESET
3568 if branch == current_branch:
3569 asterisk = "* "
3570 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003571 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003572
3573 if colorize:
3574 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003575 return asterisk + branch_name
3576
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003577 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003578
3579 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00003580 if options.committerdate:
3581 sorted_changes = sorted(changes,
3582 key=lambda c: c.GetCommitDate(),
3583 reverse=True)
3584 else:
3585 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3586 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003587 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003588 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003589 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003590 branch_statuses[c.GetBranch()] = status
3591 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003592 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003593 if url and (not status or status == 'error'):
3594 # The issue probably doesn't exist anymore.
3595 url += ' (broken)'
3596
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003597 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003598 # Turn off bold as well as colors.
3599 END = '\033[0m'
3600 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003601 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003602 color = ''
3603 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003604 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003605
Alan Cuttera3be9a52019-03-04 18:50:33 +00003606 branch_display = FormatBranchName(branch)
3607 padding = ' ' * (alignment - len(branch_display))
3608 if not options.no_branch_color:
3609 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003610
Alan Cuttera3be9a52019-03-04 18:50:33 +00003611 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3612 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003613
vapiera7fbd5a2016-06-16 09:17:49 -07003614 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003615 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003616 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003617 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003618 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003619 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003620 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003621 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003622 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003623 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003624 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003625 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003626 return 0
3627
3628
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003629def colorize_CMDstatus_doc():
3630 """To be called once in main() to add colors to git cl status help."""
3631 colors = [i for i in dir(Fore) if i[0].isupper()]
3632
3633 def colorize_line(line):
3634 for color in colors:
3635 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003636 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003637 indent = len(line) - len(line.lstrip(' ')) + 1
3638 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3639 return line
3640
3641 lines = CMDstatus.__doc__.splitlines()
3642 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3643
3644
phajdan.jre328cf92016-08-22 04:12:17 -07003645def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003646 if path == '-':
3647 json.dump(contents, sys.stdout)
3648 else:
3649 with open(path, 'w') as f:
3650 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003651
3652
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003653@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003654@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003655def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003656 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003657
3658 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003659 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003660 parser.add_option('-r', '--reverse', action='store_true',
3661 help='Lookup the branch(es) for the specified issues. If '
3662 'no issues are specified, all branches with mapped '
3663 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003664 parser.add_option('--json',
3665 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003666 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003667
dnj@chromium.org406c4402015-03-03 17:22:28 +00003668 if options.reverse:
3669 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003670 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003671 # Reverse issue lookup.
3672 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003673
3674 git_config = {}
3675 for config in RunGit(['config', '--get-regexp',
3676 r'branch\..*issue']).splitlines():
3677 name, _space, val = config.partition(' ')
3678 git_config[name] = val
3679
dnj@chromium.org406c4402015-03-03 17:22:28 +00003680 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003681 issue = git_config.get(
3682 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003683 if issue:
3684 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003685 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003686 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003687 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003688 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003689 try:
3690 issue_num = int(issue)
3691 except ValueError:
3692 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003693 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003694 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003695 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003696 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003697 if options.json:
3698 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003699 return 0
3700
3701 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003702 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003703 if not issue.valid:
3704 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3705 'or no argument to list it.\n'
3706 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003707 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003708 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003709 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003710 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003711 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3712 if options.json:
3713 write_json(options.json, {
3714 'issue': cl.GetIssue(),
3715 'issue_url': cl.GetIssueURL(),
3716 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717 return 0
3718
3719
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003720@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003721def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003722 """Shows or posts review comments for any changelist."""
3723 parser.add_option('-a', '--add-comment', dest='comment',
3724 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003725 parser.add_option('-p', '--publish', action='store_true',
3726 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003727 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003728 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003729 parser.add_option('-m', '--machine-readable', dest='readable',
3730 action='store_false', default=True,
3731 help='output comments in a format compatible with '
3732 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003733 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003734 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003735 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003736
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003737 issue = None
3738 if options.issue:
3739 try:
3740 issue = int(options.issue)
3741 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003742 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003743
Edward Lemur934836a2019-09-09 20:16:54 +00003744 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003745
3746 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003747 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003748 return 0
3749
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003750 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3751 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003752 for comment in summary:
3753 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003754 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003755 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003756 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003757 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003758 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003759 elif comment.autogenerated:
3760 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003761 else:
3762 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003763 print('\n%s%s %s%s\n%s' % (
3764 color,
3765 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3766 comment.sender,
3767 Fore.RESET,
3768 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3769
smut@google.comc85ac942015-09-15 16:34:43 +00003770 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003771 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003772 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003773 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3774 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003775 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003776 return 0
3777
3778
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003779@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003780@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003781def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003782 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003783 parser.add_option('-d', '--display', action='store_true',
3784 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003785 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003786 help='New description to set for this issue (- for stdin, '
3787 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003788 parser.add_option('-f', '--force', action='store_true',
3789 help='Delete any unpublished Gerrit edits for this issue '
3790 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003791
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003792 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003793
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003794 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003795 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003796 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003797 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003798 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003799
Edward Lemur934836a2019-09-09 20:16:54 +00003800 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003801 if target_issue_arg:
3802 kwargs['issue'] = target_issue_arg.issue
3803 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07003804
3805 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003806 if not cl.GetIssue():
3807 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003808
Edward Lemur678a6842019-10-03 22:25:05 +00003809 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00003810 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02003811
Edward Lemur6c6827c2020-02-06 21:15:18 +00003812 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003813
smut@google.com34fb6b12015-07-13 20:03:26 +00003814 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003816 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003817
3818 if options.new_description:
3819 text = options.new_description
3820 if text == '-':
3821 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003822 elif text == '+':
3823 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00003824 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003825
3826 description.set_description(text)
3827 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003828 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00003829 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003830 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003831 return 0
3832
3833
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003834@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003835def CMDlint(parser, args):
3836 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003837 parser.add_option('--filter', action='append', metavar='-x,+y',
3838 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003839 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003840
3841 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003842 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00003843 try:
3844 import cpplint
3845 import cpplint_chromium
3846 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003848 return 1
3849
3850 # Change the current working directory before calling lint so that it
3851 # shows the correct base.
3852 previous_cwd = os.getcwd()
3853 os.chdir(settings.GetRoot())
3854 try:
Edward Lemur934836a2019-09-09 20:16:54 +00003855 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00003856 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003857 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003858 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003859 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003860
Lei Zhangb8c62cf2020-07-15 20:09:37 +00003861 # Process cpplint arguments, if any.
3862 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
3863 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003864 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003865
Lei Zhang379d1ad2020-07-15 19:40:06 +00003866 include_regex = re.compile(settings.GetLintRegex())
3867 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00003868 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3869 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00003870 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00003872 continue
3873
3874 if ignore_regex.match(filename):
3875 print('Ignoring file %s' % filename)
3876 continue
3877
3878 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3879 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003880 finally:
3881 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003882 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003883 if cpplint._cpplint_state.error_count != 0:
3884 return 1
3885 return 0
3886
3887
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003888@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003890 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003891 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08003892 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003893 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003894 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08003895 parser.add_option('--all', action='store_true',
3896 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04003897 parser.add_option('--parallel', action='store_true',
3898 help='Run all tests specified by input_api.RunTests in all '
3899 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003900 parser.add_option('--resultdb', action='store_true',
3901 help='Run presubmit checks in the ResultSink environment '
3902 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003903 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003904 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003905
sbc@chromium.org71437c02015-04-09 19:29:40 +00003906 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003908 return 1
3909
Edward Lemur934836a2019-09-09 20:16:54 +00003910 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003911 if args:
3912 base_branch = args[0]
3913 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003914 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003915 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003916
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00003917 if cl.GetIssue():
3918 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08003919 else:
Edward Lemura12175c2020-03-09 16:58:26 +00003920 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08003921
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003922 cl.RunHook(
3923 committing=not options.upload,
3924 may_prompt=False,
3925 verbose=options.verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00003926 parallel=options.parallel,
3927 upstream=base_branch,
3928 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003929 all_files=options.all,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003930 resultdb=options.resultdb,
3931 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003932 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003933
3934
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003935def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003936 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003937
3938 Works the same way as
3939 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3940 but can be called on demand on all platforms.
3941
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003942 The basic idea is to generate git hash of a state of the tree, original
3943 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003944 """
3945 lines = []
3946 tree_hash = RunGitSilent(['write-tree'])
3947 lines.append('tree %s' % tree_hash.strip())
3948 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3949 if code == 0:
3950 lines.append('parent %s' % parent.strip())
3951 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3952 lines.append('author %s' % author.strip())
3953 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3954 lines.append('committer %s' % committer.strip())
3955 lines.append('')
3956 # Note: Gerrit's commit-hook actually cleans message of some lines and
3957 # whitespace. This code is not doing this, but it clearly won't decrease
3958 # entropy.
3959 lines.append(message)
3960 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00003961 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003962 return 'I%s' % change_hash.strip()
3963
3964
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01003965def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00003966 """Computes the remote branch ref to use for the CL.
3967
3968 Args:
3969 remote (str): The git remote for the CL.
3970 remote_branch (str): The git remote branch for the CL.
3971 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00003972 """
3973 if not (remote and remote_branch):
3974 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003975
wittman@chromium.org455dc922015-01-26 20:15:50 +00003976 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003977 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00003978 # refs, which are then translated into the remote full symbolic refs
3979 # below.
3980 if '/' not in target_branch:
3981 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3982 else:
3983 prefix_replacements = (
3984 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3985 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3986 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3987 )
3988 match = None
3989 for regex, replacement in prefix_replacements:
3990 match = re.search(regex, target_branch)
3991 if match:
3992 remote_branch = target_branch.replace(match.group(0), replacement)
3993 break
3994 if not match:
3995 # This is a branch path but not one we recognize; use as-is.
3996 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003997 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3998 # Handle the refs that need to land in different refs.
3999 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004000
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004001 # Migration to new default branch, only if available on remote.
4002 allow_push_on_master = bool(os.environ.get("ALLOW_PUSH_TO_MASTER", None))
4003 if remote_branch == DEFAULT_OLD_BRANCH and not allow_push_on_master:
4004 if RunGit(['show-branch', DEFAULT_NEW_BRANCH], error_ok=True,
4005 stderr=subprocess2.PIPE):
4006 # TODO(crbug.com/ID): Print location to local git migration script.
4007 print("WARNING: Using new branch name %s instead of %s" % (
4008 DEFAULT_NEW_BRANCH, DEFAULT_OLD_BRANCH))
4009 remote_branch = DEFAULT_NEW_BRANCH
4010
wittman@chromium.org455dc922015-01-26 20:15:50 +00004011 # Create the true path to the remote branch.
4012 # Does the following translation:
4013 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004014 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004015 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4016 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4017 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4018 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4019 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4020 'refs/heads/')
4021 elif remote_branch.startswith('refs/remotes/branch-heads'):
4022 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004023
wittman@chromium.org455dc922015-01-26 20:15:50 +00004024 return remote_branch
4025
4026
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004027def cleanup_list(l):
4028 """Fixes a list so that comma separated items are put as individual items.
4029
4030 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4031 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4032 """
4033 items = sum((i.split(',') for i in l), [])
4034 stripped_items = (i.strip() for i in items)
4035 return sorted(filter(None, stripped_items))
4036
4037
Aaron Gable4db38df2017-11-03 14:59:07 -07004038@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004039@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004040def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004041 """Uploads the current changelist to codereview.
4042
4043 Can skip dependency patchset uploads for a branch by running:
4044 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004045 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004046 git config --unset branch.branch_name.skip-deps-uploads
4047 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004048
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004049 If the name of the checked out branch starts with "bug-" or "fix-" followed
4050 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004051 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004052
4053 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004054 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004055 [git-cl] add support for hashtags
4056 Foo bar: implement foo
4057 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004058 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004059 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4060 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004061 parser.add_option('--bypass-watchlists', action='store_true',
4062 dest='bypass_watchlists',
4063 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004064 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004065 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004066 parser.add_option('--message', '-m', dest='message',
4067 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004068 parser.add_option('-b', '--bug',
4069 help='pre-populate the bug number(s) for this issue. '
4070 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004071 parser.add_option('--message-file', dest='message_file',
4072 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004073 parser.add_option('--title', '-t', dest='title',
4074 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004075 parser.add_option('-T', '--skip-title', action='store_true',
4076 dest='skip_title',
4077 help='Use the most recent commit message as the title of '
4078 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004079 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004080 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004081 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004082 parser.add_option('--tbrs',
4083 action='append', default=[],
4084 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004085 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004086 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004087 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004088 parser.add_option('--hashtag', dest='hashtags',
4089 action='append', default=[],
4090 help=('Gerrit hashtag for new CL; '
4091 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004092 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004093 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004094 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004095 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004096 metavar='TARGET',
4097 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004098 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004099 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004100 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004101 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004102 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004103 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004104 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004105 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4106 const='TBR', help='add a set of OWNERS to TBR')
4107 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4108 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004109 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004110 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004111 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004112 'implies --send-mail')
4113 parser.add_option('-d', '--cq-dry-run',
4114 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004115 help='Send the patchset to do a CQ dry run right after '
4116 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004117 parser.add_option('--preserve-tryjobs', action='store_true',
4118 help='instruct the CQ to let tryjobs running even after '
4119 'new patchsets are uploaded instead of canceling '
4120 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004121 parser.add_option('--dependencies', action='store_true',
4122 help='Uploads CLs of all the local branches that depend on '
4123 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004124 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4125 help='Sends your change to the CQ after an approval. Only '
4126 'works on repos that have the Auto-Submit label '
4127 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004128 parser.add_option('--parallel', action='store_true',
4129 help='Run all tests specified by input_api.RunTests in all '
4130 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004131 parser.add_option('--no-autocc', action='store_true',
4132 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004133 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004134 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004135 parser.add_option('-R', '--retry-failed', action='store_true',
4136 help='Retry failed tryjobs from old patchset immediately '
4137 'after uploading new patchset. Cannot be used with '
4138 '--use-commit-queue or --cq-dry-run.')
4139 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4140 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004141 parser.add_option('--fixed', '-x',
4142 help='List of bugs that will be commented on and marked '
4143 'fixed (pre-populates "Fixed:" tag). Same format as '
4144 '-b option / "Bug:" tag. If fixing several issues, '
4145 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004146 parser.add_option('--edit-description', action='store_true', default=False,
4147 help='Modify description before upload. Cannot be used '
4148 'with --force. It is a noop when --no-squash is set '
4149 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004150 parser.add_option('--git-completion-helper', action="store_true",
4151 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004152 parser.add_option('--resultdb', action='store_true',
4153 help='Run presubmit checks in the ResultSink environment '
4154 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004155 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004156
rmistry@google.com2dd99862015-06-22 12:22:18 +00004157 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004158 (options, args) = parser.parse_args(args)
4159
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004160 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004161 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4162 if opt.help != optparse.SUPPRESS_HELP))
4163 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004164
sbc@chromium.org71437c02015-04-09 19:29:40 +00004165 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004166 return 1
4167
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004168 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004169 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004170 options.cc = cleanup_list(options.cc)
4171
Josipe827b0f2020-01-30 00:07:20 +00004172 if options.edit_description and options.force:
4173 parser.error('Only one of --force and --edit-description allowed')
4174
tandriib80458a2016-06-23 12:20:07 -07004175 if options.message_file:
4176 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004177 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004178 options.message = gclient_utils.FileRead(options.message_file)
4179 options.message_file = None
4180
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004181 if ([options.cq_dry_run,
4182 options.use_commit_queue,
4183 options.retry_failed].count(True) > 1):
4184 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4185 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004186
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004187 if options.skip_title and options.title:
4188 parser.error('Only one of --title and --skip-title allowed.')
4189
Aaron Gableedbc4132017-09-11 13:22:28 -07004190 if options.use_commit_queue:
4191 options.send_mail = True
4192
Edward Lesmes0dd54822020-03-26 18:24:25 +00004193 if options.squash is None:
4194 # Load default for user, repo, squash=true, in this order.
4195 options.squash = settings.GetSquashGerritUploads()
4196
Edward Lemur934836a2019-09-09 20:16:54 +00004197 cl = Changelist()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004198 # Warm change details cache now to avoid RPCs later, reducing latency for
4199 # developers.
4200 if cl.GetIssue():
4201 cl._GetChangeDetail(
4202 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4203
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004204 if options.retry_failed and not cl.GetIssue():
4205 print('No previous patchsets, so --retry-failed has no effect.')
4206 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004207
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004208 # cl.GetMostRecentPatchset uses cached information, and can return the last
4209 # patchset before upload. Calling it here makes it clear that it's the
4210 # last patchset before upload. Note that GetMostRecentPatchset will fail
4211 # if no CL has been uploaded yet.
4212 if options.retry_failed:
4213 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004214
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004215 ret = cl.CMDUpload(options, args, orig_args)
4216
4217 if options.retry_failed:
4218 if ret != 0:
4219 print('Upload failed, so --retry-failed has no effect.')
4220 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004221 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004222 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004223 jobs = _filter_failed_for_retry(builds)
4224 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004225 print('No failed tryjobs, so --retry-failed has no effect.')
4226 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004227 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004228
4229 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004230
4231
Francois Dorayd42c6812017-05-30 15:10:20 -04004232@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004233@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004234def CMDsplit(parser, args):
4235 """Splits a branch into smaller branches and uploads CLs.
4236
4237 Creates a branch and uploads a CL for each group of files modified in the
4238 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004239 comment, the string '$directory', is replaced with the directory containing
4240 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004241 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004242 parser.add_option('-d', '--description', dest='description_file',
4243 help='A text file containing a CL description in which '
4244 '$directory will be replaced by each CL\'s directory.')
4245 parser.add_option('-c', '--comment', dest='comment_file',
4246 help='A text file containing a CL comment.')
4247 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004248 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004249 help='List the files and reviewers for each CL that would '
4250 'be created, but don\'t create branches or CLs.')
4251 parser.add_option('--cq-dry-run', action='store_true',
4252 help='If set, will do a cq dry run for each uploaded CL. '
4253 'Please be careful when doing this; more than ~10 CLs '
4254 'has the potential to overload our build '
4255 'infrastructure. Try to upload these not during high '
4256 'load times (usually 11-3 Mountain View time). Email '
4257 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004258 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4259 default=True,
4260 help='Sends your change to the CQ after an approval. Only '
4261 'works on repos that have the Auto-Submit label '
4262 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004263 options, _ = parser.parse_args(args)
4264
4265 if not options.description_file:
4266 parser.error('No --description flag specified.')
4267
4268 def WrappedCMDupload(args):
4269 return CMDupload(OptionParser(), args)
4270
Edward Lemur2c62b332020-03-12 22:12:33 +00004271 return split_cl.SplitCl(
4272 options.description_file, options.comment_file, Changelist,
4273 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4274 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004275
4276
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004277@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004278@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004279def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004280 """DEPRECATED: Used to commit the current changelist via git-svn."""
4281 message = ('git-cl no longer supports committing to SVN repositories via '
4282 'git-svn. You probably want to use `git cl land` instead.')
4283 print(message)
4284 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004285
4286
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004287@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004288@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004289def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004290 """Commits the current changelist via git.
4291
4292 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4293 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004294 """
4295 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4296 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004297 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004298 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004299 parser.add_option('--parallel', action='store_true',
4300 help='Run all tests specified by input_api.RunTests in all '
4301 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004302 parser.add_option('--resultdb', action='store_true',
4303 help='Run presubmit checks in the ResultSink environment '
4304 'and send results to the ResultDB database.')
4305 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004306 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004307
Edward Lemur934836a2019-09-09 20:16:54 +00004308 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004309
Robert Iannucci2e73d432018-03-14 01:10:47 -07004310 if not cl.GetIssue():
4311 DieWithError('You must upload the change first to Gerrit.\n'
4312 ' If you would rather have `git cl land` upload '
4313 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004314 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4315 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004316
4317
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004318@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004319@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004320def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004321 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004322 parser.add_option('-b', dest='newbranch',
4323 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004324 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004325 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004326 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004327 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004328
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004329 group = optparse.OptionGroup(
4330 parser,
4331 'Options for continuing work on the current issue uploaded from a '
4332 'different clone (e.g. different machine). Must be used independently '
4333 'from the other options. No issue number should be specified, and the '
4334 'branch must have an issue number associated with it')
4335 group.add_option('--reapply', action='store_true', dest='reapply',
4336 help='Reset the branch and reapply the issue.\n'
4337 'CAUTION: This will undo any local changes in this '
4338 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004339
4340 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004341 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004342 parser.add_option_group(group)
4343
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004345
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004346 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004347 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004348 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004349 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004350 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004351
Edward Lemur934836a2019-09-09 20:16:54 +00004352 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004353 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004354 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004355
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004356 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004357 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004358 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004359
4360 RunGit(['reset', '--hard', upstream])
4361 if options.pull:
4362 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004363
Edward Lemur678a6842019-10-03 22:25:05 +00004364 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4365 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004366
4367 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004368 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004369
Edward Lemurf38bc172019-09-03 21:02:13 +00004370 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004371 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004372 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004373
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004374 # We don't want uncommitted changes mixed up with the patch.
4375 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004376 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004377
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004378 if options.newbranch:
4379 if options.force:
4380 RunGit(['branch', '-D', options.newbranch],
4381 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004382 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004383
Edward Lemur678a6842019-10-03 22:25:05 +00004384 cl = Changelist(
4385 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004386
Edward Lemur678a6842019-10-03 22:25:05 +00004387 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004388 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004389
Edward Lemurf38bc172019-09-03 21:02:13 +00004390 return cl.CMDPatchWithParsedIssue(
4391 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004392
4393
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004394def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004395 """Fetches the tree status and returns either 'open', 'closed',
4396 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004397 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004398 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004399 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004400 if status.find('closed') != -1 or status == '0':
4401 return 'closed'
4402 elif status.find('open') != -1 or status == '1':
4403 return 'open'
4404 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004405 return 'unset'
4406
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004407
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004408def GetTreeStatusReason():
4409 """Fetches the tree status from a json url and returns the message
4410 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004411 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004412 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004413 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004414 status = json.loads(connection.read())
4415 connection.close()
4416 return status['message']
4417
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004418
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004419@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004420def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004421 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004422 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004423 status = GetTreeStatus()
4424 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004425 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004426 return 2
4427
vapiera7fbd5a2016-06-16 09:17:49 -07004428 print('The tree is %s' % status)
4429 print()
4430 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004431 if status != 'open':
4432 return 1
4433 return 0
4434
4435
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004436@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004437def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004438 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4439 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004440 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004441 '-b', '--bot', action='append',
4442 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4443 'times to specify multiple builders. ex: '
4444 '"-b win_rel -b win_layout". See '
4445 'the try server waterfall for the builders name and the tests '
4446 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004447 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004448 '-B', '--bucket', default='',
4449 help=('Buildbucket bucket to send the try requests.'))
4450 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004451 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004452 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004453 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004454 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004455 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004456 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004457 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004458 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004459 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004460 '--category', default='git_cl_try', help='Specify custom build category.')
4461 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004462 '--project',
4463 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004464 'in recipe to determine to which repository or directory to '
4465 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004466 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004467 '-p', '--property', dest='properties', action='append', default=[],
4468 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004469 'key2=value2 etc. The value will be treated as '
4470 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004471 'NOTE: using this may make your tryjob not usable for CQ, '
4472 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004473 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004474 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4475 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004476 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004477 parser.add_option(
4478 '-R', '--retry-failed', action='store_true', default=False,
4479 help='Retry failed jobs from the latest set of tryjobs. '
4480 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004481 parser.add_option(
4482 '-i', '--issue', type=int,
4483 help='Operate on this issue instead of the current branch\'s implicit '
4484 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004485 options, args = parser.parse_args(args)
4486
machenbach@chromium.org45453142015-09-15 08:45:22 +00004487 # Make sure that all properties are prop=value pairs.
4488 bad_params = [x for x in options.properties if '=' not in x]
4489 if bad_params:
4490 parser.error('Got properties with missing "=": %s' % bad_params)
4491
maruel@chromium.org15192402012-09-06 12:38:29 +00004492 if args:
4493 parser.error('Unknown arguments: %s' % args)
4494
Edward Lemur934836a2019-09-09 20:16:54 +00004495 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004496 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004497 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004498
Edward Lemurf38bc172019-09-03 21:02:13 +00004499 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004500 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004501
tandriie113dfd2016-10-11 10:20:12 -07004502 error_message = cl.CannotTriggerTryJobReason()
4503 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004504 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004505
Edward Lemur45768512020-03-02 19:03:14 +00004506 if options.bot:
4507 if options.retry_failed:
4508 parser.error('--bot is not compatible with --retry-failed.')
4509 if not options.bucket:
4510 parser.error('A bucket (e.g. "chromium/try") is required.')
4511
4512 triggered = [b for b in options.bot if 'triggered' in b]
4513 if triggered:
4514 parser.error(
4515 'Cannot schedule builds on triggered bots: %s.\n'
4516 'This type of bot requires an initial job from a parent (usually a '
4517 'builder). Schedule a job on the parent instead.\n' % triggered)
4518
4519 if options.bucket.startswith('.master'):
4520 parser.error('Buildbot masters are not supported.')
4521
4522 project, bucket = _parse_bucket(options.bucket)
4523 if project is None or bucket is None:
4524 parser.error('Invalid bucket: %s.' % options.bucket)
4525 jobs = sorted((project, bucket, bot) for bot in options.bot)
4526 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004527 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004528 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004529 if options.verbose:
4530 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004531 jobs = _filter_failed_for_retry(builds)
4532 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004533 print('There are no failed jobs in the latest set of jobs '
4534 '(patchset #%d), doing nothing.' % patchset)
4535 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004536 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004537 if num_builders > 10:
4538 confirm_or_exit('There are %d builders with failed builds.'
4539 % num_builders, action='continue')
4540 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004541 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004542 print('git cl try with no bots now defaults to CQ dry run.')
4543 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4544 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004545
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004546 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004547 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004548 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004549 except BuildbucketResponseException as ex:
4550 print('ERROR: %s' % ex)
4551 return 1
4552 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004553
4554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004555@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004556def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004557 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004558 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004559 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004560 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004561 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004562 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004563 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004564 '--color', action='store_true', default=setup_color.IS_TTY,
4565 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004566 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004567 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4568 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004569 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004570 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004571 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004572 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004573 parser.add_option(
4574 '-i', '--issue', type=int,
4575 help='Operate on this issue instead of the current branch\'s implicit '
4576 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004577 options, args = parser.parse_args(args)
4578 if args:
4579 parser.error('Unrecognized args: %s' % ' '.join(args))
4580
Edward Lemur934836a2019-09-09 20:16:54 +00004581 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004582 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004583 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004584
tandrii221ab252016-10-06 08:12:04 -07004585 patchset = options.patchset
4586 if not patchset:
4587 patchset = cl.GetMostRecentPatchset()
4588 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004589 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004590 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004591 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004592 cl.GetIssue())
4593
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004594 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004595 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004596 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004597 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004598 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004599 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004600 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004601 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004602 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004603 return 0
4604
4605
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004606@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004607@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004609 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004610 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004611 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004612 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004613
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004615 if args:
4616 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004617 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004618 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004619 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004620 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004621
4622 # Clear configured merge-base, if there is one.
4623 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004624 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004625 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 return 0
4627
4628
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004629@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004630def CMDweb(parser, args):
4631 """Opens the current CL in the web browser."""
4632 _, args = parser.parse_args(args)
4633 if args:
4634 parser.error('Unrecognized args: %s' % ' '.join(args))
4635
4636 issue_url = Changelist().GetIssueURL()
4637 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004638 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004639 return 1
4640
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004641 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004642 # allows us to hide the "Created new window in existing browser session."
4643 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004644 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004645 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004646 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004647 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004648 os.open(os.devnull, os.O_RDWR)
4649 try:
4650 webbrowser.open(issue_url)
4651 finally:
4652 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004653 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004654 return 0
4655
4656
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004657@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004658def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004659 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004660 parser.add_option('-d', '--dry-run', action='store_true',
4661 help='trigger in dry run mode')
4662 parser.add_option('-c', '--clear', action='store_true',
4663 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004664 parser.add_option(
4665 '-i', '--issue', type=int,
4666 help='Operate on this issue instead of the current branch\'s implicit '
4667 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004668 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004669 if args:
4670 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004671 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004672 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004673
Edward Lemur934836a2019-09-09 20:16:54 +00004674 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004675 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004676 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004677 elif options.dry_run:
4678 state = _CQState.DRY_RUN
4679 else:
4680 state = _CQState.COMMIT
4681 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004682 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004683 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004684 return 0
4685
4686
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004687@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004688def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004689 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004690 parser.add_option(
4691 '-i', '--issue', type=int,
4692 help='Operate on this issue instead of the current branch\'s implicit '
4693 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004694 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004695 if args:
4696 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004697 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004698 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004699 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004700 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004701 cl.CloseIssue()
4702 return 0
4703
4704
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004705@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004706def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004707 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004708 parser.add_option(
4709 '--stat',
4710 action='store_true',
4711 dest='stat',
4712 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004713 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004714 if args:
4715 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004716
Edward Lemur934836a2019-09-09 20:16:54 +00004717 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004718 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004719 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004720 if not issue:
4721 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004722
Aaron Gablea718c3e2017-08-28 17:47:28 -07004723 base = cl._GitGetBranchConfigValue('last-upload-hash')
4724 if not base:
4725 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4726 if not base:
4727 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4728 revision_info = detail['revisions'][detail['current_revision']]
4729 fetch_info = revision_info['fetch']['http']
4730 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4731 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004732
Aaron Gablea718c3e2017-08-28 17:47:28 -07004733 cmd = ['git', 'diff']
4734 if options.stat:
4735 cmd.append('--stat')
4736 cmd.append(base)
4737 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004738
4739 return 0
4740
4741
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004742@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004743def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004744 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004745 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004746 '--ignore-current',
4747 action='store_true',
4748 help='Ignore the CL\'s current reviewers and start from scratch.')
4749 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004750 '--ignore-self',
4751 action='store_true',
4752 help='Do not consider CL\'s author as an owners.')
4753 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004754 '--no-color',
4755 action='store_true',
4756 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07004757 parser.add_option(
4758 '--batch',
4759 action='store_true',
4760 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00004761 # TODO: Consider moving this to another command, since other
4762 # git-cl owners commands deal with owners for a given CL.
4763 parser.add_option(
4764 '--show-all',
4765 action='store_true',
4766 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004767 options, args = parser.parse_args(args)
4768
Edward Lemur934836a2019-09-09 20:16:54 +00004769 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00004770 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004771
Yang Guo6e269a02019-06-26 11:17:02 +00004772 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00004773 if len(args) == 0:
4774 print('No files specified for --show-all. Nothing to do.')
4775 return 0
Yang Guo6e269a02019-06-26 11:17:02 +00004776 for arg in args:
4777 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemurb7f759f2020-03-04 21:20:56 +00004778 database = owners.Database(settings.GetRoot(), open, os.path)
Yang Guo6e269a02019-06-26 11:17:02 +00004779 database.load_data_needed_for([arg])
4780 print('Owners for %s:' % arg)
4781 for owner in sorted(database.all_possible_owners([arg], None)):
4782 print(' - %s' % owner)
4783 return 0
4784
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004785 if args:
4786 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004787 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004788 base_branch = args[0]
4789 else:
4790 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004791 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004792
Edward Lemur2c62b332020-03-12 22:12:33 +00004793 root = settings.GetRoot()
4794 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07004795
4796 if options.batch:
Edward Lemur2c62b332020-03-12 22:12:33 +00004797 db = owners.Database(root, open, os.path)
Dirk Prankebf980882017-09-02 15:08:00 -07004798 print('\n'.join(db.reviewers_for(affected_files, author)))
4799 return 0
4800
Edward Lemur2c62b332020-03-12 22:12:33 +00004801 owner_files = [f for f in affected_files if 'OWNERS' in os.path.basename(f)]
4802 original_owner_files = {
4803 f: scm.GIT.GetOldContents(root, f, base_branch).splitlines()
4804 for f in owner_files}
4805
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004806 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07004807 affected_files,
Edward Lemur2c62b332020-03-12 22:12:33 +00004808 root,
Edward Lemur707d70b2018-02-07 00:50:14 +01004809 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004810 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur2c62b332020-03-12 22:12:33 +00004811 fopen=open,
4812 os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02004813 disable_color=options.no_color,
Edward Lemur2c62b332020-03-12 22:12:33 +00004814 override_files=original_owner_files,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004815 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004816
4817
Aiden Bennerc08566e2018-10-03 17:52:42 +00004818def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004819 """Generates a diff command."""
4820 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00004821 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
4822
Aiden Benner6c18a1a2018-11-23 20:18:23 +00004823 if allow_prefix:
4824 # explicitly setting --src-prefix and --dst-prefix is necessary in the
4825 # case that diff.noprefix is set in the user's git config.
4826 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
4827 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00004828 diff_cmd += ['--no-prefix']
4829
4830 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004831
4832 if args:
4833 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004834 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004835 diff_cmd.append(arg)
4836 else:
4837 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004838
4839 return diff_cmd
4840
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004841
Jamie Madill5e96ad12020-01-13 16:08:35 +00004842def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
4843 """Runs clang-format-diff and sets a return value if necessary."""
4844
4845 if not clang_diff_files:
4846 return 0
4847
4848 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4849 # formatted. This is used to block during the presubmit.
4850 return_value = 0
4851
4852 # Locate the clang-format binary in the checkout
4853 try:
4854 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4855 except clang_format.NotFoundError as e:
4856 DieWithError(e)
4857
4858 if opts.full or settings.GetFormatFullByDefault():
4859 cmd = [clang_format_tool]
4860 if not opts.dry_run and not opts.diff:
4861 cmd.append('-i')
4862 if opts.dry_run:
4863 for diff_file in clang_diff_files:
4864 with open(diff_file, 'r') as myfile:
4865 code = myfile.read().replace('\r\n', '\n')
4866 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
4867 stdout = stdout.replace('\r\n', '\n')
4868 if opts.diff:
4869 sys.stdout.write(stdout)
4870 if code != stdout:
4871 return_value = 2
4872 else:
4873 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
4874 if opts.diff:
4875 sys.stdout.write(stdout)
4876 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00004877 try:
4878 script = clang_format.FindClangFormatScriptInChromiumTree(
4879 'clang-format-diff.py')
4880 except clang_format.NotFoundError as e:
4881 DieWithError(e)
4882
Edward Lesmes89624cd2020-04-06 17:51:56 +00004883 cmd = ['vpython', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00004884 if not opts.dry_run and not opts.diff:
4885 cmd.append('-i')
4886
4887 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00004888 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00004889
Edward Lesmes89624cd2020-04-06 17:51:56 +00004890 env = os.environ.copy()
4891 env['PATH'] = (
4892 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
4893 stdout = RunCommand(
4894 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00004895 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00004896 if opts.diff:
4897 sys.stdout.write(stdout)
4898 if opts.dry_run and len(stdout) > 0:
4899 return_value = 2
4900
4901 return return_value
4902
4903
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004904def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004905 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004906 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004907
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004908
enne@chromium.org555cfe42014-01-29 18:21:39 +00004909@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004910@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004911def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004912 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11004913 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004914 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004915 parser.add_option('--full', action='store_true',
4916 help='Reformat the full content of all touched files')
4917 parser.add_option('--dry-run', action='store_true',
4918 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004919 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004920 '--no-clang-format',
4921 dest='clang_format',
4922 action='store_false',
4923 default=True,
4924 help='Disables formatting of various file types using clang-format.')
4925 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004926 '--python',
4927 action='store_true',
4928 default=None,
4929 help='Enables python formatting on all python files.')
4930 parser.add_option(
4931 '--no-python',
4932 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00004933 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00004934 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00004935 'If neither --python or --no-python are set, python files that have a '
4936 '.style.yapf file in an ancestor directory will be formatted. '
4937 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004938 parser.add_option(
4939 '--js',
4940 action='store_true',
4941 help='Format javascript code with clang-format. '
4942 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004943 parser.add_option('--diff', action='store_true',
4944 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07004945 parser.add_option('--presubmit', action='store_true',
4946 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004947 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004948
Garrett Beaty91a6f332020-01-06 16:57:24 +00004949 if opts.python is not None and opts.no_python:
4950 raise parser.error('Cannot set both --python and --no-python')
4951 if opts.no_python:
4952 opts.python = False
4953
Daniel Chengc55eecf2016-12-30 03:11:02 -08004954 # Normalize any remaining args against the current path, so paths relative to
4955 # the current directory are still resolved as expected.
4956 args = [os.path.join(os.getcwd(), arg) for arg in args]
4957
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004958 # git diff generates paths against the root of the repository. Change
4959 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004960 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004961 if rel_base_path:
4962 os.chdir(rel_base_path)
4963
digit@chromium.org29e47272013-05-17 17:01:46 +00004964 # Grab the merge-base commit, i.e. the upstream commit of the current
4965 # branch when it was created or the last time it was rebased. This is
4966 # to cover the case where the user may have called "git fetch origin",
4967 # moving the origin branch to a newer commit, but hasn't rebased yet.
4968 upstream_commit = None
4969 cl = Changelist()
4970 upstream_branch = cl.GetUpstreamBranch()
4971 if upstream_branch:
4972 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4973 upstream_commit = upstream_commit.strip()
4974
4975 if not upstream_commit:
4976 DieWithError('Could not find base commit for this branch. '
4977 'Are you in detached state?')
4978
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004979 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4980 diff_output = RunGit(changed_files_cmd)
4981 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004982 # Filter out files deleted by this CL
4983 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004984
Andreas Haas417d89c2020-02-06 10:24:27 +00004985 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00004986 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11004987
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00004988 clang_diff_files = []
4989 if opts.clang_format:
4990 clang_diff_files = [
4991 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
4992 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004993 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004994 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004995
Edward Lesmes50da7702020-03-30 19:23:43 +00004996 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004997
Jamie Madill5e96ad12020-01-13 16:08:35 +00004998 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
4999 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005000
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005001 # Similar code to above, but using yapf on .py files rather than clang-format
5002 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005003 py_explicitly_disabled = opts.python is not None and not opts.python
5004 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005005 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5006 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005007
Aiden Bennerc08566e2018-10-03 17:52:42 +00005008 # Used for caching.
5009 yapf_configs = {}
5010 for f in python_diff_files:
5011 # Find the yapf style config for the current file, defaults to depot
5012 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005013 _FindYapfConfigFile(f, yapf_configs, top_dir)
5014
5015 # Turn on python formatting by default if a yapf config is specified.
5016 # This breaks in the case of this repo though since the specified
5017 # style file is also the global default.
5018 if opts.python is None:
5019 filtered_py_files = []
5020 for f in python_diff_files:
5021 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5022 filtered_py_files.append(f)
5023 else:
5024 filtered_py_files = python_diff_files
5025
5026 # Note: yapf still seems to fix indentation of the entire file
5027 # even if line ranges are specified.
5028 # See https://github.com/google/yapf/issues/499
5029 if not opts.full and filtered_py_files:
5030 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5031
Brian Sheedyb4307d52019-12-02 19:18:17 +00005032 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5033 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5034 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005035
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005036 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005037 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5038 # Default to pep8 if not .style.yapf is found.
5039 if not yapf_style:
5040 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005041
Peter Wend9399922020-06-17 17:33:49 +00005042 with open(f, 'r') as py_f:
5043 if 'python3' in py_f.readline():
5044 vpython_script = 'vpython3'
5045 else:
5046 vpython_script = 'vpython'
5047
5048 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005049
5050 has_formattable_lines = False
5051 if not opts.full:
5052 # Only run yapf over changed line ranges.
5053 for diff_start, diff_len in py_line_diffs[f]:
5054 diff_end = diff_start + diff_len - 1
5055 # Yapf errors out if diff_end < diff_start but this
5056 # is a valid line range diff for a removal.
5057 if diff_end >= diff_start:
5058 has_formattable_lines = True
5059 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5060 # If all line diffs were removals we have nothing to format.
5061 if not has_formattable_lines:
5062 continue
5063
5064 if opts.diff or opts.dry_run:
5065 cmd += ['--diff']
5066 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005067 stdout = RunCommand(cmd,
5068 error_ok=True,
5069 cwd=top_dir,
5070 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005071 if opts.diff:
5072 sys.stdout.write(stdout)
5073 elif len(stdout) > 0:
5074 return_value = 2
5075 else:
5076 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005077 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005078
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005079 # Format GN build files. Always run on full build files for canonical form.
5080 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005081 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005082 if opts.dry_run or opts.diff:
5083 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005084 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005085 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005086 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005087 cwd=top_dir)
5088 if opts.dry_run and gn_ret == 2:
5089 return_value = 2 # Not formatted.
5090 elif opts.diff and gn_ret == 2:
5091 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005092 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005093 elif gn_ret != 0:
5094 # For non-dry run cases (and non-2 return values for dry-run), a
5095 # nonzero error code indicates a failure, probably because the file
5096 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005097 DieWithError('gn format failed on ' + gn_diff_file +
5098 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005099
Ilya Shermane081cbe2017-08-15 17:51:04 -07005100 # Skip the metrics formatting from the global presubmit hook. These files have
5101 # a separate presubmit hook that issues an error if the files need formatting,
5102 # whereas the top-level presubmit script merely issues a warning. Formatting
5103 # these files is somewhat slow, so it's important not to duplicate the work.
5104 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005105 for diff_xml in GetDiffXMLs(diff_files):
5106 xml_dir = GetMetricsDir(diff_xml)
5107 if not xml_dir:
5108 continue
5109
Ilya Shermane081cbe2017-08-15 17:51:04 -07005110 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005111 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5112 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005113
5114 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5115 # command as histograms/pretty_print.py now needs a relative path argument
5116 # after splitting the histograms into multiple directories.
5117 # For example, in tools/metrics/ukm, pretty-print could be run using:
5118 # $ python pretty_print.py
5119 # But in tools/metrics/histogrmas, pretty-print should be run with an
5120 # additional relative path argument, like:
5121 # $ python pretty_print.py histograms_xml/UMA/histograms.xml
5122 # $ python pretty_print.py enums.xml
5123
5124 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5125 # version of histograms/pretty_print.py is released.
5126 filepath_required = os.path.exists(
5127 os.path.join(tool_dir, 'validate_prefix.py'))
5128
Weilun Shib92c4b72020-08-27 17:45:11 +00005129 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5130 or diff_xml.endswith('histogram_suffixes_list.xml')
5131 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005132 cmd.append(diff_xml)
5133
Ilya Shermane081cbe2017-08-15 17:51:04 -07005134 if opts.dry_run or opts.diff:
5135 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005136
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005137 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5138 # `shell` param and instead replace `'vpython'` with
5139 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005140 stdout = RunCommand(cmd,
5141 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005142 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005143 if opts.diff:
5144 sys.stdout.write(stdout)
5145 if opts.dry_run and stdout:
5146 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005147
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005148 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005149
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005150
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005151def GetDiffXMLs(diff_files):
5152 return [
5153 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5154 ]
5155
5156
5157def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005158 metrics_xml_dirs = [
5159 os.path.join('tools', 'metrics', 'actions'),
5160 os.path.join('tools', 'metrics', 'histograms'),
5161 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005162 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005163 os.path.join('tools', 'metrics', 'ukm'),
5164 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005165 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005166 if diff_xml.startswith(xml_dir):
5167 return xml_dir
5168 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005169
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005170
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005171@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005172@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005173def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005174 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005175 _, args = parser.parse_args(args)
5176
5177 if len(args) != 1:
5178 parser.print_help()
5179 return 1
5180
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005181 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005182 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005183 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005184
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005185 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005186
Edward Lemur52969c92020-02-06 18:15:28 +00005187 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005188 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005189 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005190
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005191 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005192 for key, issue in [x.split() for x in output.splitlines()]:
5193 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005194 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005195
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005196 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005197 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005198 return 1
5199 if len(branches) == 1:
5200 RunGit(['checkout', branches[0]])
5201 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005202 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005203 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005204 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005205 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005206 try:
5207 RunGit(['checkout', branches[int(which)]])
5208 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005209 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005210 return 1
5211
5212 return 0
5213
5214
maruel@chromium.org29404b52014-09-08 22:58:00 +00005215def CMDlol(parser, args):
5216 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005217 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005218 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5219 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5220 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005221 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005222 return 0
5223
5224
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005225class OptionParser(optparse.OptionParser):
5226 """Creates the option parse and add --verbose support."""
Sigurd Schneider9ca89ac2020-11-11 09:03:57 +00005227
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005228 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005229 optparse.OptionParser.__init__(
5230 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005231 self.add_option(
5232 '-v', '--verbose', action='count', default=0,
5233 help='Use 2 times for more debugging info')
5234
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005235 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005236 try:
5237 return self._parse_args(args)
5238 finally:
5239 # Regardless of success or failure of args parsing, we want to report
5240 # metrics, but only after logging has been initialized (if parsing
5241 # succeeded).
5242 global settings
5243 settings = Settings()
5244
5245 if not metrics.DISABLE_METRICS_COLLECTION:
5246 # GetViewVCUrl ultimately calls logging method.
5247 project_url = settings.GetViewVCUrl().strip('/+')
5248 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5249 metrics.collector.add('project_urls', [project_url])
5250
5251 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005252 # Create an optparse.Values object that will store only the actual passed
5253 # options, without the defaults.
5254 actual_options = optparse.Values()
5255 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5256 # Create an optparse.Values object with the default options.
5257 options = optparse.Values(self.get_default_values().__dict__)
5258 # Update it with the options passed by the user.
5259 options._update_careful(actual_options.__dict__)
5260 # Store the options passed by the user in an _actual_options attribute.
5261 # We store only the keys, and not the values, since the values can contain
5262 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005263 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005264
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005265 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005266 logging.basicConfig(
5267 level=levels[min(options.verbose, len(levels) - 1)],
5268 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5269 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005270
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005271 return options, args
5272
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005273
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005275 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005276 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005277 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005278 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005279
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005280 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005281 dispatcher = subcommand.CommandDispatcher(__name__)
5282 try:
5283 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005284 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005285 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005286 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005287 if e.code != 500:
5288 raise
5289 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005290 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005291 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005292 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293
5294
5295if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005296 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5297 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005298 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005299 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005300 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005301 sys.exit(main(sys.argv[1:]))